MOD: upgrade com.vanniktech.maven.publish to 0.31.0

Author: RicardoJiang

.github/workflows/build.yml

@@ -25,11 +25,11 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/[email protected]

.github/workflows/publish.yml

@@ -15,11 +15,11 @@ jobs:
       - name: Check out
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
       - name: Build & Publish Kace plugin to Maven Central
         run: chmod +x ./publish.sh && ./publish.sh

README.md

@@ -78,7 +78,7 @@ The Kace currently supports the above four most commonly used types. Other types
 | 2.0.0-1.2.0  | 2.0.0        | 7.1.3 | 7.2    |
 | 2.0.20-1.2.0 | 2.0.20       | 7.1.3 | 7.2    |
 | 2.1.0-1.2.0  | 2.1.0        | 7.3.1 | 7.6.3  |
-| 2.2.0-1.2.0  | 2.2.0        | 7.3.1 | 7.6.3  |
+| 2.2.0-1.2.0  | 2.2.0        | 7.3.1 | 8.5    |
 
 Since the goal of the Kace is to help developers easily upgrade to Kotlin 1.8, the minimum supported version of Kotlin is relatively high
 

README_zh.md

@@ -76,6 +76,8 @@ Kace 目前支持了以上四种最常用的类型，其他 kotlin-android-exten
 | 1.9.20-1.2.0 | 1.9.20       | 4.2.2 | 6.8.3  |
 | 2.0.0-1.2.0  | 2.0.0        | 7.1.3 | 7.2    |
 | 2.0.20-1.2.0 | 2.0.20       | 7.1.3 | 7.2    |
+| 2.1.0-1.2.0  | 2.1.0        | 7.3.1 | 7.6.3  |
+| 2.2.0-1.2.0  | 2.2.0        | 7.3.1 | 8.5    |
 
 由于 Kace 的目标是帮助开发者更方便地迁移到 Kotlin 1.8，因此 Kotlin 最低支持版本比较高
 

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
 
     // Use Kotlin 2.0.0 to build gradle plugin and compiler plugin for 2.1.0
     // to avoid incompatible issue with gradle build.
     id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
     id 'org.jetbrains.kotlin.jvm' version '2.2.0' apply false
 
-    id 'com.vanniktech.maven.publish' version '0.18.0' apply false
+    id 'com.vanniktech.maven.publish' version '0.31.0' apply false
     id 'com.github.gmazzo.buildconfig' version '2.1.0' apply false
 }
 

gradle.properties

@@ -44,4 +44,5 @@ POM_DEVELOPER_ID=solar-android
 POM_DEVELOPER_NAME=SolarAndroid
 POM_DEVELOPER_URL=https://github.com/beijing-kug/
 
-SONATYPE_HOST=S01
+SONATYPE_HOST=CENTRAL_PORTAL
+RELEASE_SIGNING_ENABLED=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 29 08:11:34 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

kace-compiler/build.gradle

@@ -26,6 +26,8 @@ plugins {
 // Build this project with Kotlin 2.0.0 for compatibility reason.
 // But we should depend on libs for Kotlin 2.1.0.
 def kotlinVersion = "2.2.0"
+group = property("GROUP").toString()
+version = property("VERSION_NAME").toString()
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}"
@@ -47,6 +49,6 @@ tasks.named('compileKotlin', org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 }
 
 buildConfig {
-    packageName = project.group
+    packageName = project.GROUP
     buildConfigField "String", "KOTLIN_PLUGIN_ID", "\"${project.property('KOTLIN_PLUGIN_ID')}\""
 }

kace-gradle-plugin/build.gradle

@@ -20,6 +20,9 @@ plugins {
     id 'maven-publish'
     id 'com.vanniktech.maven.publish'
 }
+group = property("GROUP").toString()
+version = property("VERSION_NAME").toString()
+
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin"
@@ -30,11 +33,11 @@ dependencies {
 
 buildConfig {
     def compilerPluginProject = project(":kace-compiler")
-    packageName = "${compilerPluginProject.group}"
+    packageName = "${compilerPluginProject.GROUP}"
     buildConfigField "String", "KOTLIN_PLUGIN_ID", "\"${project.property('KOTLIN_PLUGIN_ID')}\""
-    buildConfigField "String", "KOTLIN_PLUGIN_GROUP", "\"${compilerPluginProject.group}\""
+    buildConfigField "String", "KOTLIN_PLUGIN_GROUP", "\"${compilerPluginProject.GROUP}\""
     buildConfigField "String", "KOTLIN_PLUGIN_NAME", "\"${compilerPluginProject.property('POM_ARTIFACT_ID')}\""
-    buildConfigField "String", "KOTLIN_PLUGIN_VERSION", "\"${compilerPluginProject.version}\""
+    buildConfigField "String", "KOTLIN_PLUGIN_VERSION", "\"${compilerPluginProject.VERSION_NAME}\""
 }
 
 gradlePlugin {

kace-runtime/build.gradle

@@ -3,9 +3,14 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+group = property("GROUP").toString()
+version = property("VERSION_NAME").toString()
+
 android {
     compileSdkVersion 32
 
+    namespace = "com.kanyun.kace.runtime"
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 32