diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml index 55ecec70..be6f002f 100644 --- a/.github/workflows/test-publish-dry-run.yaml +++ b/.github/workflows/test-publish-dry-run.yaml @@ -20,24 +20,33 @@ 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" + - agp: "7.1.3" gradle: "7.4" java: "11" - - agp: "7.2.0" - gradle: "7.4" + - agp: "7.1.3" + gradle: "7.5" java: "11" - - agp: "7.3.0-beta01" - gradle: "7.4" + - agp: "7.2.1" + gradle: "7.3.3" java: "11" - - agp: "7.4.0-alpha02" + - agp: "7.2.1" gradle: "7.4" java: "11" + - agp: "7.2.1" + gradle: "7.5" + java: "11" + - agp: "7.3.0-beta05" + gradle: "7.5" + java: "11" + - agp: "7.4.0-alpha03" + gradle: "7.5" + java: "11" name: Publish Dry Run - AGP ${{ matrix.agp }} - Gradle ${{ matrix.gradle }} env: 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 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/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 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..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 @@ -97,12 +97,15 @@ 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.2.0", "7.4"), - arrayOf("7.3.0-beta01", "7.4"), - arrayOf("7.4.0-alpha01", "7.4.2") + 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.5"), + arrayOf("7.4.0-alpha03", "7.5") ) internal fun GradleRunner.appendArguments(vararg arguments: String) = 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`() {