准备发布 1.9.2.2-incremental1

准备发布 1.9.2.2-incremental1 1. 解决了增量更新的问题 2. 升级基础库
xiaojinzi123 · Apr 15, 2023 · 3cde4a0 · 3cde4a0
1 parent 9436a13
commit 3cde4a0
Show file tree

Hide file tree

Showing 108 changed files with 420 additions and 447 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/ComponentApi/build.gradle b/ComponentApi/build.gradle
@@ -1,17 +1,33 @@
-apply plugin: 'java-library'
-apply plugin: 'com.github.dcendents.android-maven'
+plugins {
+    id 'java-library'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'maven-publish'
+}
 
-group = 'com.github.xiaojinzi123'
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
 
+group = 'com.github.xiaojinzi123'
 archivesBaseName = "component-annotation"
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
-sourceCompatibility = "8"
-targetCompatibility = "8"
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
 
-repositories {
-    mavenCentral()
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId project.group
+            artifactId archivesBaseName
+            version project.version
+            from components.java
+        }
+    }
 }
diff --git a/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ConditionalAnno.java b/ComponentApi/src/main/java/com/xiaojinzi/component/anno/ConditionalAnno.java
@@ -16,7 +16,7 @@
 public @interface ConditionalAnno {
 
     /**
-     * 指定多个条件的类,指定的这些类必须实现 {@link com.xiaojinzi.component.support.Condition} 接口
+     * 指定多个条件的类,指定的这些类必须实现 com.xiaojinzi.component.support.Condition 接口
      * 所有都返回了 true 才表示条件成立
      */
     Class[] conditions();

diff --git a/ComponentCompiler/build.gradle b/ComponentCompiler/build.gradle
@@ -1,30 +1,48 @@
-apply plugin: 'java-library'
-apply plugin: 'com.github.dcendents.android-maven'
+plugins {
+    id 'java-library'
+    id 'org.jetbrains.kotlin.jvm'
+    id 'maven-publish'
+}
 
-group = 'com.github.xiaojinzi123'
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
 
+group = 'com.github.xiaojinzi123'
 archivesBaseName = "component-compiler"
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+// 配置模块的 freeCompilerArgs 参数
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        freeCompilerArgs += [
+                "-Xjvm-default=all",
+        ]
+    }
 }
 
-sourceCompatibility = "8"
-targetCompatibility = "8"
-
 dependencies {
-    implementation 'com.google.auto.service:auto-service:1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.auto.service:auto-service:1.0.1'
     implementation 'com.squareup:javapoet:1.13.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.apache.commons:commons-collections4:4.4'
-    implementation 'com.google.code.gson:gson:2.8.7'
-    if (rootProject.ext.isDependMavenOnline) {
-        implementation androidxLibs.component_annotation
-    } else {
-        implementation project(':ComponentApi')
-    }
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation project(':ComponentApi')
 }
 
-repositories {
-    mavenCentral()
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId project.group
+            artifactId archivesBaseName
+            version project.version
+            from components.java
+        }
+    }
 }
diff --git a/ComponentCompiler/src/main/java/com/xiaojinzi/component/ModuleAppProcessor.java b/ComponentCompiler/src/main/java/com/xiaojinzi/component/ModuleAppProcessor.java
@@ -142,9 +142,12 @@ private void createImpl(boolean isDefault) {
             JavaFile
                     .builder(pkg, typeSpec)
                     .indent("    ")
-                    .build().writeTo(mFiler);
+                    .build()
+                    .writeTo(mFiler);
         } catch (IOException e) {
             throw new ProcessException(e);
+        } catch (Exception e) {
+            // ignore
         }
     }
 

diff --git a/ComponentCompiler/src/main/java/com/xiaojinzi/component/RouterProcessor.java b/ComponentCompiler/src/main/java/com/xiaojinzi/component/RouterProcessor.java
@@ -18,13 +18,10 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import javax.annotation.processing.ProcessingEnvironment;
@@ -397,7 +394,7 @@ public void accept(RouterAnnoBean routerBean) {
                                 "routerBeanMap.put(defaultScheme + $S,$N)",
                                 "://" + routerBean.hostAndPath(), routerBeanName
                         );
-                    } else  {
+                    } else {
                         String key = scheme + "://" + routerBean.hostAndPath();
                         initMapMethodSpecBuilder.addStatement("routerBeanMap.put($S,$N)", key, routerBeanName);
                     }
