合并拉取请求 #22

更新 kotlinx.coroutines 到 `v1.7.0-RC`

Author: ForteScarlet

buildSrc/src/main/kotlin/IProject.kt

@@ -8,7 +8,7 @@ object IProject : ProjectDetail() {
     const val DESCRIPTION = "Generate platform-compatible functions for Kotlin suspend functions"
     const val HOMEPAGE = "https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin"
 
-    override val version: Version = version(0, 2, 7)
+    override val version: Version = version(0, 3, 0)
 
     override val homepage: String get() = HOMEPAGE
 

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

@@ -14,13 +14,13 @@ plugins {
 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.5.0")
+    compileOnly(libs.kotlinx.coroutines.core)
+    api(libs.kotlinx.serialization.json)
 
 //    compileOnly(kotlin("compiler-embeddable"))
 
-    kapt("com.google.auto.service:auto-service:1.0.1")
-    compileOnly("com.google.auto.service:auto-service-annotations:1.0.1")
+    kapt(libs.google.auto.service)
+    compileOnly(libs.google.auto.service.annotations)
 
     testImplementation(kotlin("stdlib"))
     testImplementation(kotlin("test-junit"))
@@ -35,7 +35,7 @@ dependencies {
 //    testImplementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
 //    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.7.10.2-SNAPSHOT")
 
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    testImplementation(libs.kotlinx.coroutines.core)
     // testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
 }
 

gradle/libs.versions.toml

@@ -0,0 +1,33 @@
+[versions]
+kotlinx-coroutines = "1.7.0-RC"
+kotlinx-serialization = "1.5.0"
+google-auto-service = "1.0.1"
+
+[libraries]
+
+# kotlinx-coroutines
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-reactive = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactive", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-rx2 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx2", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-rx3 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-slf4j = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-slf4j", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+
+# kotlinx-serialization
+kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-hocon = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-hocon", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-protobuf = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-cbor = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-cbor", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-properties = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-properties", version.ref = "kotlinx-serialization" }
+
+
+# google auto-service
+google-auto-service = { group = "com.google.auto.service", name = "auto-service", version.ref = "google-auto-service" }
+google-auto-service-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version.ref = "google-auto-service" }
+

runtime/suspend-transform-runtime/build.gradle.kts

@@ -34,7 +34,7 @@ kotlin {
         "iosX64",
 
         // Tier 2
-//        "linuxArm64", // 1.7.0+
+        "linuxArm64",
         "watchosSimulatorArm64",
         "watchosX64",
         "watchosArm32",
@@ -43,13 +43,14 @@ kotlin {
         "tvosX64",
         "tvosArm64",
         "iosArm64",
+
         // Tier 3
-//        "androidNativeArm32", // 1.7.0+
-//        "androidNativeArm64", // 1.7.0+
-//        "androidNativeX86", // 1.7.0+
-//        "androidNativeX64", // 1.7.0+
+        "androidNativeArm32",
+        "androidNativeArm64",
+        "androidNativeX86",
+        "androidNativeX64",
         "mingwX64",
-//        "watchosDeviceArm64", // 1.7.0+
+        "watchosDeviceArm64",
     )
 
     targets {
@@ -70,20 +71,20 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(project(":runtime:suspend-transform-annotation"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+                implementation(libs.kotlinx.coroutines.core)
             }
         }
 
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
+                implementation(libs.kotlinx.coroutines.test)
             }
         }
 
         getByName("jvmMain") {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion")
+                implementation(libs.kotlinx.coroutines.jdk8)
             }
         }