Remove some AGP 3.1 and 3.2 related hacks.

TWiStErRob · Jan 24, 2023 · 464d7b5 · 464d7b5
1 parent 61170d1
commit 464d7b5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/...agp-42x/src/main/kotlin/net/twisterrob/gradle/internal/lint/LintBaseTask-extensions42x.kt b/...agp-42x/src/main/kotlin/net/twisterrob/gradle/internal/lint/LintBaseTask-extensions42x.kt
@@ -26,13 +26,6 @@ private val LintBaseTask.isFatalOnly
  * Due to Kotlin limitations, cannot polyfill `variantName` (extension methods are compile time bound),
  * so introducing a separate property is a good compromise.
  * This only calls [LintPerVariantTask.variantName] when it actually exists.
- * 3.1.4, 3.2.1:
- *  * [AndroidVariantTask.variantName] : [DefaultTask]
- *  * [LintPerVariantTask] : [LintBaseTask]
- *  * [LintGlobalTask] : [LintBaseTask]
- *  * [LintFixTask] (new in 3.2.0) : [LintBaseTask]
- *  * [LintBaseTask] : `com.android.build.gradle.internal.tasks.AndroidBuilderTask`
- *  * `AndroidBuilderTask` : [AndroidVariantTask]
  * 3.3.3, 3.6.4, 4.0.0, 4.1.0:
  *  * [AndroidVariantTask] : [DefaultTask], [VariantAwareTask.variantName]
  *  * [LintPerVariantTask] : [LintBaseTask], [VariantAwareTask.variantName]
@@ -55,11 +48,6 @@ val LintBaseTask.androidVariantName: String?
 			// because before 4.2.0 LintGlobalTask/LintFixTask didn't implement the interface.
 			// Force compile time binding to the interface, because a super of LintBaseTask may override the property.
 			(this as VariantAwareTask).variantName
-		@Suppress("KotlinConstantConditions")
-		(AGPVersions.CLASSPATH < AGPVersions.v33x && @Suppress("USELESS_IS_CHECK") (this is AndroidVariantTask)) ->
-			// USELESS_IS_CHECK: Historical binding to inherited property.
-			@Suppress("CAST_NEVER_SUCCEEDS")
-			(this as AndroidVariantTask).variantName
 		this is LintGlobalTask -> null
 		AGPVersions.v32x < AGPVersions.CLASSPATH && this is LintFixTask -> null
 		else -> null

diff --git a/gradle/agp.versions.toml b/gradle/agp.versions.toml
@@ -1,6 +1,4 @@
 [libraries]
-android-gradle-v31x = { module = "com.android.tools.build:gradle", version = "3.1.4" }
-android-gradle-v32x = { module = "com.android.tools.build:gradle", version = "3.2.1" }
 android-gradle-v33x = { module = "com.android.tools.build:gradle", version = "3.3.3" }
 android-gradle-v34x = { module = "com.android.tools.build:gradle", version = "3.4.3" }
 android-gradle-v35x = { module = "com.android.tools.build:gradle", version = "3.5.4" }