Bump to Kotlin 2.1

.github/workflows/include-deploy-release.yml

@@ -13,8 +13,8 @@ on:
 
 jobs:
   deploy:
-    runs-on: macos-12
-    name: Deploy release 
+    runs-on: macos-13
+    name: Deploy release
 
     steps:
       - name: git checkout
@@ -60,10 +60,10 @@ jobs:
         run: |
           ccache --set-config="compiler_check=content"
           ccache --show-config
-          echo '#!/bin/bash\nccache clang "$@"%"' > /usr/local/bin/ccache-clang 
-          echo '#!/bin/bash\nccache clang++ "$@"%"' > /usr/local/bin/ccache-clang++          
+          echo '#!/bin/bash\nccache clang "$@"%"' > /usr/local/bin/ccache-clang
+          echo '#!/bin/bash\nccache clang++ "$@"%"' > /usr/local/bin/ccache-clang++
 
-      # TODO This matches 23.2.8568313, but what happens if we define specific ndk version in our build? 
+      # TODO This matches 23.2.8568313, but what happens if we define specific ndk version in our build?
       - name: Setup NDK
         uses: nttld/setup-ndk@v1
         with:
@@ -109,4 +109,3 @@ jobs:
          "${{ secrets.SLACK_URL_RELEASE }}" "${{ secrets.SLACK_URL_CI }}" \
          "${{ secrets.GRADLE_PORTAL_KEY }}" "${{ secrets.GRADLE_PORTAL_SECRET }}" \
          '-PsignBuild=true -PsignSecretRingFileKotlin="${{ secrets.GPG_SIGNING_KEY_BASE_64_DBG }}" -PsignPasswordKotlin=${{ secrets.GPG_PASS_PHRASE_DBG }} -Prealm.kotlin.copyNativeJvmLibs=linux,windows'
-

.github/workflows/include-deploy-snapshot.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    name: Deploy SNAPSHOT 
+    name: Deploy SNAPSHOT
 
     steps:
       - name: Remove unnecessary files
@@ -23,11 +23,11 @@ jobs:
         with:
           submodules: "recursive"
 
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION  }}
-          java-version: ${{ vars.VERSION_JAVA }}
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Install Kotlin Commandline Tools
         uses: fwilhe2/[email protected]
@@ -38,10 +38,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       - name: Publish SNAPSHOT to Maven Central
-        # env:    
+        # env:
         #   GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY_BASE_64 }}
         #   GPG_PASS_PHRASE: ${{ secrets.GPG_PASS_PHRASE }}
         #   MAVEN_CENTRAL_USER: ${{ secrets.MAVEN_CENTRAL_USER }}

.github/workflows/include-integration-tests.yml

@@ -1,4 +1,4 @@
-name: Gradle Project Integration Tests 
+name: Gradle Project Integration Tests
 
 on:
   workflow_call:
@@ -36,10 +36,10 @@ jobs:
   #       uses: actions/download-artifact@v4
   #       with:
   #         name: all-packages-${{ needs.check-cache.outputs.version-label }}
-  #         path: ./packages/build/m2-buildrepo 
+  #         path: ./packages/build/m2-buildrepo
 
   #     # TODO Can we read api level from Config.kt
-  #     - name: Run Monkey on Android Sample 
+  #     - name: Run Monkey on Android Sample
   #       env:
   #         SSH_AUTH_SOCK: /tmp/ssh_agent.sock
   #       uses: reactivecircus/android-emulator-runner@v2
@@ -62,11 +62,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }}
-          java-version: ${{ vars.VERSION_JAVA }}
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Setup Gradle and task/dependency caching
         uses: gradle/actions/setup-gradle@v3
@@ -77,26 +77,26 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       # TODO Can we read api level from Config.kt
-      - name: Build Android on minimum versions 
+      - name: Build Android on minimum versions
         working-directory: examples/min-android-sample
         run: |
           java --version
           ./gradlew assembleDebug jvmJar
 
   realm-java-compatibiliy:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }}
