Automatic deployment: KTX 1.12.1-rc2, gdx-liftoff 1.12.1.14.

Author: czyzby

.gitignore

@@ -152,3 +152,12 @@ Thumbs.db
 *~
 *.*#
 *#*#
+/assets/assets.txt
+
+## Special cases:
+
+## There is a resource-config.json file generated by nativeimage.gradle if you use Graal Native Image.
+## Some usage may need extra resource configuration in a different file with the same name.
+## You could also add that configuration to the text in nativeimage.gradle .
+## You should delete or comment out the next line if you have configuration in a different resource-config.json .
+**/resource-config.json

README.md

@@ -1,6 +1,6 @@
 # ktx-demo-web
 
-A [libGDX](https://libgdx.com/) project generated with [gdx-liftoff](https://github.com/tommyettinger/gdx-liftoff).
+A [libGDX](https://libgdx.com/) project generated with [gdx-liftoff](https://github.com/libgdx/gdx-liftoff).
 
 This project was generated with a Kotlin project template that includes Kotlin application launchers and [KTX](https://libktx.github.io/) utilities.
 
@@ -14,7 +14,7 @@ This project was generated with a Kotlin project template that includes Kotlin a
 
 ## Gradle
 
-This project uses [Gradle](http://gradle.org/) to manage dependencies.
+This project uses [Gradle](https://gradle.org/) to manage dependencies.
 The Gradle wrapper was included, so you can run Gradle tasks using `gradlew.bat` or `./gradlew` commands.
 Useful Gradle tasks and flags:
 
@@ -29,7 +29,7 @@ Useful Gradle tasks and flags:
 - `clean`: removes `build` folders, which store compiled classes and built archives.
 - `eclipse`: generates Eclipse project data.
 - `idea`: generates IntelliJ project data.
-- `lwjgl3:jar`: builds application's runnable jar, which can be found at `lwjgl3/build/lib`.
+- `lwjgl3:jar`: builds application's runnable jar, which can be found at `lwjgl3/build/libs`.
 - `lwjgl3:run`: starts the application.
 - `teavm:build`: builds the JavaScript application into the build/dist/webapp folder.
 - `teavm:run`: serves the JavaScript application at http://localhost:8080 via a local Jetty server.

android/build.gradle

@@ -2,35 +2,35 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-  compileSdk 32
+  namespace "ktx.demo"
+  compileSdk 34
   sourceSets {
     main {
       manifest.srcFile 'AndroidManifest.xml'
-      java.srcDirs('src/main/java', 'src/main/kotlin')
-      aidl.srcDirs('src/main/java', 'src/main/kotlin')
-      renderscript.srcDirs('src/main/java', 'src/main/kotlin')
-      res.srcDirs('res')
-      assets.srcDirs('../assets')
-      jniLibs.srcDirs('libs')
+      java.setSrcDirs(['src/main/java', 'src/main/kotlin'])
+      aidl.setSrcDirs(['src/main/java', 'src/main/kotlin'])
+      renderscript.setSrcDirs(['src/main/java', 'src/main/kotlin'])
+      res.setSrcDirs(['res'])
+      assets.setSrcDirs(['../assets'])
+      jniLibs.setSrcDirs(['libs'])
     }
   }
   packagingOptions {
-    resources.with {
-      excludes += ['META-INF/robovm/ios/robovm.xml',
-        'META-INF/DEPENDENCIES.txt', 'META-INF/DEPENDENCIES', 'META-INF/dependencies.txt', '**/*.gwt.xml']
+    resources {
+      excludes += ['META-INF/robovm/ios/robovm.xml', 'META-INF/DEPENDENCIES.txt', 'META-INF/DEPENDENCIES',
+                   'META-INF/dependencies.txt', '**/*.gwt.xml']
       pickFirsts += ['META-INF/LICENSE.txt', 'META-INF/LICENSE', 'META-INF/license.txt', 'META-INF/LGPL2.1',
-        'META-INF/NOTICE.txt', 'META-INF/NOTICE', 'META-INF/notice.txt']
+                     'META-INF/NOTICE.txt', 'META-INF/NOTICE', 'META-INF/notice.txt']
     }
   }
   defaultConfig {
     applicationId 'ktx.demo'
     minSdkVersion 19
-    targetSdkVersion 32
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
     multiDexEnabled true
   }
-  namespace "ktx.demo"
   compileOptions {
     sourceCompatibility "11"
     targetCompatibility "11"
@@ -43,9 +43,8 @@ android {
     }
   }
 
-  kotlin {
-    jvmToolchain(11)
-  }
+  kotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+  
 }
 
 repositories {
@@ -56,7 +55,7 @@ repositories {
 configurations { natives }
 
 dependencies {
-  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
   implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
   implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
   implementation project(':core')
@@ -90,7 +89,7 @@ tasks.register('copyAndroidNatives') {
     file("libs/x86_64/").mkdirs()
     file("libs/x86/").mkdirs()
 
-    configurations.named("natives").orNull.copy().files.each { jar ->
+    configurations.natives.copy().files.each { jar ->
       def outputDir = null
       if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
       if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
@@ -106,6 +105,7 @@ tasks.register('copyAndroidNatives') {
     }
   }
 }
+
 tasks.matching { it.name.contains("merge") && it.name.contains("JniLibFolders") }.configureEach { packageTask ->
   packageTask.dependsOn 'copyAndroidNatives'
 }

android/ic_launcher-web.png

@@ -8,7 +8,7 @@
 # include property in project.properties.
 #
 # For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+#   https://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
 
@@ -23,20 +23,11 @@
 
 -dontwarn android.support.**
 -dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
--dontwarn com.badlogic.gdx.utils.GdxBuild
--dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild
--dontwarn com.badlogic.gdx.jnigen.BuildTarget*
--dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild
 
-# If you're encountering ProGuard issues and use gdx-controllers, THIS MIGHT BE WHY!!!
-
-# Uncomment the following line if you use the gdx-controllers official extension.
-#-keep class com.badlogic.gdx.controllers.android.AndroidControllers
-
--keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* {
-   <init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);
-}
+# Needed by the gdx-controllers official extension.
+-keep class com.badlogic.gdx.controllers.android.AndroidControllers
 
+# Needed by the Box2D official extension.
 -keepclassmembers class com.badlogic.gdx.physics.box2d.World {
    boolean contactFilter(long, long);
    void    beginContact(long);
@@ -47,12 +38,12 @@
    float   reportRayFixture(long, float, float, float, float, float);
 }
 
-# You will need the next three lines if you use scene2d for UI or gameplay
-# If you don't use scene2d at all, you can remove or comment out the next line
+# You will need the next three lines if you use scene2d for UI or gameplay.
+# If you don't use scene2d at all, you can remove or comment out the next line:
 -keep public class com.badlogic.gdx.scenes.scene2d.** { *; }
-# You will need the next two lines if you use BitmapFont or any scene2d.ui text
+# You will need the next two lines if you use BitmapFont or any scene2d.ui text:
 -keep public class com.badlogic.gdx.graphics.g2d.BitmapFont { *; }
-# You will probably need this line in most cases
+# You will probably need this line in most cases:
 -keep public class com.badlogic.gdx.graphics.Color { *; }
 
 # These two lines are used with mapping files; see https://developer.android.com/build/shrink-code#retracing