From 1bd3ed56e81dfa35343ecd2b0c78e5a8384bd253 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 12:11:30 +0200 Subject: [PATCH 01/11] Bump AGP version and update build matrix --- .github/workflows/test-publish-dry-run.yaml | 27 ++++++++++++++----- buildSrc/src/main/java/Dependencies.kt | 2 +- .../android/gradle/BaseSentryPluginTest.kt | 12 ++++++--- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 55ecec70..360b5b3b 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -29,14 +29,29 @@ jobs: - agp: "7.1.2" gradle: "7.4" java: "11" - - agp: "7.2.0" - gradle: "7.4" + - agp: "7.1.3" + gradle: "7.2" java: "11" - - agp: "7.3.0-beta01" - gradle: "7.4" + - agp: "7.1.3" + gradle: "7.5" java: "11" - - agp: "7.4.0-alpha02" - gradle: "7.4" + - agp: "7.2.1" + gradle: "7.3.3" + java: "11" + - agp: "7.2.1" + gradle: "7.5" + java: "11" + - agp: "7.3.0-beta05" + gradle: "7.3.3" + java: "11" + - agp: "7.3.0-beta05" + gradle: "7.5" + java: "11" + - agp: "7.4.0-alpha08" + gradle: "7.3.3" + java: "11" + - agp: "7.4.0-alpha08" + gradle: "7.5" java: "11" name: Publish Dry Run - AGP ${{ matrix.agp }} - Gradle ${{ matrix.gradle }} diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d0f3d2c3..6e1eeccf 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,5 +1,5 @@ object BuildPluginsVersion { - val AGP = System.getenv("VERSION_AGP") ?: "7.1.2" + val AGP = System.getenv("VERSION_AGP") ?: "7.2.1" const val DOKKA = "1.5.31" const val KOTLIN = "1.5.31" const val KOTLIN_LANG_VERSION = "1.5" diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt index 7496b8a6..e68fdea9 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt @@ -99,10 +99,14 @@ abstract class BaseSentryPluginTest( arrayOf("7.0.4", "7.2"), arrayOf("7.1.2", "7.2"), arrayOf("7.1.2", "7.3.3"), - arrayOf("7.1.3", "7.4"), - arrayOf("7.2.0", "7.4"), - arrayOf("7.3.0-beta01", "7.4"), - arrayOf("7.4.0-alpha01", "7.4.2") + arrayOf("7.1.3", "7.2"), + arrayOf("7.1.3", "7.5"), + arrayOf("7.2.1", "7.3.3"), + arrayOf("7.2.1", "7.5"), + arrayOf("7.3.0-beta05", "7.3.3"), + arrayOf("7.3.0-beta05", "7.5"), + arrayOf("7.4.0-alpha08", "7.3.3."), + arrayOf("7.4.0-alpha08", "7.5") ) internal fun GradleRunner.appendArguments(vararg arguments: String) = From e1236272a498b3dc345cf71b1986d1dca0ff4a36 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 13:04:51 +0200 Subject: [PATCH 02/11] Bump gradle wrapper version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1159fc5..2ec77e51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From bd7fe32207815221cc3743999aea1dde29cfdb2e Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 13:05:23 +0200 Subject: [PATCH 03/11] Bump AGP and gradle version in test --- .../io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt index 794874a2..63c3918d 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/SentryPluginWithFirebaseTest.kt @@ -4,7 +4,7 @@ import kotlin.test.assertTrue import org.junit.Test class SentryPluginWithFirebaseTest : - BaseSentryPluginTest(androidGradlePluginVersion = "7.1.2", gradleVersion = "7.4") { + BaseSentryPluginTest(androidGradlePluginVersion = "7.2.1", gradleVersion = "7.5") { @Test fun `does not break when there is a firebase-perf plugin applied`() { From 722d721cef0c6aaa80e580ad33861c7f79434535 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 15:28:18 +0200 Subject: [PATCH 04/11] CR --- .github/workflows/test-publish-dry-run.yaml | 18 ++++++------------ .../android/gradle/BaseSentryPluginTest.kt | 7 +++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 360b5b3b..950bdc06 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -20,17 +20,14 @@ jobs: - agp: "7.0.4" gradle: "7.2" java: "11" - - agp: "7.1.2" + - agp: "7.1.3" gradle: "7.2" java: "11" - - agp: "7.1.2" + - agp: "7.1.3" gradle: "7.3.3" java: "11" - - agp: "7.1.2" - gradle: "7.4" - java: "11" - agp: "7.1.3" - gradle: "7.2" + gradle: "7.4" java: "11" - agp: "7.1.3" gradle: "7.5" @@ -39,17 +36,14 @@ jobs: gradle: "7.3.3" java: "11" - agp: "7.2.1" - gradle: "7.5" + gradle: "7.4" java: "11" - - agp: "7.3.0-beta05" - gradle: "7.3.3" + - agp: "7.2.1" + gradle: "7.5" java: "11" - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha08" - gradle: "7.3.3" - java: "11" - agp: "7.4.0-alpha08" gradle: "7.5" java: "11" diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt index e68fdea9..027a86c8 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt @@ -97,15 +97,14 @@ abstract class BaseSentryPluginTest( arrayOf("7.0.4", "7.0.2"), arrayOf("7.0.4", "7.1.1"), arrayOf("7.0.4", "7.2"), - arrayOf("7.1.2", "7.2"), - arrayOf("7.1.2", "7.3.3"), arrayOf("7.1.3", "7.2"), + arrayOf("7.1.3", "7.3.3"), + arrayOf("7.1.3", "7.4"), arrayOf("7.1.3", "7.5"), arrayOf("7.2.1", "7.3.3"), + arrayOf("7.2.1", "7.4"), arrayOf("7.2.1", "7.5"), - arrayOf("7.3.0-beta05", "7.3.3"), arrayOf("7.3.0-beta05", "7.5"), - arrayOf("7.4.0-alpha08", "7.3.3."), arrayOf("7.4.0-alpha08", "7.5") ) From 578bfb11b191d3c0c530cbfc7a3ea060f391a6ea Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 16:31:50 +0200 Subject: [PATCH 05/11] Try older alpha release for Java compatibility --- .github/workflows/test-publish-dry-run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 950bdc06..9df49f5d 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -44,7 +44,7 @@ jobs: - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha08" + - agp: "7.4.0-alpha07" gradle: "7.5" java: "11" From a7fb8795af5d993c85bc06435231865c304093db Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 16:54:52 +0200 Subject: [PATCH 06/11] Try alpha06 release for Java compatibility --- .github/workflows/test-publish-dry-run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 9df49f5d..83f6e219 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -44,7 +44,7 @@ jobs: - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha07" + - agp: "7.4.0-alpha06" gradle: "7.5" java: "11" From f32b9a58d3e9a5deeeecaa94a27e865d6a9ec81e Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 17:02:15 +0200 Subject: [PATCH 07/11] Try alpha05 release for Java compatibility --- .github/workflows/test-publish-dry-run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 83f6e219..18ed8a1a 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -44,7 +44,7 @@ jobs: - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha06" + - agp: "7.4.0-alpha05" gradle: "7.5" java: "11" From 19800ebb6d87ff210239a0975e2a21a5065732e3 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 17:09:00 +0200 Subject: [PATCH 08/11] Try alpha04 release for Java compatibility --- .github/workflows/test-publish-dry-run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 18ed8a1a..4a262b2f 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -44,7 +44,7 @@ jobs: - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha05" + - agp: "7.4.0-alpha04" gradle: "7.5" java: "11" From 793b9b388fbe03053e16a86d9a3bac4e5a2f266f Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 17:13:53 +0200 Subject: [PATCH 09/11] Try alpha03 release for Java compatibility --- .github/workflows/test-publish-dry-run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 4a262b2f..be6f002f 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -44,7 +44,7 @@ jobs: - agp: "7.3.0-beta05" gradle: "7.5" java: "11" - - agp: "7.4.0-alpha04" + - agp: "7.4.0-alpha03" gradle: "7.5" java: "11" From 33517c5d00dbb4a1bfabc42c2909e33fec78b3a2 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 17:35:21 +0200 Subject: [PATCH 10/11] Add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ef1f29c..e41bef9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Features + +- Bump AGP to 7.2.1 and Gradle to 7.5.0 ([#363](https://github.com/getsentry/sentry-android-gradle-plugin/pull/363)) + ## 3.1.3 ### Features From 5c7076956207edbab4c4269a5c76268bc01936a0 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Wed, 3 Aug 2022 18:16:38 +0200 Subject: [PATCH 11/11] Also set AGP version to 7.4.0-alpha3 for BaseSentryPluginTest --- .../kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt index 027a86c8..7896393d 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt @@ -105,7 +105,7 @@ abstract class BaseSentryPluginTest( arrayOf("7.2.1", "7.4"), arrayOf("7.2.1", "7.5"), arrayOf("7.3.0-beta05", "7.5"), - arrayOf("7.4.0-alpha08", "7.5") + arrayOf("7.4.0-alpha03", "7.5") ) internal fun GradleRunner.appendArguments(vararg arguments: String) =