合并拉取请求 #15

（不兼容）更新Kotlin到v1.8.0; 调整插件的配置方式，并支持多样化的自定义配置

Author: ForteScarlet

build.gradle.kts

@@ -12,9 +12,9 @@ allprojects {
     description = IProject.DESCRIPTION
 
     repositories {
-        mavenLocal()
         mavenCentral()
         gradlePluginPortal()
+        mavenLocal()
         //maven {
         //    url = URI("")
         //}

buildSrc/build.gradle.kts

@@ -8,16 +8,17 @@ repositories {
     gradlePluginPortal()
 }
 
-val kotlinVersion = "1.7.20"
+val kotlinVersion = "1.8.0"
 val dokkaPluginVersion = "1.7.20"
 
 dependencies {
     api(gradleApi())
     api(kotlin("gradle-plugin", kotlinVersion))
+    api(kotlin("serialization", kotlinVersion))
     api("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaPluginVersion")
 
     api("com.gradle.publish:plugin-publish-plugin:0.12.0")
-    api("com.github.gmazzo:gradle-buildconfig-plugin:2.0.2")
+    api("com.github.gmazzo:gradle-buildconfig-plugin:3.1.0")
     // see https://github.com/bnorm/kotlin-power-assert#compatibility
     api("gradle.plugin.com.bnorm.power:kotlin-power-assert-gradle:0.12.0")
     api("io.github.gradle-nexus:publish-plugin:1.1.0")
@@ -32,4 +33,4 @@ dependencies {
 //
 // tasks.withType<KotlinCompile> {
 //     kotlinOptions.jvmTarget = "1.8"
-// }
+// }

buildSrc/src/main/kotlin/IProject.kt

@@ -1,6 +1,6 @@
 object IProject {
-    const val VERSION = "0.1.0"
+    const val VERSION = "0.2.0"
     const val GROUP = "love.forte.plugin.suspend-transform"
     const val DESCRIPTION = "Generate platform-compatible functions for Kotlin suspend functions"
 
-}
+}

buildSrc/src/main/kotlin/suspend-transform.jvm-maven-publish.gradle.kts

@@ -1,6 +1,3 @@
-import utils.systemProperty
-import utils.by
-
 plugins {
     id("org.jetbrains.dokka")
     signing
@@ -15,54 +12,53 @@ plugins {
 // }
 
 
-
 val (sonatypeUsername, sonatypePassword) = sonatypeUserInfoOrNull
 
 val sonatypeContains = sonatypeUserInfoOrNull != null
 
-    val jarJavadoc by tasks.registering(Jar::class) {
-        archiveClassifier.set("javadoc")
-        // from(tasks.findByName("dokkaHtml"))
-    }
-    
-    val jarSources by tasks.registering(Jar::class) {
-        archiveClassifier.set("sources")
-        from(sourceSets["main"].allSource)
-    }
-    
-    publishing {
-        publications {
-            create<MavenPublication>("suspendTransformJvmDist") {
-                from(components["java"])
-                artifact(jarSources)
-                artifact(jarJavadoc)
-                
-                groupId = project.group.toString()
-                artifactId = project.name
-                version = project.version.toString()
-            }
+val jarJavadoc by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+    // from(tasks.findByName("dokkaHtml"))
+}
+
+val jarSources by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(sourceSets["main"].allSource)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("suspendTransformJvmDist") {
+            from(components["java"])
+            artifact(jarSources)
+            artifact(jarJavadoc)
+
+            groupId = project.group.toString()
+            artifactId = project.name
+            version = project.version.toString()
+        }
 
-            configureEach {
-                if (this is MavenPublication) {
-                    pom {
-                        setupPom(project)
-                    }
+        configureEach {
+            if (this is MavenPublication) {
+                pom {
+                    setupPom(project)
                 }
             }
-            
-            repositories {
-                mavenLocal()
-                mavenCentral()
-                if (sonatypeContains) {
-                    if (project.version.toString().contains("SNAPSHOT", true)) {
-                        configPublishMaven(Sonatype.Snapshot, sonatypeUsername, sonatypePassword)
-                    } else {
-                        configPublishMaven(Sonatype.Central, sonatypeUsername, sonatypePassword)
-                    }
+        }
+
+        repositories {
+            mavenCentral()
+            if (sonatypeContains) {
+                if (project.version.toString().contains("SNAPSHOT", true)) {
+                    configPublishMaven(Sonatype.Snapshot, sonatypeUsername, sonatypePassword)
+                } else {
+                    configPublishMaven(Sonatype.Central, sonatypeUsername, sonatypePassword)
                 }
             }
+            mavenLocal()
         }
     }
+}
 
 
 signing {

buildSrc/src/main/kotlin/suspend-transform.multiplatform-maven-publish.gradle.kts

@@ -1,6 +1,4 @@
-import gradle.kotlin.dsl.accessors._59a6e08710bd766406b34ec8c4dcd1fe.publishing
 import gradle.kotlin.dsl.accessors._59a6e08710bd766406b34ec8c4dcd1fe.signing
-import utils.systemProperty
 import utils.by
 
 plugins {
@@ -25,23 +23,23 @@ publishing {
             if (this !is MavenPublication) {
                 return@configureEach
             }
-            
+
             artifact(jarJavadoc)
-            
+
             pom {
                 setupPom(project)
             }
         }
-        
+
         repositories {
-            mavenLocal()
             if (sonatypeContains) {
                 if (project.version.toString().contains("SNAPSHOT", true)) {
                     configPublishMaven(Sonatype.Snapshot, sonatypeUsername, sonatypePassword)
                 } else {
                     configPublishMaven(Sonatype.Central, sonatypeUsername, sonatypePassword)
                 }
             }
+            mavenLocal()
         }
     }
 }
@@ -67,4 +65,4 @@ fun MavenPublication.jar(taskName: String, config: Action<Jar>) = artifact(tasks
 fun MavenPublication.javadocJar(taskName: String, config: Jar.() -> Unit = {}) = jar(taskName) {
     archiveClassifier by "javadoc"
     config()
-}
+}

buildSrc/src/main/kotlin/suspend-transform.nexus-publish.gradle.kts

@@ -19,8 +19,7 @@ if (!isPublishConfigurable) {
 }
 
 
-if (isPublishConfigurable) {
-    val (sonatypeUsername, sonatypePassword) = sonatypeUserInfo
+//if (isPublishConfigurable) {
     nexusPublishing {
         logger.info("[NEXUS] - project.group:   ${project.group}")
         logger.info("[NEXUS] - project.version: ${project.version}")
@@ -43,6 +42,7 @@ if (isPublishConfigurable) {
         repositories {
             sonatype {
                 snapshotRepositoryUrl by uri(Sonatype.Snapshot.URL)
+                val (sonatypeUsername, sonatypePassword) = sonatypeUserInfoOrNull ?: return@sonatype
                 username by sonatypeUsername
                 password by sonatypePassword
             }
@@ -51,7 +51,7 @@ if (isPublishConfigurable) {
 
 
     logger.info("[nexus-publishing-configure] - [{}] configured.", name)
-}
+//}
 
 
 

compiler/suspend-transform-plugin/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     java
     kotlin("jvm")
     kotlin("kapt")
+    kotlin("plugin.serialization")
     id("com.github.gmazzo.buildconfig")
     //id("com.bnorm.power.kotlin-power-assert")
     id("suspend-transform.jvm-maven-publish")
@@ -16,6 +17,7 @@ dependencies {
     compileOnly(kotlin("stdlib"))
     compileOnly(kotlin("compiler"))
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
 
 //    compileOnly(kotlin("compiler-embeddable"))