Release 1.6.0

WorldWindEarth · Nov 21, 2024 · cfa9e03 · cfa9e03
1 parent 0a96138
commit cfa9e03
Show file tree

Hide file tree

Showing 18 changed files with 763 additions and 755 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'earth.worldwind:worldwind:1.5.27'
+    implementation 'earth.worldwind:worldwind:1.6.0'
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    val kotlinVersion = "1.9.24"
+    val kotlinVersion = "2.0.21"
     kotlin("multiplatform") version kotlinVersion apply false
     kotlin("plugin.serialization") version kotlinVersion apply false
     kotlin("android") version kotlinVersion apply false
@@ -10,23 +10,24 @@ plugins {
 
 buildscript {
     dependencies {
-        classpath("dev.icerock.moko:resources-generator:0.24.2")
+        classpath("dev.icerock.moko:resources-generator:0.24.3")
     }
 }
 
 allprojects {
     group = "earth.worldwind"
-    version = "1.5.27"
+    version = "1.6.0"
 
     extra.apply {
         set("minSdk", 21)
         set("targetSdk", 34)
-        set("versionCode", 11)
+        set("versionCode", 12)
         set("javaVersion", JavaVersion.VERSION_17)
     }
 
     repositories {
         google()
         mavenCentral()
+        maven("https://jogamp.org/deployment/maven/")
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 03 15:48:44 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-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:8.5.2")
+                useModule("com.android.tools.build:gradle:8.6.1")
             }
         }
     }

diff --git a/worldwind-examples-android/build.gradle.kts b/worldwind-examples-android/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     kotlin("android")
     id("com.android.application")
@@ -38,10 +36,10 @@ android {
 dependencies {
     implementation(project(":worldwind"))
     implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
     implementation("com.google.android.material:material:1.12.0")
     implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.60")
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
 }
diff --git a/worldwind-tutorials/build.gradle.kts b/worldwind-tutorials/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     kotlin("multiplatform")
     id("com.android.application")
@@ -27,20 +25,16 @@ kotlin {
         }
     }
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":worldwind"))
             }
         }
-        val jsMain by getting {
-            dependsOn(commonMain)
-        }
-        val androidMain by getting {
-            dependsOn(commonMain)
+        androidMain{
             dependencies {
                 implementation("androidx.appcompat:appcompat:1.7.0")
-                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
+                implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0")
                 implementation("com.google.android.material:material:1.12.0")
             }
         }
@@ -83,5 +77,5 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
 }
