Update kotlin monorepo to v2.1.0 (#180)

* Update kotlin monorepo to v2.0.21 * Remove workaround for HiddenFromObjC * Update Kotlin to 2.1.0-RC * Update Kotlin to 2.1.0-RC2 * Update Kotlin to 2.1.0 * Enable KLIB cross compilation --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Eliezer Graber <[email protected]>
eygraber · Nov 27, 2024 · d6adbf2 · d6adbf2
1 parent 7e549e6
commit d6adbf2
Show file tree

Hide file tree

Showing 16 changed files with 574 additions and 1,334 deletions.
diff --git a/.github/workflows/pr-package-lock.yml.yml b/.github/workflows/pr-package-lock.yml.yml
@@ -0,0 +1,38 @@
+name: Upgrade Package Lock
+
+on:
+  pull_request
+
+jobs:
+  upgrade_package_lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+          token: ${{ secrets.PUSH_PAT }}
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version-file: .ci-java-version
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+
+      - name: Run assemble task
+        run: ./gradlew kotlinUpgradePackageLock --rerun-tasks
+
+      - name: Commit package lock changes
+        id: commit_package_lock_changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          add: "['kotlin-js-store/package-lock.json']"
+          default_author: github_actions
+          message: "Upgrade package lock"
+
+env:
+  GRADLE_OPTS: -Dorg.gradle.daemon=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=1024m"
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -15,7 +15,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   assemble:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -50,24 +50,6 @@ jobs:
       - name: Run detekt
         run: ./gradlew detektAll
 
-  detekt-apple:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version-file: .ci-java-version
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: wrapper
-
-      - name: Run detekt for apple targets
-        run: ./gradlew detektAppleMain detektAppleTest
-
   ktlint:
     runs-on: ubuntu-latest
     steps:
@@ -95,22 +77,29 @@ jobs:
         run: ./gradlew lintRelease
 
   test:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        os: [ macos-latest, ubuntu-latest ]
+    runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version-file: .ci-java-version
-
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
 
       - name: Run tests
         run: ./gradlew allTests
+        if: matrix.os == 'ubuntu-latest'
+
+      - name: Run Apple tests
+        run: ./gradlew iosX64Test
+        if: matrix.os == 'macos-latest'
 
 env:
   GRADLE_OPTS: -Dorg.gradle.daemon=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=1024m"
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   publish_artifacts:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
@@ -42,28 +42,6 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
         run: ./gradlew publishAllPublicationsToMavenCentralRepository -Pversion=${{ env.RELEASE_VERSION }}
 
-  publish_release:
-    needs: publish_artifacts
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PUSH_PAT }}
-
-      - name: Generate versions
-        uses: HardNorth/github-version-generate@v1
-        with:
-          version-source: file
-          version-file: ${{ env.VERSION_FILE }}
-          version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }}
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version-file: .ci-java-version
-
       - name: Create, checkout, and push release branch
         run: |
           git config user.name eygraber

diff --git a/.github/workflows/publish_snapshot_release.yml b/.github/workflows/publish_snapshot_release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish_snapshot:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

diff --git a/gradle.properties b/gradle.properties
@@ -46,6 +46,7 @@ org.gradle.configuration-cache=false
 org.gradle.configureondemand=false
 
 # Kotlin
+kotlin.incremental.wasm=true
 kotlin.js.yarn=false
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
+kotlin.native.enableKlibsCrossCompilation=true
 kotlin.native.ignoreDisabledTargets=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ detektEygraber = "1.0.11"
 
 dokka = "1.9.20"
 
-kotlin = "2.0.20"
+kotlin = "2.1.0"
 
 kotlinx-coroutines = "1.9.0"