Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22 #3839

markushi · 2024-11-01T10:40:30Z

📜 Description

androidx.benchmark requires a newer version of AGP for micro benchmarks. Bumping all required deps as well.

💡 Motivation and Context.

New features and faster builds.

💚 How did you test it?

📝 Checklist

I reviewed the submitted code.
I added tests to verify the changes.
No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
I updated the docs if needed.
Review from the native team if needed.
No breaking change or entry added to the changelog.
No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

#skip-changelog

romtsn · 2024-11-04T20:14:31Z

buildSrc/src/main/java/Config.kt

    val kotlinStdLib = "stdlib-jdk8"

    val springBootVersion = "2.7.5"
    val springBoot3Version = "3.3.2"
-    val kotlinCompatibleLanguageVersion = "1.4"
+    val kotlinCompatibleLanguageVersion = "1.5"


I guess this deserves a "Breaking changes" note at least? doubt anyone is still on this version, but gotta call it out (or make it part of v8?)

build.gradle.kts

sentry-android-core/src/main/AndroidManifest.xml

romtsn

a couple of comments, but LGTM otherwise! I also assume that artifacts publishing works correctly after bumping the maven-publish plugin, I recall we had problems in the past

markushi · 2024-11-07T11:10:05Z

a couple of comments, but LGTM otherwise! I also assume that artifacts publishing works correctly after bumping the maven-publish plugin, I recall we had problems in the past

Yeah I tried local publishing and compared some files side-by-side. Looking good! One difference I've seen: The .module files now link javadoc and sources, which they didn't before.

romtsn · 2024-11-07T11:28:28Z

The .module files now link javadoc and sources, which they didn't before.

Oh that's nice, it probably fixes this issue? #3785

…se Compiler 1.5.14

As the latest robolectric version features new shadows clashing with our mocks

github-actions · 2024-11-18T09:16:23Z

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	488.94 ms	538.17 ms	49.23 ms
Size	1.64 MiB	2.25 MiB	629.63 KiB

Previous results on branch: chore/gradle-agp-kotlin-version-bump

Startup times

Revision	Plain	With Sentry	Diff
`6af4c51`	446.67 ms	465.26 ms	18.58 ms
`c52239d`	398.40 ms	415.83 ms	17.43 ms
`58d722d`	443.09 ms	476.98 ms	33.89 ms

App size

Revision	Plain	With Sentry	Diff
`6af4c51`	1.64 MiB	2.25 MiB	629.59 KiB
`c52239d`	1.64 MiB	2.25 MiB	629.63 KiB
`58d722d`	1.64 MiB	2.25 MiB	629.63 KiB

sentry-android-core/src/main/AndroidManifest.xml

romtsn · 2024-11-27T19:09:54Z

sentry-android-ndk/build.gradle.kts

    }

+    ndkVersion = "23.1.7779620"


I guess we'd also have to bump AGP in sentry-native/ndk? Probably will be incompatible after this is merged

romtsn · 2024-11-27T19:11:50Z

sentry-android-replay/src/main/AndroidManifest.xml

+<manifest xmlns:tools="http://schemas.android.com/tools">
+
+  <!-- Compose requires min SDK 21, but our min SDK is set to 19 -->
+  <uses-sdk


just a thought - shall we already target the v8 branch? 🤔 unless we want to rush this PR, I guess it will be easier actually?

Yes, we could - let me try!

romtsn · 2024-11-27T19:14:09Z

...oid-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt

