Kotlin 2.1.0 improvements (#253)

* Update the package lock for PRs when needed

* Update conventions

* Enable KLIB cross compilation

* Enable incremental wasm compilation

* Configure NPM to update the package lock

Author: eygraber

.github/workflows/pr-package-lock.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"

.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,7 +77,10 @@ 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
 
@@ -111,6 +96,11 @@ jobs:
 
       - 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="-Xmx12g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=1024m"

.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,23 +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 }}
-
       - name: Create, checkout, and push release branch
         run: |
           git config user.name eygraber
@@ -122,10 +105,13 @@ jobs:
             sed -i -E -e 's/(compose-placeholder.*:)[0-9]+\.[0-9]+\.[0-9]+"/\1${{ env.RELEASE_VERSION }}"/g' README.md && \
             sed -i -E -e 's/(compose-placeholder.*:)[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT/\1${{ env.NEXT_VERSION }}-SNAPSHOT/g' README.md
 
+      - name: Update package-lock.json if needed
+        run: ./gradlew kotlinUpgradePackageLock --no-build-cache --no-configuration-cache --rerun-tasks
+
       - name: Commit next dev version
         id: commit_next_dev
         uses: EndBug/add-and-commit@v9
         with:
-          add: "['gradle.properties', 'README.md']"
+          add: "['gradle.properties', 'README.md', 'kotlin-js-store/package-lock.json']"
           default_author: github_actions
           message: "Prepare next dev version"

.github/workflows/publish_snapshot.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish_snapshot:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

build.gradle.kts

@@ -47,7 +47,8 @@ gradleConventionsDefaults {
 
 gradleConventionsKmpDefaults {
   webOptions = webOptions.copy(
-    isNodeEnabled = false
+    isNodeEnabled = false,
+    isBrowserEnabled = true,
   )
 
   targets(

gradle.properties

@@ -37,7 +37,8 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.wasm.enabled=true
 
 #Kotlin
+kotlin.incremental.wasm=true
 kotlin.js.yarn=false
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
+kotlin.native.enableKlibsCrossCompilation=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ android-sdk-min = "21"
 
 composeJetbrains = "1.7.1"
 
-conventions = "0.0.79"
+conventions = "0.0.81"
 
 detekt = "1.23.7"
 detektCompose = "0.4.19"