Tools & libraries version updates

README.md

@@ -55,13 +55,13 @@ Andrzej Novosiolov, as the original author.
 
 The game has been implemented using following tools and libraries:
 
-- [IntelliJ IDEA 2022.1 (Community Edition)](https://www.jetbrains.com/idea/download/)
-- [Android Studio 2021.1.1 Patch 2](https://developer.android.com/studio) (for the Android emulator)
-- [Gradle 7.0.4](https://gradle.org/)
-- [Kotlin 1.6.20](https://kotlinlang.org/)
-- [libGDX 1.10.0](https://libgdx.com/)
-- [libKTX 1.10.0-rc2](https://libktx.github.io/)
-- [ShapeDrawer 2.5.0](https://github.com/earlygrey/shapedrawer#shape-drawer)
+- [IntelliJ IDEA 2022.3.1 (Community Edition)](https://www.jetbrains.com/idea/download/)
+- [Android Studio 2021.3.1 Patch 1](https://developer.android.com/studio) (for the Android emulator)
+- [Gradle 7.3.0](https://gradle.org/)
+- [Kotlin 1.7.0](https://kotlinlang.org/)
+- [libGDX 1.11.0](https://libgdx.com/)
+- [libKTX 1.11.0-rc3](https://libktx.github.io/)
+- [ShapeDrawer 2.6.0](https://github.com/earlygrey/shapedrawer#shape-drawer)
 - [Universal Tween Engine 6.3.3](https://github.com/AurelienRibon/universal-tween-engine)
 - Free icons from https://www.flaticon.com/
 

android/build.gradle

@@ -1,6 +1,32 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
 android {
-    buildToolsVersion '30.0.3'
-    compileSdkVersion 30
+    compileSdk 32
+    defaultConfig {
+        applicationId 'com.andrzejn.chainrelations'
+        minSdk 19
+        targetSdk 32
+        versionCode 7
+        versionName '1.6'
+        multiDexEnabled true
+    }
+    compileOptions {
+        sourceCompatibility '8.0'
+        targetCompatibility '8.0'
+        coreLibraryDesugaringEnabled true
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -28,45 +54,24 @@ android {
         exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/dependencies.txt'
     }
-    defaultConfig {
-        applicationId 'com.andrzejn.chainrelations'
-        minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 7
-        versionName '1.6'
-        multiDexEnabled true
-    }
-    compileOptions {
-        sourceCompatibility '8.0'
-        targetCompatibility '8.0'
-        coreLibraryDesugaringEnabled true
-    }
-    kotlinOptions.jvmTarget = '1.8'
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
 }
 
 
-// called every time gradle gets executed, takes the native dependencies of
+
+// Called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
-task copyAndroidNatives {
+task copyAndroidNatives() {
     doFirst {
-        file('libs/armeabi/').mkdirs()
         file('libs/armeabi-v7a/').mkdirs()
         file('libs/arm64-v8a/').mkdirs()
         file('libs/x86_64/').mkdirs()
         file('libs/x86/').mkdirs()
 
-        configurations.natives.copy().files.each { jar ->
+        configurations.getByName('natives').copy().files.each { jar ->
             def outputDir = null
-            if (jar.name.endsWith('natives-arm64-v8a.jar')) outputDir = file('libs/arm64-v8a')
             if (jar.name.endsWith('natives-armeabi-v7a.jar')) outputDir = file('libs/armeabi-v7a')
-            if (jar.name.endsWith('natives-armeabi.jar')) outputDir = file('libs/armeabi')
+            if (jar.name.endsWith('natives-arm64-v8a.jar')) outputDir = file('libs/arm64-v8a')
             if (jar.name.endsWith('natives-x86_64.jar')) outputDir = file('libs/x86_64')
             if (jar.name.endsWith('natives-x86.jar')) outputDir = file('libs/x86')
             if (outputDir != null) {
@@ -104,8 +109,8 @@ task run(type: Exec) {
         path = "$System.env.ANDROID_HOME"
     }
 
-    def adb = path + '/platform-tools/adb'
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.andrzejn.chainrelations/com.andrzejn.chainrelations.AndroidLauncher'
+    final def adb = path + '/platform-tools/adb'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.andrzejn.tangler/com.andrzejn.tangler.AndroidLauncher'
 }
 
 eclipse.project.name = appName + '-android'

build.gradle

@@ -9,8 +9,9 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$gradleVersion"
-        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:$roboVMVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.wisepersist:gwt-gradle-plugin:$gwtPluginVersion"
+        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:$roboVMVersion"
         classpath "space.earlygrey:shapedrawer:$shapedrawerVersion"
         classpath "org.mini2Dx:universal-tween-engine:$tweenEngineVersion"
     }

gradle.properties

@@ -1,26 +1,49 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xms512M -Xmx1G -XX:MaxPermSize=1G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC -Dfile.encoding=UTF-8
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms512M -Xmx1G -XX:MaxPermSize=1G -XX:MaxMetaspaceSize=1G -XX:+UseParallelGC
 org.gradle.configureondemand=false
 org.gradle.unsafe.configuration-cache=false
 org.gradle.warning.mode=all
-gradleVersion=7.0.4
-kotlinVersion=1.6.20
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+
+gradleVersion=7.3.0
+kotlinVersion=1.7.0
 desugaringVersion=1.1.5
-ktxCollectionsVersion=1.10.0-rc2
-ktxTiledVersion=1.10.0-rc2
-ktxAssetsAsyncVersion=1.10.0-rc2
-ktxAssetsVersion=1.10.0-rc2
-ktxAsyncVersion=1.10.0-rc2
-ktxPreferencesVersion=1.10.0-rc2
-ktxFreetypeAsyncVersion=1.10.0-rc2
-ktxFreetypeVersion=1.10.0-rc2
-ktxGraphicsVersion=1.10.0-rc2
-ktxMathVersion=1.10.0-rc2
-ktxAppVersion=1.10.0-rc2
-ktxLogVersion=1.10.0-rc2
-gdxVersion=1.10.0
+ktxCollectionsVersion=1.11.0-rc3
+ktxTiledVersion=1.11.0-rc3
+ktxAssetsAsyncVersion=1.11.0-rc3
+ktxAssetsVersion=1.11.0-rc3
+ktxAsyncVersion=1.11.0-rc3
+ktxPreferencesVersion=1.11.0-rc3
+ktxFreetypeAsyncVersion=1.11.0-rc3
+ktxFreetypeVersion=1.11.0-rc3
+ktxGraphicsVersion=1.11.0-rc3
+ktxMathVersion=1.11.0-rc3
+ktxAppVersion=1.11.0-rc3
+ktxLogVersion=1.11.0-rc3
+gdxVersion=1.11.0
 gwtFrameworkVersion=2.8.2
 gwtPluginVersion=1.1.11
-shapedrawerVersion=2.5.0
+shapedrawerVersion=2.6.0
 tweenEngineVersion=6.3.3
 roboVMVersion=2.3.15