@@ -543,7 +540,7 @@ private void generateStaticMethodCall(RouterAnnoBean routerBean, String routerBe
             // 添加一个匿名内部类
             methodSpecBuilder.addStatement("$N.setCustomerIntentCall($L)", routerBeanName, intentCallTypeSpec);
         } else { // 自定义跳转的
-            throw new ProcessException("the return type of method(" + customerIntentOrJumpPath + ") must be 'Intent' ");
+            throw new ProcessException("the return type of method(" + customerIntentOrJumpPath + ") must be '" + ComponentConstants.ANDROID_INTENT + "', now is " + customerReturnType.toString() + "!");
         }
     }
 

diff --git a/ComponentCompiler/src/main/resources/META-INF/gradle/incremental.annotation.processors b/ComponentCompiler/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1,8 @@
+com.xiaojinzi.component.ModuleAppProcessor,aggregating
+com.xiaojinzi.component.RouterProcessor,aggregating
+com.xiaojinzi.component.RouterDegradeProcessor,aggregating
+com.xiaojinzi.component.InterceptorProcessor,aggregating
+com.xiaojinzi.component.ServiceProcessor,aggregating
+com.xiaojinzi.component.FragmentProcessor,aggregating
+com.xiaojinzi.component.AutowireProcessor,aggregating
+com.xiaojinzi.component.RouterApiProcessor,aggregating
diff --git a/ComponentImpl/build.gradle b/ComponentImpl/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'maven-publish'
 
 group = 'com.github.xiaojinzi123'
 archivesBaseName = "component-impl"
@@ -23,27 +22,50 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
+    publishing {
+        singleVariant("release") {
+            // if you don't want sources/javadoc, remove these lines
+            withSourcesJar()
+        }
     }
 
 }
 
 dependencies {
-    compileOnly androidxLibs.appcompat
-    if (rootProject.ext.isDependMavenOnline) {
-        api androidxLibs.component_annotation
-    }else {
-        api project(':ComponentApi')
-    }
+    compileOnly libs.appcompat
+    api project(':ComponentApi')
 }
 
 task androidSourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
+    archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
 }
 
-
 artifacts {
     archives androidSourcesJar
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                // Applies the component for the release build variant.
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = group
+                artifactId = archivesBaseName
+                version = version
+            }
+        }
+    }
+}
diff --git a/ComponentKtImpl/build.gradle b/ComponentKtImpl/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'maven-publish'
 
 group = 'com.github.xiaojinzi123'
-
 archivesBaseName = "component-impl-ktx"
 
 android {
+
     compileSdkVersion versions.android_compile_sdk
     defaultConfig {
         minSdkVersion versions.android_min_sdk
@@ -22,15 +21,55 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
+
+    publishing {
+        singleVariant("release") {
+            // if you don't want sources/javadoc, remove these lines
+            withSourcesJar()
+        }
+    }
+
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compileOnly libs.kt_coroutines_core
-    compileOnly androidxLibs.appcompat
-    if (rootProject.ext.isDependMavenOnline) {
-        api libs.component_impl
-    }else {
-        api project(':ComponentImpl')
+    compileOnly libs.appcompat
+    api project(':ComponentImpl')
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+    archives androidSourcesJar
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                // Applies the component for the release build variant.
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = group
+                artifactId = archivesBaseName
+                version = version
+            }
+        }
     }
 }
diff --git a/ComponentPlugin/build.gradle b/ComponentPlugin/build.gradle
@@ -1,27 +1,38 @@
 apply plugin: 'groovy'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
+
+task sourceJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from sourceSets.main.allJava
+}
+
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
     implementation group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
     implementation 'com.android.tools.build:gradle:3.3.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
-}
-repositories {
-    mavenCentral()
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
 
-sourceCompatibility = "8"
-targetCompatibility = "8"
+sourceCompatibility = "11"
+targetCompatibility = "11"
 
 group='com.xiaojinzi.component'
-version="${versions.component_plugin_upload_version}"
 archivesBaseName='component-plugin'
+version=versions.component_plugin_upload_version
 
-uploadArchives{
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = group
+            artifactId = archivesBaseName
+            version = version
+            from components.java
+        }
+    }
     repositories {
-        mavenDeployer{
-            repository(url: uri('../RepoComponent'))
+        maven {
+            url = "$rootDir/RepoComponent"
         }
     }
 }