Merge pull request #69 from wyjsonGo/develop

wyjsonGo · web-flow · commit 1e43c0374186 · 2025-05-20T17:54:36.000+08:00
publish v2.5.5
jdk21 to 17
diff --git a/GoRouter-Annotation/build.gradle b/GoRouter-Annotation/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 apply from: rootProject.file('gradle/publish-java.gradle')
diff --git a/GoRouter-Api/build.gradle b/GoRouter-Api/build.gradle
@@ -18,8 +18,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
diff --git a/GoRouter-Compiler/build.gradle b/GoRouter-Compiler/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
diff --git a/GoRouter-Gradle-Plugin/build.gradle b/GoRouter-Gradle-Plugin/build.gradle
@@ -4,8 +4,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ dependencyResolutionManagement {
 }
 
 dependencies {
-    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.5.4'
+    api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.5.5'
 }
 // Kotlin配置参见8-1
 ```
@@ -89,7 +89,7 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.4'
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.5'
 }
 ```
 
@@ -157,7 +157,7 @@ pluginManagement {
 // 项目根目录下的build.gradle
 buildscript {
     dependencies {
-        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.5.4'
+        classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.5.5'
     }
 }
 ```
@@ -894,7 +894,7 @@ kapt {
 }
 
 dependencies {
-    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.4'
+    kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.5'
 }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -25,4 +25,4 @@ android.nonTransitiveRClass=true
 # org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 
 GROUP_ID=com.github.wyjsonGo.GoRouter
-VERSION=2.5.4
+VERSION=2.5.5
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,2 +1,2 @@
 jdk:
-  - openjdk21
+  - openjdk17
diff --git a/module_common/build.gradle b/module_common/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
diff --git a/module_kotlin/build.gradle b/module_kotlin/build.gradle
@@ -9,6 +9,7 @@ kapt {
     }
 }
 
+
 android {
     namespace 'com.wyjson.module_kotlin'
     compileSdk 34
@@ -29,8 +30,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
     }
 }
 
diff --git a/module_main/build.gradle b/module_main/build.gradle
@@ -28,8 +28,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
diff --git a/module_user/build.gradle b/module_user/build.gradle
@@ -28,8 +28,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`java {`
`6`		`- sourceCompatibility = JavaVersion.VERSION_21`
`7`		`- targetCompatibility = JavaVersion.VERSION_21`
	`6`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`7`	`+ targetCompatibility = JavaVersion.VERSION_17`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`apply from: rootProject.file('gradle/publish-java.gradle')`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ android {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`compileOptions {`
`21`		`- sourceCompatibility JavaVersion.VERSION_21`
`22`		`- targetCompatibility JavaVersion.VERSION_21`
	`21`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`22`	`+ targetCompatibility JavaVersion.VERSION_17`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`java {`
`7`		`- sourceCompatibility = JavaVersion.VERSION_21`
`8`		`- targetCompatibility = JavaVersion.VERSION_21`
	`7`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`8`	`+ targetCompatibility = JavaVersion.VERSION_17`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ dependencyResolutionManagement {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`dependencies {`
`72`		`- api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.5.4'`
	`72`	`+ api 'com.github.wyjsonGo.GoRouter:GoRouter-Api:2.5.5'`
`73`	`73`	`}`
`74`	`74`	`// Kotlin配置参见8-1`
`75`	`75`	```
`@@ -89,7 +89,7 @@ android {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`dependencies {`
`92`		`- annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.4'`
	`92`	`+ annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.5'`
`93`	`93`	`}`
`94`	`94`	```
`95`	`95`
`@@ -157,7 +157,7 @@ pluginManagement {`
`157`	`157`	`// 项目根目录下的build.gradle`
`158`	`158`	`buildscript {`
`159`	`159`	`dependencies {`
`160`		`- classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.5.4'`
	`160`	`+ classpath 'com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:2.5.5'`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	```
`@@ -894,7 +894,7 @@ kapt {`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`dependencies {`
`897`		`- kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.4'`
	`897`	`+ kapt 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:2.5.5'`
`898`	`898`	`}`
`899`	`899`	```
`900`	`900`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ android {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`compileOptions {`
`34`		`- sourceCompatibility JavaVersion.VERSION_21`
`35`		`- targetCompatibility JavaVersion.VERSION_21`
	`34`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`35`	`+ targetCompatibility JavaVersion.VERSION_17`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`jdk:`
`2`		`- - openjdk21`
	`2`	`+ - openjdk17`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ android {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_21`
`33`		`- targetCompatibility JavaVersion.VERSION_21`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`33`	`+ targetCompatibility JavaVersion.VERSION_17`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ kapt {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
	`12`	`+`
`12`	`13`	`android {`
`13`	`14`	`namespace 'com.wyjson.module_kotlin'`
`14`	`15`	`compileSdk 34`
`@@ -29,8 +30,11 @@ android {`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_21`
`33`		`- targetCompatibility JavaVersion.VERSION_21`
	`33`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`34`	`+ targetCompatibility JavaVersion.VERSION_17`
	`35`	`+ }`
	`36`	`+ kotlinOptions {`
	`37`	`+ jvmTarget = "17"`
`34`	`38`	`}`
`35`	`39`	`}`
`36`	`40`