diff --git a/worldwind/build.gradle.kts b/worldwind/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
@@ -39,17 +37,17 @@ kotlin {
         }
     }
     sourceSets {
-        val mockkVersion = "1.13.10"
-        val mokoVersion = "0.24.2"
-        val ktorVersion = "2.3.10"
+        val mockkVersion = "1.13.13"
+        val mokoVersion = "0.24.3"
+        val ktorVersion = "2.3.12"
         val ormliteVersion = "6.1"
         val commonMain by getting {
             dependencies {
                 api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
-                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
-                implementation("io.github.pdvrieze.xmlutil:serialization:0.86.3")
+                implementation("io.github.pdvrieze.xmlutil:serialization:0.90.3")
                 implementation("com.eygraber:uri-kmp:0.0.18")
                 implementation("ar.com.hjg:pngj:2.1.0")
                 implementation("mil.nga:tiff:3.0.0")
@@ -76,10 +74,10 @@ kotlin {
                 implementation("io.mockk:mockk-jvm:$mockkVersion")
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependsOn(jvmCommonMain)
             dependencies {
-                val joglVersion = "2.3.2"
+                val joglVersion = "2.5.0"
                 implementation("org.jogamp.gluegen:gluegen-rt:$joglVersion")
                 implementation("org.jogamp.jogl:jogl-all:$joglVersion")
 
@@ -95,34 +93,34 @@ kotlin {
                 implementation("com.j256.ormlite:ormlite-jdbc:$ormliteVersion")
             }
         }
-        val jvmTest by getting {
+        jvmTest {
             dependsOn(jvmCommonTest)
         }
-        val jsMain by getting {
+        jsMain {
             dependsOn(commonMain)
             dependencies {
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
             }
         }
-        val jsTest by getting {
+        jsTest {
             dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }
         }
-        val androidMain by getting {
+        androidMain {
             dependsOn(jvmCommonMain)
             dependencies {
-                implementation("androidx.annotation:annotation:1.8.2")
+                implementation("androidx.annotation:annotation:1.9.1")
                 implementation("androidx.appcompat:appcompat-resources:1.7.0")
                 implementation("io.github.missioncommand:mil-sym-android-renderer:0.1.60")
                 implementation("com.j256.ormlite:ormlite-android:$ormliteVersion")
             }
         }
-        val androidUnitTest by getting {
+        androidUnitTest {
             dependsOn(jvmCommonTest)
         }
-        val androidInstrumentedTest by getting {
+        androidInstrumentedTest {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("io.mockk:mockk-android:$mockkVersion")
@@ -167,17 +165,19 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
 }
 
 // Do not generate Intrinsics runtime assertion for performance reasons
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class)
     .all {
-        kotlinOptions {
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-Xno-call-assertions",
-                "-Xno-receiver-assertions",
-                "-Xno-param-assertions"
+        compilerOptions {
+            freeCompilerArgs.addAll(
+                listOf(
+                    "-Xno-call-assertions",
+                    "-Xno-receiver-assertions",
+                    "-Xno-param-assertions"
+                )
             )
         }
     }

diff --git a/...wind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/...wind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -64,7 +64,7 @@ actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
         reset()
     }
 
-    override fun makeRenderables(scale: Double): List<Renderable> {
+    actual override fun makeRenderables(scale: Double): List<Renderable> {
         val ipc = PointConverter3D(pointUL.x, pointUL.y, scale * 96.0 * 39.3700787)
 
 //        // Calculate clipping rectangle

diff --git a/.../src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt b/.../src/commonMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt
@@ -1,10 +1,12 @@
 package earth.worldwind.globe.elevation.coverage
 
+import earth.worldwind.geom.TileMatrix
 import earth.worldwind.geom.TileMatrixSet
 import earth.worldwind.globe.elevation.ElevationSourceFactory
 
 expect open class TiledElevationCoverage(
     tileMatrixSet: TileMatrixSet, elevationSourceFactory: ElevationSourceFactory
 ): AbstractTiledElevationCoverage {
     open fun clone(): TiledElevationCoverage
+    override suspend fun retrieveTileArray(key: Long, tileMatrix: TileMatrix, row: Int, column: Int)
 }
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/render/image/ImageTile.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/render/image/ImageTile.kt
@@ -8,4 +8,6 @@ import earth.worldwind.util.Tile
 expect open class ImageTile(sector: Sector, level: Level, row: Int, column: Int): Tile, ResourcePostprocessor {
     var imageSource: ImageSource?
     var cacheSource: ImageSource?
+
+    override suspend fun <Resource> process(resource: Resource): Resource
 }
diff --git a/...dwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/...dwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -2,8 +2,11 @@ package earth.worldwind.shape.milstd2525
 
 import earth.worldwind.geom.Location
 import earth.worldwind.geom.Sector
+import earth.worldwind.render.Renderable
 
 expect open class MilStd2525TacticalGraphic(
     sidc: String, locations: List<Location>, boundingSector: Sector = defaultBoundingSector(locations),
     modifiers: Map<String, String>? = null, attributes: Map<String, String>? = null
-) : AbstractMilStd2525TacticalGraphic
+) : AbstractMilStd2525TacticalGraphic {
+    override fun makeRenderables(scale: Double): List<Renderable>
+}
diff --git a/...wind/src/jsMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt b/...wind/src/jsMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt
@@ -29,7 +29,7 @@ actual open class TiledElevationCoverage actual constructor(
         it.sector.copy(sector)
     }
 
-    override suspend fun retrieveTileArray(key: Long, tileMatrix: TileMatrix, row: Int, column: Int) {
+    actual override suspend fun retrieveTileArray(key: Long, tileMatrix: TileMatrix, row: Int, column: Int) {
         val elevationSource = elevationSourceFactory.createElevationSource(tileMatrix, row, column)
         if (elevationSource.isUrl) {
             val url = elevationSource.asUrl()

diff --git a/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageTile.kt b/worldwind/src/jsMain/kotlin/earth/worldwind/render/image/ImageTile.kt
@@ -16,7 +16,7 @@ actual open class ImageTile actual constructor(
     /**
      * Repeat image.onLoad event defined in RenderResourceCache to continue retrieval of original unprocessed image
      */
-    override suspend fun <Resource> process(resource: Resource): Resource {
+    actual override suspend fun <Resource> process(resource: Resource): Resource {
         if (resource is Image) {
             resource.onload?.invoke(Event("load"))
         }

diff --git a/worldwind/src/jsMain/kotlin/earth/worldwind/shape.milstd2525/MilStd2525TacticalGraphic.kt b/worldwind/src/jsMain/kotlin/earth/worldwind/shape.milstd2525/MilStd2525TacticalGraphic.kt
@@ -49,7 +49,7 @@ actual open class MilStd2525TacticalGraphic actual constructor(
         reset()
     }
 
-    override fun makeRenderables(scale: Double): List<Renderable> {
+    actual override fun makeRenderables(scale: Double): List<Renderable> {
         val ipc = PointConverter3D(pointUL.getX(), pointUL.getY(), scale * 96.0 * 39.3700787)
 
 //        // Calculate clipping rectangle

diff --git a/...c/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt b/...c/jvmCommonMain/kotlin/earth/worldwind/globe/elevation/coverage/TiledElevationCoverage.kt
@@ -107,7 +107,7 @@ actual open class TiledElevationCoverage actual constructor(
     }
 
     // TODO If retrieved cache source is outdated, than try to retrieve online source anyway to refresh cache
-    override suspend fun retrieveTileArray(key: Long, tileMatrix: TileMatrix, row: Int, column: Int) {
+    actual override suspend fun retrieveTileArray(key: Long, tileMatrix: TileMatrix, row: Int, column: Int) {
         // Determine a cache source if cache tile factory is specified
         val cacheSource = cacheSourceFactory?.createElevationSource(tileMatrix, row, column)
         try {

diff --git a/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/render/image/ImageTile.kt b/worldwind/src/jvmCommonMain/kotlin/earth/worldwind/render/image/ImageTile.kt
@@ -11,7 +11,7 @@ actual open class ImageTile actual constructor(
     actual var imageSource: ImageSource? = null
     actual var cacheSource: ImageSource? = null
 
-    override suspend fun <Resource> process(resource: Resource): Resource {
+    actual override suspend fun <Resource> process(resource: Resource): Resource {
         val source = cacheSource?.asUnrecognized()
         return if (source is ResourcePostprocessor) source.process(resource) else resource
     }

diff --git a/worldwind/src/jvmMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/worldwind/src/jvmMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -54,7 +54,7 @@ actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
         reset()
     }
 
-    override fun makeRenderables(scale: Double): List<Renderable> {
+    actual override fun makeRenderables(scale: Double): List<Renderable> {
         val ipc = PointConverter3D(pointUL.x, pointUL.y, scale * 96.0 * 39.3700787)
 
 //        // Calculate clipping rectangle