Merge pull request #498 from yanzhenjie/dev

Release v2.1.12.
yanzhenjie · Jun 7, 2023 · 23a7c15 · 23a7c15
2 parents 3960fd7 + 53ace08
commit 23a7c15
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,14 @@
-*.iml
-/.idea/
-/build/
-.gradle
-/local.properties
+.cxx
 .DS_Store
-/captures
 .externalNativeBuild
-/maven-repo
+.gradle
+.vscode
+/build
+/captures
+/output
+/.gradle
+/.idea
+local.properties
+*.iml
+*.log
+*.apk
diff --git a/README.md b/README.md
@@ -126,7 +126,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.yanzhenjie.andserver:plugin:2.1.11'
+        classpath 'com.yanzhenjie.andserver:plugin:2.1.12'
         ...
     }
 }
@@ -148,8 +148,8 @@ apply plugin: 'com.yanzhenjie.andserver'
 ...
 
 dependencies {
-    implementation 'com.yanzhenjie.andserver:api:2.1.11'
-    annotationProcessor 'com.yanzhenjie.andserver:processor:2.1.11'
+    implementation 'com.yanzhenjie.andserver:api:2.1.12'
+    annotationProcessor 'com.yanzhenjie.andserver:processor:2.1.12'
     ...
 }
 ```

diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath 'com.yanzhenjie.andserver:plugin:2.1.11'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.yanzhenjie.andserver:plugin:2.1.12'
     }
 }
 

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.properties b/gradle.properties
@@ -1,7 +1,7 @@
 android.useAndroidX=true
 
 POM_GROUP_ID=com.yanzhenjie.andserver
-POM_VERSION=2.1.11
+POM_VERSION=2.1.12
 
 POM_DESCRIPTION=Android web server.
 

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());
             }
         });
     }