Bump AGP and Gradle versions

getsentry · Jan 17, 2023 · ef7b1f7 · ef7b1f7
1 parent 67cac57
commit ef7b1f7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml
@@ -35,14 +35,14 @@ jobs:
           - agp: "7.3.0"
             gradle: "7.5"
             java: "11"
-          - agp: "7.3.0"
-            gradle: "7.6"
-            java: "11"
-          - agp: "7.4.0-rc01"
+          - agp: "7.4.0"
             gradle: "7.5"
             java: "11"
-          - agp: "8.0.0-alpha09"
-            gradle: "7.5"
+          - agp: "7.4.0"
+            gradle: "7.6"
+            java: "11"
+          - agp: "8.0.0-alpha11"
+            gradle: "7.6"
             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
@@ -2,7 +2,7 @@ import BuildPluginsVersion.SPRING_BOOT
 import org.gradle.util.VersionNumber
 
 object BuildPluginsVersion {
-    val AGP = System.getenv("VERSION_AGP") ?: "7.3.0"
+    val AGP = System.getenv("VERSION_AGP") ?: "7.4.0"
     const val DOKKA = "1.6.10"
     const val KOTLIN = "1.6.10"
     const val AAR_2_JAR = "0.6"
@@ -37,7 +37,7 @@ object Libs {
     // this allows us to develop against a fixed version of Gradle, as opposed to depending on the
     // locally available version. kotlin-gradle-plugin follows the same approach.
     // More info: https://docs.nokee.dev/manual/gradle-plugin-development-plugin.html
-    const val GRADLE_API = "dev.gradleplugins:gradle-api:7.5"
+    const val GRADLE_API = "dev.gradleplugins:gradle-api:7.6"
 
     // bytecode instrumentation
     const val ASM = "org.ow2.asm:asm-util:${LibsVersion.ASM}"

diff --git a/examples/android-instrumentation-sample/build.gradle.kts b/examples/android-instrumentation-sample/build.gradle.kts
@@ -29,6 +29,13 @@ android {
         }
     }
 
+    // just a random product flavor for compatibility testing against AGP
+    productFlavors {
+        create("staging") {
+            versionNameSuffix = "-staging"
+        }
+    }
+
     signingConfigs {
         getByName("debug") {
             storeFile = file("debug.keystore")

diff --git 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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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
@@ -103,9 +103,9 @@ abstract class BaseSentryPluginTest(
             arrayOf("7.2.1", "7.4"),
             arrayOf("7.2.1", "7.5"),
             arrayOf("7.3.0", "7.5"),
-            arrayOf("7.3.0", "7.6"),
-            arrayOf("7.4.0-rc01", "7.5"),
-            arrayOf("8.0.0-alpha09", "7.5")
+            arrayOf("7.4.0", "7.5"),
+            arrayOf("7.4.0", "7.6"),
+            arrayOf("8.0.0-alpha11", "7.6")
         )
 
         internal fun GradleRunner.appendArguments(vararg arguments: String) =