From ce1e3eaa21910d797c20ba89662c543e205b92f5 Mon Sep 17 00:00:00 2001 From: Kevin Galligan Date: Tue, 16 Apr 2024 21:18:05 -0400 Subject: [PATCH] Clean up and version bumps --- ...MBridge-publish.yml => KMMBridge-iOS-publish.yml} | 9 ++------- allshared/build.gradle.kts | 4 +--- build.gradle.kts | 11 ++--------- gradle.properties | 2 +- gradle/libs.versions.toml | 12 ++++++------ 5 files changed, 12 insertions(+), 26 deletions(-) rename .github/workflows/{KMMBridge-publish.yml => KMMBridge-iOS-publish.yml} (63%) diff --git a/.github/workflows/KMMBridge-publish.yml b/.github/workflows/KMMBridge-iOS-publish.yml similarity index 63% rename from .github/workflows/KMMBridge-publish.yml rename to .github/workflows/KMMBridge-iOS-publish.yml index f9d9269..4583a15 100644 --- a/.github/workflows/KMMBridge-publish.yml +++ b/.github/workflows/KMMBridge-iOS-publish.yml @@ -1,17 +1,12 @@ -name: iOS Publish +name: KMMBridge iOS Publish on: workflow_dispatch: -# push: -# branches: -# - "main" jobs: call-kmmbridge-publish: permissions: contents: write packages: write - uses: touchlab/KMMBridge/.github/workflows/spmbuildpublish.yml@kpg/kxcbridge + uses: touchlab/KMMBridge/.github/workflows/spmbuildpublish.yml@kpg/kmmbridge-1.0 with: jvmVersion: 17 versionProperty: LIBRARY_VERSION -# secrets: -# PODSPEC_SSH_KEY: ${{ secrets.PODSPEC_SSH_KEY }} diff --git a/allshared/build.gradle.kts b/allshared/build.gradle.kts index 633378f..5814f47 100644 --- a/allshared/build.gradle.kts +++ b/allshared/build.gradle.kts @@ -27,8 +27,6 @@ kotlin { } kmmbridge { - gitHubReleaseArtifacts( - useExistingRelease = true - ) + gitHubReleaseArtifacts() spm() } diff --git a/build.gradle.kts b/build.gradle.kts index 47fcc62..5a86004 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,18 +10,11 @@ plugins { alias(libs.plugins.skie) apply false } -val autoVersion = project.property( - if (project.hasProperty("AUTO_VERSION")) { - "AUTO_VERSION" - } else { - "LIBRARY_VERSION" - } -) as String - subprojects { val GROUP: String by project + val LIBRARY_VERSION: String by project group = GROUP - version = autoVersion + version = LIBRARY_VERSION } tasks.register("clean") { diff --git a/gradle.properties b/gradle.properties index 3e19dd3..e14864b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ kotlin.code.style=official android.useAndroidX=true org.gradle.jvmargs=-Xmx4g -LIBRARY_VERSION=0.1.7 +LIBRARY_VERSION=0.1.8 GROUP=co.touchlab-lab.releasetest \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d9704d1..3db5d52 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,14 +7,14 @@ compileSdk = "34" # Dependencies kotlin = "1.9.22" kmmBridge = "0.6.0-alpha2" -android-gradle-plugin = "8.2.2" -coroutines = "1.7.3" +android-gradle-plugin = "8.3.2" +coroutines = "1.8.0" kotlinx-datetime = "0.5.0" -ktor = "2.3.7" +ktor = "2.3.9" -stately = "2.0.5" -kermit = "2.0.2" -skie = "0.6.1" +stately = "2.0.6" +kermit = "2.0.3" +skie = "0.6.2" multiplatformSettings = "1.1.1" sqlDelight = "2.0.1"