Upgrade apg to 4.2.2 and gradle to 6.7.1.

yanzhenjie · Jun 7, 2023 · 677def7 · 677def7
1 parent 18a296c
commit 677def7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.yanzhenjie.andserver:plugin:2.1.11'
     }
 }

diff --git a/config.gradle b/config.gradle
@@ -21,7 +21,7 @@ ext {
 
     deps = [
         android: [
-            plugin    : 'com.android.tools.build:gradle:3.6.3',
+            plugin    : 'com.android.tools.build:gradle:4.2.2',
             annotation: 'androidx.annotation:annotation:1.1.0',
             compat    : 'androidx.appcompat:appcompat:1.1.0',
             material  : 'com.google.android.material:material:1.1.0',

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/plugin/src/main/java/com/yanzhenjie/andserver/plugin/AndServerPlugin.java b/plugin/src/main/java/com/yanzhenjie/andserver/plugin/AndServerPlugin.java
@@ -17,8 +17,6 @@
 
 import com.android.build.gradle.AppExtension;
 import com.android.build.gradle.AppPlugin;
-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.api.BaseVariant;
@@ -51,9 +49,6 @@ public void apply(@Nonnull Project project) {
             } else if (it instanceof LibraryPlugin) {
                 LibraryExtension extension = project.getExtensions().getByType(LibraryExtension.class);
                 configGenerator(project, extension.getLibraryVariants());
-            } else if (it instanceof FeaturePlugin) {
-                FeatureExtension extension = project.getExtensions().getByType(FeatureExtension.class);
-                configGenerator(project, extension.getFeatureVariants());
             }
         });
     }