-          java-version: ${{ vars.VERSION_JAVA }}
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Setup Gradle and task/dependency caching
         uses: gradle/actions/setup-gradle@v3
@@ -107,7 +107,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       # - name: AVD cache
       #   uses: actions/cache@v4
@@ -125,7 +125,7 @@ jobs:
       #     api-level: 33
       #     target: default
       #     # target: aosp_atd
-      #     arch: x86_64        
+      #     arch: x86_64
       #     disk-size: 4096M
       #     ram-size: 2048M
       #     heap-size: 1024M
@@ -147,7 +147,7 @@ jobs:
           api-level: ${{ vars.VERSION_ANDROID_EMULATOR_API_LEVEL }}
           target: default
           # target: aosp_atd
-          arch: x86_64        
+          arch: x86_64
           # profile: Nexus 6
           disk-size: 4096M
           ram-size: 2048M
@@ -176,11 +176,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }}
-          java-version: ${{ vars.VERSION_JAVA }}
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Setup Gradle and task/dependency caching
         uses: gradle/actions/setup-gradle@v3
@@ -191,7 +191,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       - name: Build benchmarks
         working-directory: benchmarks
@@ -211,18 +211,18 @@ jobs:
           - type: gradle75
             path: integration-tests/gradle/gradle75-test
             arguments: integrationTest
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
 
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }}
-          java-version: ${{ vars.VERSION_JAVA }}
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Setup Gradle and task/dependency caching
         uses: gradle/actions/setup-gradle@v3
@@ -233,7 +233,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       # - name: AVD cache
       #   uses: actions/cache@v4
@@ -251,7 +251,7 @@ jobs:
       #     api-level: 33
       #     target: default
       #     # target: aosp_atd
-      #     arch: x86_64        
+      #     arch: x86_64
       #     disk-size: 4096M
       #     ram-size: 2048M
       #     heap-size: 1024M
@@ -273,13 +273,13 @@ jobs:
           api-level: ${{ vars.VERSION_ANDROID_EMULATOR_API_LEVEL }}
           target: default
           # target: aosp_atd
-          arch: x86_64        
+          arch: x86_64
           # profile: Nexus 6
           disk-size: 4096M
           ram-size: 2048M
           heap-size: 1024M
           channel: canary
-          script: cd ${{ matrix.path }} && ./gradlew ${{ matrix.arguments }} --info    
+          script: cd ${{ matrix.path }} && ./gradlew ${{ matrix.arguments }} --info
 
   gradle-plugin-integration-java-17:
     strategy:
@@ -292,7 +292,7 @@ jobs:
           - type: gradle85
             path: integration-tests/gradle/gradle85-test
             arguments: integrationTest
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
 
@@ -314,7 +314,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: all-packages-${{ inputs.version-label }}
-          path: ./packages/build/m2-buildrepo 
+          path: ./packages/build/m2-buildrepo
 
       # - name: AVD cache
       #   uses: actions/cache@v4
@@ -332,7 +332,7 @@ jobs:
       #     api-level: 33
       #     target: default
       #     # target: aosp_atd
-      #     arch: x86_64        
+      #     arch: x86_64
       #     disk-size: 4096M
       #     ram-size: 2048M
       #     heap-size: 1024M
@@ -354,10 +354,10 @@ jobs:
           api-level: ${{ vars.VERSION_ANDROID_EMULATOR_API_LEVEL }}
           target: default
           # target: aosp_atd
-          arch: x86_64        
+          arch: x86_64
           # profile: Nexus 6
           disk-size: 4096M
           ram-size: 2048M
           heap-size: 1024M
           channel: canary
-          script: cd ${{ matrix.path }} && ./gradlew ${{ matrix.arguments }} --info          
+          script: cd ${{ matrix.path }} && ./gradlew ${{ matrix.arguments }} --info