@@ -139,9 +148,9 @@ class ComposeMaskingOptionsTest {
        assertEquals(4, textNodes.size) // [TextField, Text, Button, Activity Title]
        textNodes.forEach {
            if ((it.layout as? ComposeTextLayout)?.layout?.layoutInput?.text?.text == "Make Request") {
-                assertFalse(it.shouldMask)
+                assertFalse(it.shouldMask, "Node with text ${(it.layout as? ComposeTextLayout)?.layout?.layoutInput?.text?.text} should not be masked")


romtsn · 2024-11-27T19:22:04Z

sentry-android-timber/src/test/java/io/sentry/core/SentryEventKtx.kt

-package io.sentry
+package io.sentry.core
+
+import io.sentry.SentryEvent

 /**
 * package-private hack.


I'm confused 😅 is this hack not needed then, since we specify a different package now for this ext function? I think throwable is public now btw

romtsn · 2024-11-27T19:23:14Z

sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt

@@ -170,7 +169,7 @@ class SentryApollo3HttpInterceptor @JvmOverloads constructor(
            variables?.let {
                setData("variables", it)
            }
-            setData(HTTP_METHOD_KEY, method.toUpperCase(Locale.ROOT))
+            setData(HTTP_METHOD_KEY, method.uppercase())


hm, why did this change? I've seen in other places we changed it the other way around basically uppercase -> toUpperCase(Locale.ROOT), is this one different?

sentry-compose-helper/build.gradle.kts

romtsn

some comments to check out, but LGTM otherwise!

Co-authored-by: Roman Zavarnitsyn <rom4ek93@gmail.com>

markushi · 2024-11-28T11:56:39Z

Closing in favor of the 8.x.x retargeted branch: #3936

Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22

06c23dc

markushi requested review from adinauer, romtsn and stefanosiano as code owners November 1, 2024 10:40

markushi and others added 2 commits November 1, 2024 11:45

Disable explicit API mode for uitest modules

175cd51

Format code

496c89d

romtsn reviewed Nov 4, 2024

View reviewed changes

build.gradle.kts Outdated Show resolved Hide resolved

romtsn reviewed Nov 4, 2024

View reviewed changes

sentry-android-core/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

romtsn approved these changes Nov 5, 2024

View reviewed changes

markushi enabled auto-merge (squash) November 6, 2024 21:21

markushi disabled auto-merge November 6, 2024 21:21

markushi added 3 commits November 7, 2024 10:10

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

c992483

Address PR feedback

e5aba6d

Ensure file paths are correctly resolved

f6305ac

markushi and others added 13 commits November 8, 2024 10:12

Fix more lint/test issues

17cdc91

Fix minSdk errors

593e102

Remove assertIs, as it's not available for Kotlin 1.4

b5aa001

Fix detekt errors

1188303

Fix R8 issues

9083d60

Bump to Kotlin 1.9.24, language version 1.6, Compose MP 1.6.11, Compo…

2dcb237

…se Compiler 1.5.14

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

78d9178

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

7004e90

Format code

73d248d

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

d691085

Define testProguardFiles to make R8 happy

571da29

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

7c6e770

Add detailed message to asserts

af380aa

markushi and others added 8 commits November 15, 2024 11:26

Bump robolectric, ensure main thread is idle for all replay tests

8fbc17b

Fully robolectric-ify UserInteractionIntegration tests

15c1662

As the latest robolectric version features new shadows clashing with our mocks

Add Changelog for new Kotlin Language version

96ee3c6

Fix missing proguard rules

fcf74d8

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

df830a5

Fix missing explicit API

b203084

Format code

317eb41

Fix missing explicit API

778c58f

markushi added 5 commits November 18, 2024 10:23

Fix formatting

393b37e

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

c253fe1

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

2a91970

Merge branch 'main' into chore/gradle-agp-kotlin-version-bump

c987526

Fix CodeQL jobs cancelling each other

bd9bb23

markushi mentioned this pull request Nov 27, 2024

#3784 Added javadocs & sources to Gradle's metadata. #3785

Closed

4 tasks

markushi requested a review from romtsn November 27, 2024 14:46

romtsn reviewed Nov 27, 2024

View reviewed changes

sentry-android-core/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

romtsn reviewed Nov 27, 2024

View reviewed changes

sentry-compose-helper/build.gradle.kts Outdated Show resolved Hide resolved

romtsn approved these changes Nov 27, 2024

View reviewed changes

Apply suggestions from code review

7470ec5

Co-authored-by: Roman Zavarnitsyn <rom4ek93@gmail.com>

markushi changed the base branch from main to 8.x.x November 28, 2024 07:30

markushi changed the base branch from 8.x.x to main November 28, 2024 07:30

markushi mentioned this pull request Nov 28, 2024

Bump Gradle, AGP and Kotlin versions #3936

Merged

7 tasks

markushi closed this Nov 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22 #3839

Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22 #3839

markushi commented Nov 1, 2024 •

edited

Loading

romtsn Nov 4, 2024

romtsn left a comment

markushi commented Nov 7, 2024

romtsn commented Nov 7, 2024

github-actions bot commented Nov 18, 2024 •

edited

Loading

Previous results on branch: chore/gradle-agp-kotlin-version-bump

Startup times

App size

romtsn Nov 27, 2024 •

edited

Loading

romtsn Nov 27, 2024

markushi Nov 28, 2024

romtsn Nov 27, 2024

romtsn Nov 27, 2024

romtsn Nov 27, 2024

romtsn left a comment

markushi commented Nov 28, 2024

Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22 #3839

Bump Gradle 8.9, AGP 8.6.0, Kotlin 1.9.22 #3839

Conversation

markushi commented Nov 1, 2024 • edited Loading

📜 Description

💡 Motivation and Context.

💚 How did you test it?

📝 Checklist

🔮 Next steps

romtsn Nov 4, 2024

Choose a reason for hiding this comment

romtsn left a comment

Choose a reason for hiding this comment

markushi commented Nov 7, 2024

romtsn commented Nov 7, 2024

github-actions bot commented Nov 18, 2024 • edited Loading

Performance metrics 🚀

Previous results on branch: chore/gradle-agp-kotlin-version-bump

Startup times

App size

romtsn Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

romtsn Nov 27, 2024

Choose a reason for hiding this comment

markushi Nov 28, 2024

Choose a reason for hiding this comment

romtsn Nov 27, 2024

Choose a reason for hiding this comment

romtsn Nov 27, 2024

Choose a reason for hiding this comment

romtsn Nov 27, 2024

Choose a reason for hiding this comment

romtsn left a comment

Choose a reason for hiding this comment

markushi commented Nov 28, 2024

markushi commented Nov 1, 2024 •

edited

Loading

github-actions bot commented Nov 18, 2024 •

edited

Loading

romtsn Nov 27, 2024 •

edited

Loading