Automatic deployment: KTX 1.13.1-rc1, gdx-liftoff 1.13.1.1.

czyzby · czyzby · commit 9e8e48972694 · 2025-02-03T15:47:51.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 ## Gradle:
 .gradle/
 gradle-app.setting
+/gradle/gradle-daemon-jvm.properties
 /build/
 /android/build/
 /core/build/
@@ -152,6 +153,7 @@ Thumbs.db
 *~
 *.*#
 *#*#
+/.kotlin/
 /assets/assets.txt
 
 ## Special cases:
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This project was generated with a Kotlin project template that includes Kotlin a
 ## Platforms
 
 - `core`: Main module with the application logic shared by all platforms.
-- `lwjgl3`: Primary desktop platform using LWJGL3.
+- `lwjgl3`: Primary desktop platform using LWJGL3; was called 'desktop' in older docs.
 - `android`: Android mobile platform. Needs Android SDK.
 - `ios`: iOS mobile platform using RoboVM.
 - `teavm`: Experimental web platform using TeaVM and WebGL.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,3 +1,10 @@
+
+buildscript {
+  repositories {
+    mavenCentral()
+    google()
+  }
+}
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
   }
   dependencies {
-    classpath "com.android.tools.build:gradle:8.1.4"
+    classpath "com.android.tools.build:gradle:8.5.2"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
   }
