keep agp up to date

jaredsburrows · Jan 29, 2024 · 4ed563e · 4ed563e
1 parent 7065966
commit 4ed563e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/ProjectAndroid.kt b/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/ProjectAndroid.kt
@@ -3,8 +3,6 @@ package com.jaredsburrows.license
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.FeatureExtension
-import com.android.build.gradle.FeaturePlugin
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin
 import com.android.build.gradle.TestExtension
@@ -21,8 +19,6 @@ internal fun Project.isAndroidProject(): Boolean {
       // AppPlugin
       "android",
       "com.android.application",
-      // FeaturePlugin
-      "com.android.feature",
       // LibraryPlugin
       "android-library",
       "com.android.library",
@@ -36,7 +32,6 @@ internal fun Project.isAndroidProject(): Boolean {
  * Configure for Android projects.
  *
  * AppPlugin - "android", "com.android.application"
- * FeaturePlugin - "com.android.feature"
  * LibraryPlugin - "android-library", "com.android.library"
  * TestPlugin - "com.android.test"
  */
@@ -51,15 +46,6 @@ internal fun Project.configureAndroidProject() {
         }
       }
 
-      is FeaturePlugin -> {
-        extensions.getByType(FeatureExtension::class.java).run {
-          configureVariant(this, featureVariants)
-          configureVariant(this, libraryVariants)
-          configureVariant(this, testVariants)
-          configureVariant(this, unitTestVariants)
-        }
-      }
-
       is LibraryPlugin -> {
         extensions.getByType(LibraryExtension::class.java).run {
           configureVariant(this, libraryVariants)

diff --git a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy
@@ -13,7 +13,6 @@ final class LicensePluginSpec extends Specification {
   @Rule
   public final TemporaryFolder testProjectDir = new TemporaryFolder()
   private int compileSdkVersion = 34
-  private String agpVersion = "3.6.4"
   private List<File> pluginClasspath
   private String classpathString
   private File buildFile
@@ -206,7 +205,6 @@ final class LicensePluginSpec extends Specification {
         }
 
         dependencies {
-          classpath "com.android.tools.build:gradle:$agpVersion"
           classpath files($classpathString)
         }
       }
@@ -233,7 +231,6 @@ final class LicensePluginSpec extends Specification {
         }
 
         dependencies {
-          classpath "com.android.tools.build:gradle:$agpVersion"
           classpath files($classpathString)
         }
       }
@@ -262,8 +259,6 @@ final class LicensePluginSpec extends Specification {
       // AppPlugin
       'android',
       'com.android.application',
-      // FeaturePlugin
-      'com.android.feature',
       // LibraryPlugin
       'android-library',
       'com.android.library',

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 license = { id = "com.jaredsburrows.license", version = "0.9.4" }
 
 [libraries]
-android-plugin = { module = "com.android.tools.build:gradle", version = "3.6.4" }
+android-plugin = { module = "com.android.tools.build:gradle", version = "8.2.2" }
 commons = { module = "org.apache.commons:commons-csv", version = "1.10.0" }
 moshi = { module = "com.squareup.moshi:moshi", version = "1.15.0" }
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }