Merge pull request #155 from chenenyu/dev

1.7.5
chenenyu · Nov 18, 2020 · 3ddd6f5 · 3ddd6f5
2 parents 4ebfbd5 + d6123b2
commit 3ddd6f5
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 106 deletions.
diff --git a/Sample/app/build.gradle b/Sample/app/build.gradle
@@ -28,7 +28,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
     implementation project(':module1')
     implementation project(':module2')
     testImplementation 'junit:junit:4.12'

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.71'
+    ext.kotlin_version = '1.4.10'
     repositories {
         maven { url 'repo' }
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
         if (Boolean.valueOf(applyRemotePlugin)) {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -13,7 +13,7 @@ if (!Boolean.valueOf(applyRemotePlugin)) {
     dependencies {
         compile gradleApi()
         compile localGroovy()
-        compile 'com.android.tools.build:gradle:3.6.3'
+        compile 'com.android.tools.build:gradle:4.0.0'
     }
 
     sourceSets {

diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -11,7 +11,7 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    compileOnly 'com.android.tools.build:gradle:3.6.3'
+    compileOnly 'com.android.tools.build:gradle:4.0.0'
 }
 
 ext {

diff --git a/gradle-plugin/src/main/groovy/com/chenenyu/router/RouterPlugin.groovy b/gradle-plugin/src/main/groovy/com/chenenyu/router/RouterPlugin.groovy
@@ -14,17 +14,15 @@ class RouterPlugin implements Plugin<Project> {
     private static final String APT_OPTION_MODULE_NAME = "moduleName"
     private static final String APT_OPTION_LOGGABLE = "loggable"
 
-    String DEFAULT_ROUTER_RUNTIME_VERSION = "1.7.4"
-    String DEFAULT_ROUTER_COMPILER_VERSION = "1.7.4"
+    String DEFAULT_ROUTER_RUNTIME_VERSION = "1.7.5"
+    String DEFAULT_ROUTER_COMPILER_VERSION = "1.7.5"
 
     @Override
     void apply(Project project) {
-        if (!project.plugins.hasPlugin(AppPlugin)                                // AppPlugin
-                && !project.plugins.hasPlugin(LibraryPlugin)                     // LibraryPlugin
-                && !project.plugins.hasPlugin(TestPlugin)                        // TestPlugin
-                && !project.plugins.hasPlugin(InstantAppPlugin)                  // InstantAppPlugin, added in 3.0
-                && !project.plugins.hasPlugin(FeaturePlugin)                     // FeaturePlugin, added in 3.0
-                && !project.plugins.hasPlugin("com.android.dynamic-feature")) // DynamicFeaturePlugin, added in 3.2
+        if (!project.plugins.hasPlugin(AppPlugin)                    // com.android.application
+                && !project.plugins.hasPlugin(LibraryPlugin)         // com.android.library
+                && !project.plugins.hasPlugin(TestPlugin)            // com.android.test
+                && !project.plugins.hasPlugin(DynamicFeaturePlugin)) // com.android.dynamic-feature, added in 3.2
         {
             throw new GradleException("android plugin required.")
         }

diff --git a/gradle-plugin/src/main/groovy/com/chenenyu/router/RouterTransform.groovy b/gradle-plugin/src/main/groovy/com/chenenyu/router/RouterTransform.groovy
@@ -44,15 +44,6 @@ class RouterTransform extends Transform {
         return true
     }
 
-    @Override
-    void transform(Context context,
-                   Collection<TransformInput> inputs,
-                   Collection<TransformInput> referencedInputs,
-                   TransformOutputProvider outputProvider,
-                   boolean isIncremental)
-            throws IOException, TransformException, InterruptedException {
-    }
-
     @Override
     void transform(TransformInvocation transformInvocation)
             throws TransformException, InterruptedException, IOException {

diff --git a/gradle.properties b/gradle.properties
@@ -16,10 +16,10 @@ android.useAndroidX=true
 # apply router plugin
 applyRemotePlugin=false
 # router gradle plugin version
-PLUGIN_VERSION=1.7.4
+PLUGIN_VERSION=1.7.5
 # router library version
-ROUTER_VERSION=1.7.4
+ROUTER_VERSION=1.7.5
 # compiler library version
-COMPILER_VERSION=1.7.4
+COMPILER_VERSION=1.7.5
 # annotation library version
 ANNOTATION_VERSION=0.5.0
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -53,92 +53,29 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     archiveClassifier.set('javadoc')
 }
 
-// handle aar artifact
-
-// The following types/formats are supported:
-//  - Instances of MavenArtifact.
-//  - Instances of AbstractArchiveTask, for example jar.
-//  - Instances of PublishArtifact
-//  - Maps containing a 'source' entry, for example [source: '/path/to/file', extension: 'zip'].
-//  - Anything that can be converted to a file, as per Project.file()
-def aarArtifact = null
-if (isAndroidModule) {
-    if (project.ext.has('AAR')) {
-        aarArtifact = project.ext.AAR
-    } else {
-        project.afterEvaluate {
-            def bundleAarTask = project.tasks.findByPath('bundleRelease')
-            if (!bundleAarTask) {
-                bundleAarTask = project.tasks.findByPath('bundleReleaseAar') // gradle plugin 3.2
-            }
-            if (bundleAarTask && (bundleAarTask instanceof AbstractArchiveTask)) {
-                aarArtifact = bundleAarTask
-            }
-            if (!aarArtifact) {
-                throw new MissingPropertyException("Extra properties['AAR'] are required.")
-            }
-        }
-    }
-}
-
-def synchronized verifyDependency(Dependency it) {
-    return it.group != null && it.group != 'unspecified' && it.name != 'unspecified' &&
-            it.version != null && it.version != 'unspecified'
-}
-
 project.afterEvaluate {
     publishing {
         publications {
-            Bintray(MavenPublication) {
+            release(MavenPublication) {
                 groupId project.ext.GROUP
                 artifactId project.ext.ARTIFACT
                 version project.ext.VERSION
 
                 artifact sourcesJar
                 artifact javadocJar
                 if (isAndroidModule) {
-                    artifact aarArtifact
+                    from components.release
                 } else if (isJavaModule) {
                     from components.java
-//                    artifact jar
                 }
 
-                pom {
-                    if (isAndroidModule) {
-                        packaging 'aar'
-                    } else if (isJavaModule) {
-                        packaging 'jar'
-                    }
-                    if (isAndroidModule) {
-                        withXml {
-                            def dependenciesNode = asNode().appendNode('dependencies')
-                            configurations.compile.dependencies.each {
-                                if (verifyDependency(it)) {
-                                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                                    dependencyNode.appendNode('groupId', it.group)
-                                    dependencyNode.appendNode('artifactId', it.name)
-                                    dependencyNode.appendNode('version', it.version)
-                                }
-                            }
-                            configurations.implementation.dependencies.each {
-                                if (verifyDependency(it)) {
-                                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                                    dependencyNode.appendNode('groupId', it.group)
-                                    dependencyNode.appendNode('artifactId', it.name)
-                                    dependencyNode.appendNode('version', it.version)
-                                }
-                            }
-                            configurations.api.dependencies.each {
-                                if (verifyDependency(it)) {
-                                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                                    dependencyNode.appendNode('groupId', it.group)
-                                    dependencyNode.appendNode('artifactId', it.name)
-                                    dependencyNode.appendNode('version', it.version)
-                                }
-                            }
-                        }
-                    }
-                }
+//                pom {
+//                    if (isAndroidModule) {
+//                        packaging 'aar'
+//                    } else if (isJavaModule) {
+//                        packaging 'jar'
+//                    }
+//                }
             }
         }
     }
@@ -150,7 +87,7 @@ project.afterEvaluate {
     bintray {
         user = properties.containsKey('BINTRAY_USER') ? properties.get('BINTRAY_USER') : ""
         key = properties.containsKey('BINTRAY_API_KEY') ? properties.get('BINTRAY_API_KEY') : ""
-        publications = ['Bintray']
+        publications = ['release']
         publish = project.ext.has('PUBLISH') ? project.ext.PUBLISH : true
         override = project.ext.has('OVERRIDE') ? project.ext.OVERRIDE : false
         dryRun = project.ext.has('DRYRUN') ? project.ext.DRYRUN : false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 28 18:52:44 CST 2020
+#Wed Nov 18 11:23:42 CST 2020
 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.5-all.zip
diff --git a/release.sh b/release.sh
@@ -1,15 +1,15 @@
 # annotation
-./gradlew clean pBPTML -p annotation
+./gradlew clean pRPTML -p annotation
 ./gradlew bintrayUpload -p annotation
 
 # compiler
-./gradlew clean pBPTML -p compiler
+./gradlew clean pRPTML -p compiler
 ./gradlew bintrayUpload -p compiler
 
 # router
-./gradlew clean pBPTML -p router
+./gradlew clean pRPTML -p router
 ./gradlew bintrayUpload -p router
 
 # gradle-plugin
-./gradlew clean pBPTML -p gradle-plugin
+./gradlew clean pRPTML -p gradle-plugin
 ./gradlew bintrayUpload -p gradle-plugin
diff --git a/router/build.gradle b/router/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     compileOnly 'androidx.annotation:annotation:1.1.0'
-    compileOnly "androidx.fragment:fragment:1.2.4"
+    compileOnly "androidx.fragment:fragment:1.2.5"
     //    api project(':annotation')
     api "com.chenenyu.router:annotation:${ANNOTATION_VERSION}"
 }

diff --git a/router/src/main/java/com/chenenyu/router/chain/AppInterceptorsHandler.java b/router/src/main/java/com/chenenyu/router/chain/AppInterceptorsHandler.java
@@ -36,7 +36,8 @@ public RouteResponse intercept(Chain chain) {
 
         // insert global interceptors in front of the queue
         if (!Router.getGlobalInterceptors().isEmpty()) {
-            realChain.getInterceptors().addAll(index++, Router.getGlobalInterceptors());
+            realChain.getInterceptors().addAll(index, Router.getGlobalInterceptors());
+            index = Router.getGlobalInterceptors().size();
         }
 
         Set<String> finalInterceptors = new LinkedHashSet<>();