Skip to content

Commit

Permalink
Revert JOGL update to avid JogAmp repository dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
ComBatVision committed Dec 3, 2024
1 parent 9623d54 commit 64e4cb6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repositories {
}
dependencies {
implementation 'earth.worldwind:worldwind:1.6.0'
implementation 'earth.worldwind:worldwind:1.6.1'
}
```

Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildscript {

allprojects {
group = "earth.worldwind"
version = "1.6.0"
version = "1.6.1"

extra.apply {
set("minSdk", 21)
Expand All @@ -28,6 +28,5 @@ allprojects {
repositories {
google()
mavenCentral()
maven("https://jogamp.org/deployment/maven/")
}
}
12 changes: 5 additions & 7 deletions worldwind/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")

Expand All @@ -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"))
}
Expand Down

0 comments on commit 64e4cb6

Please sign in to comment.