Merge pull request #57 from ForteScarlet/dev-kt-2020-beta1

Update Kotlin to 2.0.20-Beta1

Author: ForteScarlet

build.gradle.kts

@@ -8,12 +8,12 @@ val ktVersion = libs.versions.kotlin.get()
 
 group = IProject.GROUP
 description = IProject.DESCRIPTION
-version = ktVersion + "-" + IProject.pluginVersion.toString()
+version = ktVersion + "-" + IProject.pluginVersion
 
 allprojects {
     group = IProject.GROUP
     description = IProject.DESCRIPTION
-    version = ktVersion + "-" + IProject.pluginVersion.toString()
+    version = ktVersion + "-" + IProject.pluginVersion
 
     repositories {
         mavenCentral()

buildSrc/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 
 val kotlinVersion: String = libs.versions.kotlin.get()
 val dokkaPluginVersion = "1.9.20"
-val gradleCommon = "0.4.0"
+val gradleCommon = "0.6.0"
 val nexusPublishPlugin = "2.0.0"
 val buildConfig = "5.3.5"
 

buildSrc/src/main/kotlin/IProject.kt

@@ -1,8 +1,5 @@
 import IProject.IS_SNAPSHOT
 import love.forte.gradle.common.core.project.ProjectDetail
-import love.forte.gradle.common.core.project.Version
-import love.forte.gradle.common.core.project.minus
-import love.forte.gradle.common.core.project.version
 import org.gradle.api.Project
 
 object IProject : ProjectDetail() {
@@ -12,11 +9,11 @@ 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"
 
-    // TODO
-    val ktVersion = version(2, 0, 0)
-    val pluginVersion = version(0, 9, 0) - version("dev1")
+    // Remember the libs.versions.toml!
+    val ktVersion = "2.0.20-Beta1"
+    val pluginVersion = "0.9.1"
 
-    override val version: Version = ktVersion - pluginVersion
+    override val version: String = "$ktVersion-$pluginVersion"
 
     override val homepage: String get() = HOMEPAGE
 

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

@@ -22,7 +22,7 @@ if (!isPublishConfigurable) {
 }
 
 nexusPublishConfig {
-    projectDetail = IProject
+    setWithProjectDetail(IProject)
     useStaging = project.provider { !project.version.toString().endsWith("SNAPSHOT", ignoreCase = true) }
     repositoriesConfig = {
         val (sonatypeUsername, sonatypePassword) = sonatypeUserInfoOrNull
@@ -35,39 +35,7 @@ nexusPublishConfig {
     }
 }
 
-//if (isPublishConfigurable) {
-//    nexusPublishing {
-//        logger.info("[NEXUS] - project.group:   ${project.group}")
-//        logger.info("[NEXUS] - project.version: ${project.version}")
-//        packageGroup by project.group.toString()
-//        repositoryDescription by (project.description ?: "")
-//
-//        useStaging.set(
-//            project.provider { !project.version.toString().endsWith("SNAPSHOT", ignoreCase = true) }
-//        )
-//
-//        clientTimeout by 30 unit TimeUnit.MINUTES
-//        connectTimeout by 30 unit TimeUnit.MINUTES
-//
-//
-//        transitionCheckOptions {
-//            maxRetries by 150
-//            delayBetween by 15 unit TimeUnit.SECONDS
-//        }
-//
-//        repositories {
-//            sonatype {
-//                snapshotRepositoryUrl by uri(Sonatype.Snapshot.URL)
-//                val (sonatypeUsername, sonatypePassword) = sonatypeUserInfoOrNull ?: return@sonatype
-//                username by sonatypeUsername
-//                password by sonatypePassword
-//            }
-//        }
-//    }
-    
-    
-    logger.info("[nexus-publishing-configure] - [{}] configured.", name)
-//}
+logger.info("[nexus-publishing-configure] - [{}] configured.", name)
 
 
 

compiler/suspend-transform-plugin/src/main/kotlin/love/forte/plugin/suspendtrans/utils/AnnotationDescriptorUtils.kt

@@ -133,7 +133,7 @@ private fun FirAnnotation.getStringArgument0(
 
     // If not found, try to use `findArgumentByName`
     val argByName = findArgumentByName(name, returnFirstWhenNotFound = false)
-    return (argByName as? FirLiteralExpression<*>)?.value as? String
+    return (argByName as? FirLiteralExpression)?.value as? String
 }
 
 private fun FirAnnotation.getBooleanArgument0(
@@ -147,7 +147,7 @@ private fun FirAnnotation.getBooleanArgument0(
 
     // If not found, try to use `findArgumentByName`
     val argByName = findArgumentByName(name, returnFirstWhenNotFound = false)
-    return (argByName as? FirLiteralExpression<*>)?.value as? Boolean
+    return (argByName as? FirLiteralExpression)?.value as? Boolean
 }
 
 

compiler/suspend-transform-plugin/src/testData/codegen/asProperty.fir.ir.txt

@@ -99,7 +99,7 @@ FILE fqName:<root> fileName:/Main.kt
       annotations:
         Api4J
       overridden:
-        public open prop: kotlin.String
+        public open prop: kotlin.String declared in <root>.IProp
       FUN GENERATED[love.forte.plugin.suspendtrans.fir.SuspendTransformPluginKey] name:<get-prop> visibility:public modality:OPEN <> ($this:<root>.PropImpl) returnType:kotlin.String
         annotations:
           JvmAsync(baseName = <null>, suffix = <null>, asProperty = true)
@@ -122,7 +122,7 @@ FILE fqName:<root> fileName:/Main.kt
       annotations:
         Api4J
       overridden:
-        public open propAsync: java.util.concurrent.CompletableFuture
+        public open propAsync: java.util.concurrent.CompletableFuture declared in <root>.IProp
       FUN GENERATED[love.forte.plugin.suspendtrans.fir.SuspendTransformPluginKey] name:<get-propAsync> visibility:public modality:OPEN <> ($this:<root>.PropImpl) returnType:java.util.concurrent.CompletableFuture
         annotations:
           JvmBlocking(baseName = <null>, suffix = "", asProperty = true)

gradle/libs.versions.toml

@@ -2,9 +2,8 @@
 kotlinx-coroutines = "1.8.0"
 kotlinx-serialization = "1.5.0"
 google-auto-service = "1.0.1"
-#kotlin = "2.0.0-Beta3"
-#kotlin = "1.9.22"
-kotlin = "2.0.0"
+# Remember the `IProject.ktVersion`!
+kotlin = "2.0.20-Beta1"
 compose = "1.5.4"
 compose-compiler = "1.5.6"
 compose-plugin = "1.6.0-beta01"

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

@@ -104,10 +104,6 @@ kotlin {
         nativeTest.dependencies {
             implementation(libs.kotlinx.coroutines.test)
         }
-
-//        named("wasmJsMain").dependencies {
-//            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC2")
-//        }
     }
 
 }

samples/sample-js/build.gradle.kts

@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:0.8.0-beta1")
+        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-Beta1-0.9.1")
     }
 }
 

samples/sample-jvm/build.gradle.kts

@@ -1,5 +1,4 @@
 import love.forte.plugin.suspendtrans.gradle.SuspendTransformGradleExtension
-import org.jetbrains.kotlin.js.translate.context.Namer.kotlin
 
 plugins {
     `java-library`
@@ -17,7 +16,7 @@ buildscript {
     }
     dependencies {
         //this.implementation()
-        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:0.9.0-beta1")
+        classpath("love.forte.plugin.suspend-transform:suspend-transform-plugin-gradle:2.0.20-Beta1-0.9.1")
     }
 }