Merge branch 'kt-220' into dev

Author: ForteScarlet

.changelog/v2.2.0-0.13.1.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0`

.changelog/v2.2.0-Beta1-0.12.0.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0-Beta1`

.changelog/v2.2.0-Beta2-0.12.0.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0-Beta2`

.changelog/v2.2.0-RC2-0.12.0.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0-RC2`

.changelog/v2.2.0-RC2-0.13.0.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0-RC2`

.changelog/v2.2.0-RC2-0.13.1.md

@@ -0,0 +1 @@
+Kotlin version: `v2.2.0-RC2`

.github/workflows/publish-release.yml

@@ -7,17 +7,16 @@ on:
   workflow_dispatch:
 
 env:
-  GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-  GPG_SECRET_KEY: ${{ secrets.GPG_PRI_KEY }}
-  GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-  OSSRH_USER: ${{ secrets.OSS_USERNAME }}
-  OSSRH_PASSWORD: ${{ secrets.OSS_PASSWORD }}
-  RELEASE: true
-  CI: true
+  JAVA_VERSION: 11
+  JAVA_DISTRIBUTION: zulu
+  GRADLE_VERSION: 8.10.2
   IS_CI: true
-  SIMBOT_LOCAL: false
+  SIGNING_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+  GPG_KEY_CONTENTS: ${{ secrets.GPG_PRI_KEY }}
+  SIGNING_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+  MAVEN_CENTRAL_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
+  MAVEN_CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
   GRADLE_OPTS: "-Dfile.encoding=UTF-8"
-  GRADLE_VERSION: 8.10.2
 
 jobs:
   test:
@@ -30,77 +29,72 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: 'gradle'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-      - run: gradle assemble build -s
+      - run: gradle assemble build test allTests -s
 
   publish:
     name: Publish
     needs: test
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      # Setup java
-      # https://github.com/marketplace/actions/setup-java-jdk
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: 'gradle'
 
-      - name: Test and publish to sonatype
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments:
-            publishToSonatype
-            closeAndReleaseStagingRepositories
-            -s
-            --warning-mode all
-            -x test
-            --build-cache
-            -Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
-            -Porg.gradle.daemon=false
+
+      - name: Publish to Maven Central
+        run: gradle publishAndReleaseToMavenCentral -s --warning-mode all -x test --build-cache --no-configuration-cache
         env:
-          PLUGIN_AUTO: true
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
+          ORG_GRADLE_PROJECT_org.gradle.daemon: "false"
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ env.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ env.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ env.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ env.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ env.GPG_KEY_CONTENTS }}
 
   publish-gradle-plugin:
     name: Publish Gradle Plugin
     runs-on: ubuntu-latest
     needs: publish
     steps:
-      # 检出仓库代码
       - name: Check out repo
         uses: actions/checkout@v4
 
-      # Setup java
-      # https://github.com/marketplace/actions/setup-java-jdk
-      - name: Setup Java 11
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: 'gradle'
 
-      - name: Publish to gradle
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: |
-            build
-            publishPlugins
-            -s
-            --warning-mode all
-            -x test
-            --build-cache
-            -Porg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
-            -Porg.gradle.daemon=false
-            -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} 
-            -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}
+
+      - name: Publish to gradle
+        run: |
+          gradle build publishPlugins -s --warning-mode all -x test --build-cache
         env:
           PLUGIN_AUTO: true
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
+          ORG_GRADLE_PROJECT_org.gradle.daemon: "false"
+          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
+          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
 
   create-release:
     name: Create release
@@ -112,22 +106,22 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
+          cache: 'gradle'
 
-      - name: Create changelog
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: createChangelog
 
-        # https://github.com/softprops/action-gh-release
-        # Create gitHub release
+      - name: Create changelog
+        run: gradle createChangelog
+
       - name: Create Github Release
         uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.FORTE_TOKEN }}
-#          draft: true
           body_path: .changelog/${{ github.ref_name }}.md
           generate_release_notes: true
-          prerelease: ${{ contains(github.ref_name, 'preview') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') }}
+          prerelease: ${{ contains(github.ref_name, 'preview') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') || contains(github.ref_name, 'RC') }}

.github/workflows/test-branch.yml

@@ -17,9 +17,11 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  JAVA_VERSION: 11
+  JAVA_DISTRIBUTION: zulu
+  GRADLE_VERSION: 8.10.2
   IS_CI: true
   GRADLE_OPTS: "-Dfile.encoding=UTF-8"
-  GRADLE_VERSION: 8.10.2
 
 jobs:
   build-test:
@@ -32,28 +34,24 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: 'gradle'
 
-      - name: Run All Tests
-        uses: gradle/actions/setup-gradle@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: ${{ env.GRADLE_VERSION }}
-          arguments: |
-            assemble
-            build
-            test
-            --info 
-            --warning-mode all
-#            --build-cache
-#            -Porg.gradle.daemon=false
-#            -Porg.gradle.jvmargs="-Xmx4g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
+
+      - name: Run All Tests
+        run: gradle assemble build test -s --warning-mode all
+        env:
+          ORG_GRADLE_PROJECT_org.gradle.jvmargs: "-XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8"
 
       - name: Upload test reports
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: always()
         with:
-          name: test-reports-${{ matrix.os }}
+          name: test-reports-${{ runner.os }}
           path: '**/build/reports/tests'
           retention-days: 7

.run/createChangelog.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="createChangelog" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-i" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="createChangelog" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

README.md

@@ -117,6 +117,69 @@ class Foo {
 }
 ```
 
+### MarkName
+
+> since v0.13.0, [#96](https://github.com/ForteScarlet/kotlin-suspend-transform-compiler-plugin/pull/96)
+
+You can use `markName` to add a name mark annotation (e.g. `@JvmName`, `@JsName`) to the generated synthetic function.
+
+For example the JVM:
+
+```kotlin
+class Foo {
+    @JvmBlocking(markName = "namedWaitAndGet")
+    suspend fun waitAndGet(): String {
+        delay(5)
+        return "Hello"
+    } 
+}
+```
+
+compiled 👇
+
+```kotlin
+class Foo {
+    // Hide from Java
+    @JvmSynthetic
+    suspend fun waitAndGet(): String {
+        delay(5)
+        return "Hello"
+    }
+    @Api4J // RequiresOptIn annotation, provide warnings to Kotlin
+    @JvmName("namedWaitAndGet") // From the `markName`'s value
+    fun waitAndGetBlocking(): String = runInBlocking { waitAndGet() } // 'runInBlocking' from the runtime provided by the plugin
+}
+```
+
+Note: `@JvmName` has limitations on non-final functions, and even the compiler may prevent compilation.
+
+For example the JS:
+
+```kotlin
+class Foo {
+    @JsPromise(markName = "namedWaitAndGet")
+    suspend fun waitAndGet(): String {
+        delay(5)
+        return "Hello"
+    } 
+}
+```
+
+compiled 👇
+
+```kotlin
+class Foo {
+    suspend fun waitAndGet(): String {
+        delay(5)
+        return "Hello"
+    }
+  
+    @Api4Js // RequiresOptIn annotation, provide warnings to Kotlin
+    @JsName("namedWaitAndGet") // From the `markName`'s value
+    fun waitAndGetAsync(): Promise<String> = runInAsync { waitAndGet() } // 'runInAsync' from the runtime provided by the plugin
+}
+```
+
 ## Usage
 
 ### The version
@@ -246,7 +309,7 @@ You can also disable them and add dependencies manually.
 ```Kotlin
 plugin {
     kotlin("jvm") version "..." // Take the Kotlin/JVM as an example
-    id("love.forte.plugin.suspend-transform") version "2.1.20-0.12.0"
+    id("love.forte.plugin.suspend-transform") version "<VERSION>"
 }
 
 dependencies {