Debug-enabled build

touchlab · Dec 13, 2024 · fe4b0cc · fe4b0cc
1 parent 7233e43
commit fe4b0cc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 32 deletions.
diff --git a/.github/workflows/KMMBridge-Debug.yml b/.github/workflows/KMMBridge-Debug.yml
@@ -27,11 +27,6 @@ jobs:
         id: output
         run: echo "${{ steps.versionPropertyValue.outputs.propVal }}"
 
-      - id: trimcommit
-        uses: prompt/actions-commit-hash@v3
-        with:
-          commit: ${{ github.sha }}
-
       - name: Touchlab Sample Sanity Check (Ignore this for your CI)
         uses: touchlab/sample-group-sanity-check@main
 
@@ -51,14 +46,24 @@ jobs:
             ~/.konan
           key: ${{ runner.os }}-v4-${{ hashFiles('*.gradle.kts') }}
 
+      - name: Create or Find Artifact Release
+        id: devrelease
+        uses: softprops/action-gh-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: "${{ steps.versionPropertyValue.outputs.propVal }}"
+
       - name: Build Main
-        run: ./gradlew kmmBridgePublish -PLIBRARY_VERSION=${{ steps.versionPropertyValue.outputs.propVal }}-${{ steps.trimcommit.outputs.short }} -PENABLE_PUBLISHING=true -PGITHUB_PUBLISH_TOKEN=${{ secrets.GITHUB_TOKEN }} -PGITHUB_REPO=${{ github.repository }} --no-daemon --info --stacktrace
+        run: |
+          ./gradlew publishKotlinMultiplatformPublicationToGitHubPackagesRepository publishAndroidDebugPublicationToGitHubPackagesRepository publishAndroidReleasePublicationToGitHubPackagesRepository kmmBridgePublish \
+            -PNATIVE_BUILD_TYPE=DEBUG -PGITHUB_ARTIFACT_RELEASE_ID=${{ steps.devrelease.outputs.id }} -PENABLE_PUBLISHING=true -PGITHUB_PUBLISH_TOKEN=${{ secrets.GITHUB_TOKEN }} -PGITHUB_REPO=${{ github.repository }} \
+            --no-daemon --info --stacktrace
         env:
           GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"
 
       - uses: touchlab/ga-update-release-tag@v1
         id: update-release-tag
         with:
-          commitMessage: "KMP SPM package release for ${{ steps.versionPropertyValue.outputs.propVal }}-${{ steps.trimcommit.outputs.short }}"
-          tagMessage: "KMP release version ${{ steps.versionPropertyValue.outputs.propVal }}-${{ steps.trimcommit.outputs.short }}"
-          tagVersion: ${{ steps.versionPropertyValue.outputs.propVal }}-${{ steps.trimcommit.outputs.short }}
+          commitMessage: "KMP SPM package release for ${{ steps.versionPropertyValue.outputs.propVal }}"
+          tagMessage: "KMP release version ${{ steps.versionPropertyValue.outputs.propVal }}"
+          tagVersion: ${{ steps.versionPropertyValue.outputs.propVal }}
diff --git a/allshared/build.gradle.kts b/allshared/build.gradle.kts
@@ -28,16 +28,7 @@ kotlin {
     }
 }
 
-val DEV_BUILD: String by project
-
 kmmbridge {
-    buildType.setAndFinalize(
-        if (DEV_BUILD.toBoolean()) {
-            NativeBuildType.DEBUG
-        } else {
-            NativeBuildType.RELEASE
-        }
-    )
     gitHubReleaseArtifacts()
     spm(swiftToolVersion = "5.8") {
         iOS { v("14") }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,13 +14,9 @@ plugins {
 subprojects {
     val GROUP: String by project
     val LIBRARY_VERSION: String by project
-    val DEV_BUILD: String by project
+
     group = GROUP
-    version = if (DEV_BUILD.toBoolean()) {
-        "$LIBRARY_VERSION-${System.currentTimeMillis()}"
-    } else {
-        LIBRARY_VERSION
-    }
+    version = LIBRARY_VERSION
 }
 
 tasks.register<Delete>("clean") {

diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,4 @@ org.gradle.jvmargs=-Xmx4g
 
 LIBRARY_VERSION=0.2.0
 GROUP=co.touchlab.kmmbridgespmquickstart
-org.gradle.configuration-cache=true
-DEV_BUILD=true
+# org.gradle.configuration-cache=true No config cache with maven... https://github.com/touchlab/KMMBridge/issues/272
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,16 +5,16 @@ targetSdk = "34"
 compileSdk = "34"
 
 # Dependencies
-kotlin = "2.0.10"
-kmmBridge = "1.1.0"
+kotlin = "2.0.21"
+kmmBridge = "1.1.2-a1"
 android-gradle-plugin = "8.2.0"
-coroutines = "1.8.1"
-kotlinx-datetime = "0.6.0"
+coroutines = "1.9.0"
+kotlinx-datetime = "0.6.1"
 ktor = "2.3.12"
 
-stately = "2.0.7"
+stately = "2.1.0"
 kermit = "2.0.4"
-skie = "0.8.4"
+skie = "0.10.0"
 
 multiplatformSettings = "1.1.1"
 sqlDelight = "2.0.2"