@@ -47,7 +47,7 @@ configure(subprojects - project(':android')) {
     // iterate through all files inside that folder
     // convert it to a relative path
     // and append it to the file assets.txt
-    fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.each {
+    fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.sort().each {
       assetsFile.append(it + "\n")
     }
   }
@@ -57,11 +57,12 @@ configure(subprojects - project(':android')) {
     options.incremental = true
   }
   compileKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+  compileTestKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
   
 }
 
 subprojects {
-  version = '$projectVersion'
+  version = "$projectVersion"
   ext.appName = 'ktx-demo-web'
   repositories {
     mavenCentral()
diff --git a/core/build.gradle b/core/build.gradle
@@ -33,4 +33,8 @@ dependencies {
   api "io.github.libktx:ktx-vis-style:$ktxVersion"
   api "io.github.libktx:ktx-vis:$ktxVersion"
   api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+  if(enableGraalNative == 'true') {
+    implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"
+  }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,19 @@
-org.gradle.daemon=true
-org.gradle.jvmargs=-Xms512M -Xmx1G
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xms512M -Xmx1G -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8
 org.gradle.configureondemand=false
-ktxVersion=1.12.1-rc2
-kotlinVersion=1.9.25
-gdxControllersVersion=2.2.3
-aiVersion=1.8.2
+ktxVersion=1.13.1-rc1
+kotlinVersion=2.1.0
 box2dlightsVersion=1.5
+aiVersion=1.8.2
 ashleyVersion=1.7.4
-visUiVersion=1.5.3
-graalHelperVersion=2.0.1
+gdxControllersVersion=2.2.3
+visUiVersion=1.5.5
 enableGraalNative=false
+graalHelperVersion=2.0.1
+android.useAndroidX=true
 android.enableR8.fullMode=false
 robovmVersion=2.3.20
-gdxTeaVMVersion=1.0.3
-teaVMVersion=0.10.1
-gdxVersion=1.12.1
-projectVersion=1.12.1.14-SNAPSHOT
+gdxTeaVMVersion=1.1.0
+teaVMVersion=0.11.0
+gdxVersion=1.13.1
+projectVersion=1.13.1.2-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/ios/build.gradle b/ios/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'robovm'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 ext {
-  mainClassName = "ktx.demo.ios.IOSLauncher"
+  mainClassName = "ktx.demo.IOSLauncher"
 }
 
 launchIPhoneSimulator.dependsOn build
diff --git a/ios/robovm.properties b/ios/robovm.properties
@@ -1,6 +1,6 @@
-app.version=1.12.1.14-SNAPSHOT
+app.version=1.13.1.2-SNAPSHOT
 app.id=ktx.demo
-app.mainclass=ktx.demo.ios.IOSLauncher
+app.mainclass=ktx.demo.IOSLauncher
 app.executable=IOSLauncher
 app.build=1
 app.name=ktx-demo-web
diff --git a/ios/src/main/kotlin/ktx/demo/IOSLauncher.kt b/ios/src/main/kotlin/ktx/demo/IOSLauncher.kt
@@ -1,6 +1,6 @@
 @file:JvmName("IOSLauncher")
 
-package ktx.demo.ios
+package ktx.demo
 
 import org.robovm.apple.foundation.NSAutoreleasePool
 import org.robovm.apple.uikit.UIApplication
diff --git a/lwjgl3/build.gradle b/lwjgl3/build.gradle
@@ -1,17 +1,19 @@
+
 buildscript {
   repositories {
     gradlePluginPortal()
   }
   dependencies {
+    classpath "io.github.fourlastor:construo:1.5.1"
     if(enableGraalNative == 'true') {
       classpath "org.graalvm.buildtools.native:org.graalvm.buildtools.native.gradle.plugin:0.9.28"
     }
   }
 }
 plugins {
-  id "io.github.fourlastor.construo" version "1.3.0"
   id "application"
 }
+apply plugin: 'io.github.fourlastor.construo'
 apply plugin: 'org.jetbrains.kotlin.jvm'
 
 
@@ -37,13 +39,22 @@ dependencies {
   implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
   implementation project(':core')
   implementation("com.badlogicgames.gdx:gdx-tools:$gdxVersion"){exclude group: 'com.badlogicgames.gdx', module: 'gdx-backend-lwjgl'}
+
+  if(enableGraalNative == 'true') {
+    implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
+      implementation "io.github.berstanio:gdx-svmhelper-extension-box2d:$graalHelperVersion"
+      implementation "io.github.berstanio:gdx-svmhelper-extension-bullet:$graalHelperVersion"
+      implementation "io.github.berstanio:gdx-svmhelper-extension-freetype:$graalHelperVersion"
+    }
+
 }
 
 def os = System.properties['os.name'].toLowerCase()
 
 run {
   workingDir = rootProject.file('assets').path
-  setIgnoreExitValue(true)
+// You can uncomment the next line if your IDE claims a build failure even when the app closed properly.
+  //setIgnoreExitValue(true)
 
   if (os.contains('mac')) jvmArgs += "-XstartOnFirstThread"
 }
@@ -76,32 +87,34 @@ construo {
     // human-readable name, used for example in the `.app` name for macOS
     humanName.set(appName)
     // Optional, defaults to project version property
-    version.set('$projectVersion')
+    version.set("$projectVersion")
 
     targets.configure {
       create("linuxX64", Target.Linux) {
         architecture.set(Target.Architecture.X86_64)
-        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz")
+        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz")
       }
       create("macM1", Target.MacOs) {
         architecture.set(Target.Architecture.AARCH64)
-        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.11_9.tar.gz")
+        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz")
         // macOS needs an identifier
         identifier.set("ktx.demo." + appName)
         // Optional: icon for macOS
         macIcon.set(project.file("icons/logo.icns"))
       }
       create("macX64", Target.MacOs) {
         architecture.set(Target.Architecture.X86_64)
-        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz")
+        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz")
         // macOS needs an identifier
         identifier.set("ktx.demo." + appName)
         // Optional: icon for macOS
         macIcon.set(project.file("icons/logo.icns"))
       }
       create("winX64", Target.Windows) {
         architecture.set(Target.Architecture.X86_64)
-        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_windows_hotspot_17.0.11_9.zip")
+        jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip")
+        // Uncomment the next line to show a console when the game runs, to print messages.
+        //useConsole.set(true)
       }
     }
 }
diff --git a/lwjgl3/nativeimage.gradle b/lwjgl3/nativeimage.gradle
@@ -2,12 +2,6 @@
 project(":lwjgl3") {
   apply plugin: "org.graalvm.buildtools.native"
 
-  dependencies {
-    implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
-    implementation "io.github.berstanio:gdx-svmhelper-extension-box2d:$graalHelperVersion"
-    implementation "io.github.berstanio:gdx-svmhelper-extension-bullet:$graalHelperVersion"
-    implementation "io.github.berstanio:gdx-svmhelper-extension-freetype:$graalHelperVersion"
-  }
   graalvmNative {
     binaries {
       main {
@@ -17,6 +11,7 @@ project(":lwjgl3") {
         buildArgs.add("-march=compatibility")
         jvmArgs.addAll("-Dfile.encoding=UTF8")
         sharedLibrary = false
+        resources.autodetect()
       }
     }
   }
@@ -57,9 +52,3 @@ project(":lwjgl3") {
     )
   }
 }
-
-project(":core") {
-  dependencies {
-    implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"
-  }
-}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`		`- classpath "com.android.tools.build:gradle:8.1.4"`
	`12`	`+ classpath "com.android.tools.build:gradle:8.5.2"`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`14`	`14`
`15`	`15`	`}`
`@@ -47,7 +47,7 @@ configure(subprojects - project(':android')) {`
`47`	`47`	`// iterate through all files inside that folder`
`48`	`48`	`// convert it to a relative path`
`49`	`49`	`// and append it to the file assets.txt`
`50`		`- fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.each {`
	`50`	`+ fileTree(assetsFolder).collect { assetsFolder.relativePath(it) }.sort().each {`
`51`	`51`	`assetsFile.append(it + "\n")`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -57,11 +57,12 @@ configure(subprojects - project(':android')) {`
`57`	`57`	`options.incremental = true`
`58`	`58`	`}`
`59`	`59`	`compileKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)`
	`60`	`+ compileTestKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)`
`60`	`61`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`subprojects {`
`64`		`- version = '$projectVersion'`
	`65`	`+ version = "$projectVersion"`
`65`	`66`	`ext.appName = 'ktx-demo-web'`
`66`	`67`	`repositories {`
`67`	`68`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,8 @@ dependencies {`
`33`	`33`	`api "io.github.libktx:ktx-vis-style:$ktxVersion"`
`34`	`34`	`api "io.github.libktx:ktx-vis:$ktxVersion"`
`35`	`35`	`api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"`
	`36`	`+`
	`37`	`+ if(enableGraalNative == 'true') {`
	`38`	`+ implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"`
	`39`	`+ }`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ apply plugin: 'robovm'`
`11`	`11`	`[compileJava, compileTestJava].options.encoding = 'UTF-8'`
`12`	`12`
`13`	`13`	`ext {`
`14`		`- mainClassName = "ktx.demo.ios.IOSLauncher"`
	`14`	`+ mainClassName = "ktx.demo.IOSLauncher"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`launchIPhoneSimulator.dependsOn build`