From 64e4cb67e5718d50f986090bc5cfab67200422ce Mon Sep 17 00:00:00 2001
From: Eugene Maksymenko <maxigene@gmail.com>
Date: Tue, 3 Dec 2024 19:37:50 +0200
Subject: [PATCH] Revert JOGL update to avid JogAmp repository dependency.

---
 README.md                  |  2 +-
 build.gradle.kts           |  3 +--
 worldwind/build.gradle.kts | 12 +++++-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 4c269634..fbbccb62 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'earth.worldwind:worldwind:1.6.0'
+    implementation 'earth.worldwind:worldwind:1.6.1'
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index b25c81d1..b003080b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
 
 allprojects {
     group = "earth.worldwind"
-    version = "1.6.0"
+    version = "1.6.1"
 
     extra.apply {
         set("minSdk", 21)
@@ -28,6 +28,5 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven("https://jogamp.org/deployment/maven/")
     }
 }
\ No newline at end of file
diff --git a/worldwind/build.gradle.kts b/worldwind/build.gradle.kts
index ec49169a..9046b548 100644
--- a/worldwind/build.gradle.kts
+++ b/worldwind/build.gradle.kts
@@ -41,7 +41,7 @@ kotlin {
         val mokoVersion = "0.24.3"
         val ktorVersion = "2.3.12"
         val ormliteVersion = "6.1"
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
                 api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
@@ -54,21 +54,21 @@ kotlin {
                 api("dev.icerock.moko:resources:$mokoVersion")
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
                 implementation("dev.icerock.moko:resources-test:$mokoVersion")
             }
         }
         val jvmCommonMain by creating {
-            dependsOn(commonMain)
+            dependsOn(commonMain.get())
             dependencies {
                 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
                 compileOnly("com.j256.ormlite:ormlite-core:$ormliteVersion")
             }
         }
         val jvmCommonTest by creating {
-            dependsOn(commonTest)
+            dependsOn(commonTest.get())
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("io.mockk:mockk-jvm:$mockkVersion")
@@ -77,7 +77,7 @@ kotlin {
         jvmMain {
             dependsOn(jvmCommonMain)
             dependencies {
-                val joglVersion = "2.5.0"
+                val joglVersion = "2.3.2"
                 implementation("org.jogamp.gluegen:gluegen-rt:$joglVersion")
                 implementation("org.jogamp.jogl:jogl-all:$joglVersion")
 
@@ -97,13 +97,11 @@ kotlin {
             dependsOn(jvmCommonTest)
         }
         jsMain {
-            dependsOn(commonMain)
             dependencies {
                 implementation("io.ktor:ktor-client-js:$ktorVersion")
             }
         }
         jsTest {
-            dependsOn(commonTest)
             dependencies {
                 implementation(kotlin("test-js"))
             }