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,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
 }
@@ -22,6 +22,7 @@ allprojects {
         set("minSdk", 21)
         set("targetSdk", 34)
         set("versionCode", 8)
+        set("javaVersion", JavaVersion.VERSION_17)
     }
 
     repositories {

gradle.properties

@@ -2,6 +2,8 @@ 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
+android.nonTransitiveRClass=true
+android.suppressUnsupportedCompileSdk=34

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

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

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

worldwind-tutorials/build.gradle.kts

@@ -21,22 +21,35 @@ kotlin {
             }
         }
     }
-    android {
-
+    androidTarget {
+        compilations.all {
+            kotlinOptions.jvmTarget = extra["javaVersion"].toString()
+        }
     }
     sourceSets {
         val commonMain by getting {
             dependencies {
                 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.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")
+            }
+        }
+        all {
+            languageSettings {
+                @Suppress("OPT_IN_USAGE")
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
             }
         }
     }
@@ -65,11 +78,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")
 }

worldwind-tutorials/src/androidMain/kotlin/earth/worldwind/tutorials/MainActivity.kt

@@ -321,7 +321,7 @@ class MainActivity: AppCompatActivity(), NavigationView.OnNavigationItemSelected
     private fun loadTutorial(globeFragment: Class<out Fragment>, url: String, titleId: Int) {
         try {
             setTitle(titleId)
-            val globe = globeFragment.newInstance()
+            val globe = globeFragment.getDeclaredConstructor().newInstance()
             supportFragmentManager
                 .beginTransaction()
                 .replace(R.id.globe_container, globe) // replace (destroy) existing fragment (if any)

worldwind-tutorials/src/jsMain/kotlin/earth/worldwind/tutorials/Main.kt

@@ -1,4 +1,5 @@
 @file:JsExport
+@file:Suppress("OPT_IN_USAGE", "NON_EXPORTABLE_TYPE")
 
 package earth.worldwind.tutorials
 

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()
@@ -32,21 +32,24 @@ kotlin {
             }
         }
     }
-    android {
+    androidTarget {
         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")
-                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.2")
+                implementation("com.eygraber:uri-kmp:0.0.15")
                 api("dev.icerock.moko:resources:$mokoVersion")
             }
         }
@@ -77,7 +80,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")
@@ -92,19 +95,21 @@ 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"))
             }
         }
         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")
             }
@@ -120,6 +125,14 @@ kotlin {
                 implementation("androidx.test:rules:1.5.0")
             }
         }
+        all {
+            languageSettings {
+                @Suppress("OPT_IN_USAGE")
+                compilerOptions {
+                    freeCompilerArgs.add("-Xexpect-actual-classes")
+                }
+            }
+        }
     }
 }
 
@@ -144,13 +157,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
@@ -165,6 +178,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class)
         }
     }
 
+afterEvaluate {
+    tasks.named("generateMRandroidMain") { dependsOn("androidReleaseSourcesJar") }
+}
+
 val dokkaOutputDir = "$buildDir/dokka"
 tasks.getByName<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml") {
     outputDirectory.set(file(dokkaOutputDir))

worldwind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt

