Drop support for AGP 7.0-7.3, Gradle 7.0-7.5 (#911)

* Drop support for AGP 7.0-7.3

* Simplify sourcesets

* Remove variants

* Remove Gradle 7.5 and below compat

* Gradle 7.5 drop

* Add versions to Sentry ExternalDependenciesReprotTaskTest

* Delete unused classes

* Update CHANGELOG.md

add breaking changes section

Co-authored-by: Roman Zavarnitsyn <[email protected]>

---------

Co-authored-by: Roman Zavarnitsyn <[email protected]>

Author: runningcode

.github/workflows/test-matrix-agp-gradle.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        agp: [ "7.3.0" ]
+        agp: [ "7.4.0" ]
         gradle: [ "7.6.4" ]
         java: [ "11" ]
         groovy: [ "1.2" ]

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Enable caching for BundleSourcesTask ([#894](https://github.com/getsentry/sentry-android-gradle-plugin/pull/894)
 
+### Breaking Changes
+
+- Drop support for Android Gradle Plugin 7.3.X and below. To continue to use 7.3.X and below use Sentry Android Gradle Plugin 5.7.0. ([#911](https://github.com/getsentry/sentry-android-gradle-plugin/pull/911))
+
 ### Dependencies
 
 - Bump Android SDK from v8.12.0 to v8.13.3 ([#896](https://github.com/getsentry/sentry-android-gradle-plugin/pull/896), [#914](https://github.com/getsentry/sentry-android-gradle-plugin/pull/914))

plugin-build/build.gradle.kts

@@ -27,9 +27,6 @@ BootstrapAndroidSdk.locateAndroidSdk(project, extra)
 val androidSdkPath: String? by extra
 val testImplementationAar by configurations.getting // this converts .aar into .jar dependencies
 
-val agp70: SourceSet by sourceSets.creating
-val agp74: SourceSet by sourceSets.creating
-
 val shade: Configuration by
   configurations.creating {
     isCanBeConsumed = false
@@ -39,18 +36,8 @@ val shade: Configuration by
 val fixtureClasspath: Configuration by configurations.creating
 
 dependencies {
-  agp70.compileOnlyConfigurationName(libs.gradleApi)
-  agp70.compileOnlyConfigurationName(Libs.agp("7.0.4"))
-  agp70.compileOnlyConfigurationName(project(":common"))
-
-  agp74.compileOnlyConfigurationName(libs.gradleApi)
-  agp74.compileOnlyConfigurationName(Libs.agp("7.4.0"))
-  agp74.compileOnlyConfigurationName(project(":common"))
-
   compileOnly(libs.gradleApi)
   compileOnly(Libs.AGP)
-  compileOnly(agp70.output)
-  compileOnly(agp74.output)
   compileOnly(libs.proguard)
 
   implementation(libs.asm)
@@ -68,11 +55,7 @@ dependencies {
   testImplementation(gradleTestKit())
   testImplementation(kotlin("test"))
   testImplementation(Libs.AGP)
-  testImplementation(agp70.output)
-  testImplementation(agp74.output)
   testImplementation(project(":common"))
-  fixtureClasspath(agp70.output)
-  fixtureClasspath(agp74.output)
   fixtureClasspath(project(":common"))
   testImplementation(libs.proguard)
   testImplementation(libs.junit)
@@ -187,11 +170,6 @@ gradlePlugin {
   }
 }
 
-tasks.withType<Jar>().configureEach {
-  from(agp70.output)
-  from(agp74.output)
-}
-
 tasks.withType<ShadowJar>().configureEach {
   archiveClassifier.set("")
   configurations = listOf(shade)

plugin-build/src/agp70/kotlin/io/sentry/android/gradle/AGP70Compat.kt

@@ -7,7 +7,6 @@ import com.android.build.api.instrumentation.AsmClassVisitorFactory
 import com.android.build.api.instrumentation.FramesComputationMode
 import com.android.build.api.instrumentation.InstrumentationParameters
 import com.android.build.api.instrumentation.InstrumentationScope
-import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.CanMinifyCode
 import com.android.build.api.variant.Variant
 import com.android.build.api.variant.impl.ApplicationVariantImpl
@@ -109,10 +108,3 @@ fun <T : InstrumentationParameters> configureInstrumentationFor74(
   variant.instrumentation.setAsmFramesComputationMode(mode)
   variant.instrumentation.excludes.set(excludes)
 }
-
-fun onVariants74(
-  androidComponentsExt: AndroidComponentsExtension<*, *, *>,
-  callback: (Variant) -> Unit,
-) {
-  androidComponentsExt.onVariants(callback = callback)
-}