Update dependencies.

WorldWindEarth · Dec 29, 2023 · 34c2583 · 34c2583
1 parent 762d738
commit 34c2583
Show file tree

Hide file tree

Showing 8 changed files with 316 additions and 277 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 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,6 +22,7 @@ allprojects {
         set("minSdk", 21)
         set("targetSdk", 34)
         set("versionCode", 8)
+        set("javaVersion", JavaVersion.VERSION_17)
     }
 
     repositories {

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/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
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.1")
             }
         }
     }

diff --git a/worldwind-examples-android/build.gradle.kts b/worldwind-examples-android/build.gradle.kts
@@ -26,18 +26,22 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = extra["javaVersion"] as JavaVersion
+        targetCompatibility = extra["javaVersion"] as JavaVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = extra["javaVersion"].toString()
     }
 }
 
 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.11.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
@@ -22,7 +22,9 @@ kotlin {
         }
     }
     android {
-
+        compilations.all {
+            kotlinOptions.jvmTarget = extra["javaVersion"].toString()
+        }
     }
     sourceSets {
         val commonMain by getting {
@@ -34,9 +36,9 @@ kotlin {
         val androidMain by getting {
             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.11.0")
             }
         }
     }
@@ -65,11 +67,11 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = extra["javaVersion"] as JavaVersion
+        targetCompatibility = extra["javaVersion"] as JavaVersion
     }
 }
 
 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
@@ -17,7 +17,7 @@ multiplatformResources {
 kotlin {
     jvm {
         compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
+            kotlinOptions.jvmTarget = extra["javaVersion"].toString()
         }
         testRuns["test"].executionTask.configure {
             useJUnit()
@@ -34,19 +34,22 @@ kotlin {
     }
     android {
         publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions.jvmTarget = extra["javaVersion"].toString()
+        }
     }
     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")
+                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
                 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.12")
                 implementation("ar.com.hjg:pngj:2.1.0")
                 implementation("mil.nga:tiff:3.0.0")
                 api("dev.icerock.moko:resources:$mokoVersion")
@@ -79,7 +82,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")
@@ -106,7 +109,7 @@ kotlin {
         val androidMain by getting {
             dependsOn(jvmCommonMain)
             dependencies {
-                implementation("androidx.annotation:annotation:1.6.0")
+                implementation("androidx.annotation:annotation:1.7.1")
                 implementation("androidx.appcompat:appcompat-resources:1.6.1")
                 implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.54")
             }
@@ -146,13 +149,13 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = extra["javaVersion"] as JavaVersion
+        targetCompatibility = extra["javaVersion"] as JavaVersion
     }
 }
 
 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