diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ef208310..bd48b9b5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -39,10 +39,10 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -71,10 +71,10 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index 8299c488..c75c8366 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4b6bf5f3..9fb01025 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,14 +16,17 @@ jobs:
       matrix:
         include:
           - os: macos-latest
-            name: macos-watchos-tvos
+            name: watchos
             targets: watchosSimulatorArm64Test tvosSimulatorArm64Test
           - os: macos-latest
-            name: mac-ios-macos
-            targets: iosSimulatorArm64Test macosArm64Test
+            name: tvos
+            targets: tvosSimulatorArm64Test
           - os: macos-latest
-            name: mac-jvm
-            targets: jvmTest
+            name: ios
+            targets: iosSimulatorArm64Test
+          - os: macos-latest
+            name: macos
+            targets: jvmTest macosArm64Test
           - os: ubuntu-latest
             name: ubuntu
             targets: testDebugUnitTest testReleaseUnitTest jvmTest lintKotlin
@@ -32,7 +35,7 @@ jobs:
             targets: jvmTest
     runs-on: ${{ matrix.os }}
     name: Test ${{ matrix.name }}
-    timeout-minutes: 20
+    timeout-minutes: 30
 
     steps:
     - uses: actions/checkout@v4
@@ -42,10 +45,10 @@ jobs:
       with:
         path: ~/.konan
         key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'temurin'
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v4
@@ -90,10 +93,10 @@ jobs:
         with:
           path: ~/.konan
           key: ${{ runner.os }}-${{ hashFiles('**/.lock') }}
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'temurin'
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/core/src/nativeMain/kotlin/com/powersync/DatabaseDriverFactory.native.kt b/core/src/appleMain/kotlin/com/powersync/DatabaseDriverFactory.native.kt
similarity index 100%
rename from core/src/nativeMain/kotlin/com/powersync/DatabaseDriverFactory.native.kt
rename to core/src/appleMain/kotlin/com/powersync/DatabaseDriverFactory.native.kt
diff --git a/gradle.properties b/gradle.properties
index d45a296a..e38adef3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,3 +35,5 @@ POM_DEVELOPER_URL=https://powersync.com/
 POM_DEVELOPER_EMAIL=support@journeyapps.com
 #Dokka
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+# We don't need cross-compilation, and it causes compilation errors on Linux.
+kotlin.native.enableKlibsCrossCompilation=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4af0337d..1ff0962d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,14 +4,14 @@ android-minSdk = "24"
 android-targetSdk = "36"
 android-compileSdk = "36"
 configurationAnnotations = "0.10.6"
-dokkaBase = "2.0.0"
+dokkaBase = "2.1.0"
 gradleDownloadTask = "5.6.0"
 java = "17"
 
 # Dependencies
 kermit = "2.0.8"
-kotlin = "2.2.10" # Note: When updating, always update the first part of the ksp version too
-ksp = "2.2.10-2.0.2"
+kotlin = "2.2.21"
+ksp = "2.3.3"
 coroutines = "1.10.2"
 kotlinx-datetime = "0.7.1"
 serialization = "1.9.0"
@@ -37,10 +37,10 @@ sqldelight = "2.1.0"
 
 # plugins
 android-gradle-plugin = "8.12.1"
-skie = "0.10.6"
+skie = "0.10.8"
 maven-publish = "0.34.0"
 download-plugin = "5.6.0"
-mokkery = "2.9.0"
+mokkery = "3.0.0"
 kotlinter = "5.2.0"
 keeper = "0.16.1"
 atomicfu = "0.29.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a84e188..23449a2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME