Migrate to Kotlin 1.9.22 and update dependencies.

.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
 
@@ -29,7 +29,7 @@ jobs:
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BRANCH: gh-pages
-        FOLDER: worldwind-tutorials/build/distributions
+        FOLDER: worldwind-tutorials/build/dist/js/productionExecutable
         CLEAN: true      
     - name: Publish to Maven Central
       env:

build.gradle.kts

@@ -1,16 +1,16 @@
 plugins {
-    val kotlinVersion = "1.8.22"
+    val kotlinVersion = "1.9.22"
     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
 }
 
 buildscript {
     dependencies {
-        classpath("dev.icerock.moko:resources-generator:0.23.0")
+        classpath("dev.icerock.moko:resources-generator:0.24.0-alpha-1")
     }
 }
 
@@ -22,7 +22,7 @@ allprojects {
         set("minSdk", 21)
         set("targetSdk", 34)
         set("versionCode", 9)
-        set("javaVersion", JavaVersion.VERSION_1_8)
+        set("javaVersion", JavaVersion.VERSION_17)
     }
 
     repositories {

gradle.properties

@@ -2,6 +2,7 @@ kotlin.code.style=official
 kotlin.js.generate.executable.default=false
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.applyDefaultHierarchyTemplate=false
 org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
 android.nonTransitiveRClass=true

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.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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")
             }
         }
     }

worldwind-examples-android/build.gradle.kts

@@ -38,7 +38,7 @@ android {
 dependencies {
     implementation(project(":worldwind"))
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     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")

worldwind-tutorials/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 multiplatformResources {
-    multiplatformResourcesPackage = "${project.group}.tutorials"
+    resourcesPackage.set("${project.group}.tutorials")
 }
 
 kotlin {
@@ -21,7 +21,7 @@ kotlin {
             }
         }
     }
-    android {
+    androidTarget {
         compilations.all {
             kotlinOptions.jvmTarget = extra["javaVersion"].toString()
         }
@@ -32,15 +32,26 @@ kotlin {
                 implementation(project(":worldwind"))
             }
         }
-        val jsMain by getting
+        val jsMain by getting {
+            dependsOn(commonMain)
+        }
         val androidMain by getting {
+            dependsOn(commonMain)
             dependencies {
                 implementation("androidx.appcompat:appcompat:1.6.1")
-                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
                 implementation("com.google.android.material:material:1.11.0")
             }
         }
+        all {
+            languageSettings {
+                @Suppress("OPT_IN_USAGE")
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
+            }
+        }
     }
 }
 

worldwind/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 multiplatformResources {
-    multiplatformResourcesPackage = project.group.toString()
+    resourcesPackage.set(project.group.toString())
 }
 
 kotlin {
@@ -32,24 +32,24 @@ kotlin {
             }
         }
     }
-    android {
+    androidTarget {
         publishLibraryVariants("release")
         compilations.all {
             kotlinOptions.jvmTarget = extra["javaVersion"].toString()
         }
     }
     sourceSets {
-        val mockkVersion = "1.13.4"
-        val mokoVersion = "0.23.0"
-        val ktorVersion = "2.3.4"
+        val mockkVersion = "1.13.9"
+        val mokoVersion = "0.24.0-alpha-1"
+        val ktorVersion = "2.3.7"
         val commonMain by getting {
             dependencies {
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.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.5.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.github.pdvrieze.xmlutil:serialization:0.86.1")
-                implementation("com.eygraber:uri-kmp:0.0.12")
+                implementation("io.github.pdvrieze.xmlutil:serialization:0.86.3")
+                implementation("com.eygraber:uri-kmp:0.0.15")
                 implementation("ar.com.hjg:pngj:2.1.0")
                 implementation("mil.nga:tiff:3.0.0")
                 api("dev.icerock.moko:resources:$mokoVersion")
@@ -64,8 +64,7 @@ kotlin {
         val jvmCommonMain by creating {
             dependsOn(commonMain)
             dependencies {
-                // TODO Migrate to CIO engine when issue with connection timeouts on emulator will be solved
-                implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
             }
         }
         val jvmCommonTest by creating {
@@ -97,11 +96,13 @@ kotlin {
             dependsOn(jvmCommonTest)
         }
         val jsMain by getting {
+            dependsOn(commonMain)
             dependencies {
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
             }
         }
         val jsTest by getting {
+            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }
@@ -125,6 +126,14 @@ kotlin {
                 implementation("androidx.test:rules:1.5.0")
             }
         }
+        all {
+            languageSettings {
+                @Suppress("OPT_IN_USAGE")
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
+            }
+        }
     }
 }
 
@@ -236,4 +245,10 @@ signing {
         System.getenv("GPG_PRIVATE_PASSWORD")
     )
     sign(publishing.publications)
+}
+
+// https://github.com/gradle/gradle/issues/26091
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    val signingTasks = tasks.withType<Sign>()
+    mustRunAfter(signingTasks)
 }

worldwind/src/jsMain/kotlin/earth/worldwind/formats/geotiff/TiffIFDEntry.kt

@@ -25,7 +25,7 @@ class TiffIFDEntry(
         require(type == TiffConstants.Type.ASCII) {
             logMessage(ERROR, "TiffIFDEntry", "getIFDEntryValue","Invalid Key Type - ASCII required.")
         }
-        return getIFDEntryValue(true).map { it.toChar() }.joinToString("")
+        return getIFDEntryValue(true).map { it.toInt().toChar() }.joinToString("")
     }
 
     private fun getIFDTypeLength() = when (type) {