@@ -84,6 +84,7 @@ actual open class MilStd2525Placemark actual constructor(
          *
          * @return A new [PlacemarkAttributes] bundle representing the MIL-STD-2525 symbol.
          */
+        @JvmStatic
         actual fun getPlacemarkAttributes(
             symbolCode: String, symbolModifiers: Map<String, String>?, symbolAttributes: Map<String, String>?
         ): PlacemarkAttributes {

worldwind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt

@@ -18,7 +18,7 @@ import earth.worldwind.shape.*
 import earth.worldwind.util.Logger
 import kotlin.math.roundToInt
 
-actual open class MilStd2525TacticalGraphic actual constructor(
+actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
     sidc: String, locations: List<Location>,
     boundingSector: Sector, modifiers: Map<String, String>?, attributes: Map<String, String>?
 ) : AbstractMilStd2525TacticalGraphic(sidc, locations, boundingSector, modifiers, attributes) {

worldwind/src/commonMain/kotlin/earth/worldwind/geom/Matrix3.kt

@@ -541,7 +541,8 @@ open class Matrix3 private constructor(
      *
      * @return this matrix set to the inverse of the specified matrix
      */
-    fun invertMatrix(matrix: Matrix3): Matrix3 { 
+    @Suppress("UNUSED_PARAMETER")
+    fun invertMatrix(matrix: Matrix3): Matrix3 {
         TODO("Matrix3.invertMatrix is not implemented")
     }
 

worldwind/src/commonMain/kotlin/earth/worldwind/layer/graticule/AbstractGraticuleLayer.kt

@@ -312,6 +312,7 @@ abstract class AbstractGraticuleLayer(name: String): AbstractLayer(name) {
         altitudeMode = AltitudeMode.CLAMP_TO_GROUND
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun createTextRenderable(position: Position, label: String, resolution: Double) = Label(position, label).apply {
         altitudeMode = AltitudeMode.CLAMP_TO_GROUND
         // priority = resolution * 1e6 // TODO Implement priority

worldwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt

@@ -2,7 +2,6 @@ package earth.worldwind.shape.milstd2525
 
 import earth.worldwind.geom.Position
 import earth.worldwind.shape.PlacemarkAttributes
-import kotlin.jvm.JvmStatic
 
 expect open class MilStd2525Placemark(
     symbolCode: String,
@@ -11,10 +10,8 @@ expect open class MilStd2525Placemark(
     symbolAttributes: Map<String, String>? = null
 ) : AbstractMilStd2525Placemark {
     companion object {
-        @JvmStatic
         fun clearSymbolCache()
 
-        @JvmStatic
         fun getPlacemarkAttributes(
             symbolCode: String,
             symbolModifiers: Map<String, String>? = null,

worldwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt

@@ -2,9 +2,8 @@ package earth.worldwind.shape.milstd2525
 
 import earth.worldwind.geom.Location
 import earth.worldwind.geom.Sector
-import kotlin.jvm.JvmOverloads
 
-expect open class MilStd2525TacticalGraphic @JvmOverloads constructor(
+expect open class MilStd2525TacticalGraphic(
     sidc: String, locations: List<Location>, boundingSector: Sector = defaultBoundingSector(locations),
     modifiers: Map<String, String>? = null, attributes: Map<String, String>? = null
 ) : AbstractMilStd2525TacticalGraphic

worldwind/src/commonMain/kotlin/earth/worldwind/util/Logger.kt

@@ -1,15 +1,11 @@
 package earth.worldwind.util
 
-import kotlin.jvm.JvmOverloads
-import kotlin.jvm.JvmStatic
-
 expect object Logger {
     val ERROR: Int
     val WARN: Int
     val INFO: Int
     val DEBUG: Int
 
-    @JvmStatic
     fun isLoggable(priority: Int): Boolean
 
     /**
@@ -20,14 +16,9 @@ expect object Logger {
      * @param message The message to log. Nothing is logged if the message is null or undefined.
      * @param tr Optional exception
      */
-    @JvmStatic
-    @JvmOverloads
     fun log(priority: Int, message: String, tr: Throwable? = null)
 
-    @JvmStatic
-    @JvmOverloads
     fun logMessage(level: Int, className: String, methodName: String, message: String, tr: Throwable? = null): String
 
-    @JvmStatic
     fun makeMessage(className: String, methodName: String, message: String): String
 }

worldwind/src/jvmMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt

@@ -13,7 +13,7 @@ import earth.worldwind.shape.*
 import earth.worldwind.util.Logger
 import java.awt.geom.Point2D
 
-actual open class MilStd2525TacticalGraphic actual constructor(
+actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
     sidc: String, locations: List<Location>,
     boundingSector: Sector, modifiers: Map<String, String>?, attributes: Map<String, String>?
 ) : AbstractMilStd2525TacticalGraphic(sidc, locations, boundingSector, modifiers, attributes) {