Update dependencies.

WorldWindEarth · Dec 3, 2023 · 3ed8c1a · 3ed8c1a
1 parent 607b962
commit 3ed8c1a
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 18
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '18'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
-    val kotlinVersion = "1.8.22"
+    val kotlinVersion = "1.9.21"
     kotlin("multiplatform") version kotlinVersion apply false
     kotlin("plugin.serialization") version kotlinVersion apply false
     kotlin("android") version kotlinVersion apply false
-    id("org.jetbrains.dokka") version "1.8.20" apply false
+    id("org.jetbrains.dokka") version "1.9.10" apply false
     id("com.android.library") apply false
     id("com.android.application") apply false
 }

diff --git a/gradle.properties b/gradle.properties
@@ -4,4 +4,5 @@ kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.suppressUnsupportedCompileSdk=34
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Dec 03 15:48:44 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if (requested.id.namespace == "com.android") {
-                useModule("com.android.tools.build:gradle:7.4.2")
+                useModule("com.android.tools.build:gradle:8.1.0")
             }
         }
     }

diff --git a/worldwind-examples-android/build.gradle.kts b/worldwind-examples-android/build.gradle.kts
@@ -26,18 +26,18 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
     }
 }
 
 dependencies {
     implementation(project(":worldwind"))
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+    implementation("com.google.android.material:material:1.10.0")
     implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.54")
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 }
diff --git a/worldwind-tutorials/build.gradle.kts b/worldwind-tutorials/build.gradle.kts
@@ -32,11 +32,12 @@ kotlin {
         }
         val jsMain by getting
         val androidMain by getting {
+            kotlin.srcDir("build/generated/moko/androidMain/src")
             dependencies {
                 implementation("androidx.appcompat:appcompat:1.6.1")
-                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
-                implementation("com.google.android.material:material:1.9.0")
+                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+                implementation("com.google.android.material:material:1.10.0")
             }
         }
     }
@@ -65,11 +66,11 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
     }
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 }
diff --git a/worldwind/build.gradle.kts b/worldwind/build.gradle.kts
@@ -36,17 +36,17 @@ kotlin {
         publishLibraryVariants("release")
     }
     sourceSets {
-        val mockkVersion = "1.13.3"
+        val mockkVersion = "1.13.4"
         val mokoVersion = "0.23.0"
-        val ktorVersion = "2.2.4"
+        val ktorVersion = "2.3.6"
         val commonMain by getting {
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
+                api("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.github.pdvrieze.xmlutil:serialization:0.85.0")
-                implementation("com.eygraber:uri-kmp:0.0.11")
+                implementation("io.github.pdvrieze.xmlutil:serialization:0.86.1")
+                implementation("com.eygraber:uri-kmp:0.0.15")
                 api("dev.icerock.moko:resources:$mokoVersion")
             }
         }
@@ -77,7 +77,7 @@ kotlin {
                 implementation("org.jogamp.gluegen:gluegen-rt:$joglVersion")
                 implementation("org.jogamp.jogl:jogl-all:$joglVersion")
 
-                val lwjglVersion = "3.3.1"
+                val lwjglVersion = "3.3.3"
                 implementation("org.lwjgl:lwjgl:$lwjglVersion")
                 implementation("org.lwjgl:lwjgl-assimp:$lwjglVersion")
                 implementation("org.lwjgl:lwjgl-glfw:$lwjglVersion")
@@ -104,7 +104,7 @@ kotlin {
         val androidMain by getting {
             dependsOn(jvmCommonMain)
             dependencies {
-                implementation("androidx.annotation:annotation:1.6.0")
+                implementation("androidx.annotation:annotation:1.7.0")
                 implementation("androidx.appcompat:appcompat-resources:1.6.1")
                 implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.54")
             }
@@ -144,13 +144,13 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
     }
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 }
 
 // Do not generate Intrinsics runtime assertion for performance reasons