From 2218c8b4dd5844d837f7f5506b96d85773e7800d Mon Sep 17 00:00:00 2001 From: slam Date: Thu, 25 Apr 2024 18:11:49 +0800 Subject: [PATCH] fix: update Java version to 17 and Swift tools version to 5.9 - Update Java version to 17 in the GitHub Actions workflow and Swift tools version to 5.9 in the KMMBridge build configuration. --- .../releaase-to-central-sonatype.yml | 2 +- gradle/libs.versions.toml | 2 +- .../openai-gateway-darwin/build.gradle.kts | 20 ++++++++----------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/releaase-to-central-sonatype.yml b/.github/workflows/releaase-to-central-sonatype.yml index 2381a4c..da8339b 100644 --- a/.github/workflows/releaase-to-central-sonatype.yml +++ b/.github/workflows/releaase-to-central-sonatype.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 21 + java-version: 17 - name: Setup Gradle uses: gradle/gradle-build-action@v3 - name: Release to Central Sonatype with Gradle diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d949aa5..0ee81d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ multiplatform-swiftpackage = "2.2.1" touchlab-skie = "0.6.1" -touchlab-kmmbridge = "0.5.4" +touchlab-kmmbridge = "0.5.5" com-linecorp-build-recipe-plugin = "1.1.1" diff --git a/openai-gateway/openai-gateway-darwin/build.gradle.kts b/openai-gateway/openai-gateway-darwin/build.gradle.kts index 38fdc37..cbe6c1d 100644 --- a/openai-gateway/openai-gateway-darwin/build.gradle.kts +++ b/openai-gateway/openai-gateway-darwin/build.gradle.kts @@ -42,18 +42,14 @@ kmmbridge { * In kmmbridge, notice mavenPublishArtifacts() tells the plugin to push KMMBridge artifacts to a Maven repo. You then need to define a repo. Rather than do everything manually, you can just call addGithubPackagesRepository(), which will add the correct repo given parameters that are passed in from GitHub Actions. */ mavenPublishArtifacts() // <- Publish using a Maven repo -// spm() + // spm { -// iOS { v("14") } -// macOS { v("13") } +// swiftToolsVersion = "5.9" +// platforms { +// iOS("14") +// macOS("13") +// watchOS("7") +// tvOS("14") +// } // } - spm { - swiftToolsVersion = "5.10" - platforms { - iOS("14") - macOS("13") - watchOS("7") - tvOS("14") - } - } }