From: fredboy <fredboy@protonmail.com>
Date: Sun, 14 Apr 2024 17:01:12 +0000 (+0700)
Subject: Upgrade project
X-Git-Tag: alpha0.4~3
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=e52c9c04fb2d016a9178a038a6027c4cf3b9387f;p=cavedroid.git

Upgrade project
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 47eaf7a..233083d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -9,6 +9,7 @@
             android:theme="@style/GdxTheme" tools:ignore="GoogleAppIndexingWarning"
             android:fullBackupContent="@xml/backup_descriptor">
         <activity
+                android:exported="true"
                 android:name="ru.deadsoftware.cavedroid.AndroidLauncher"
                 android:label="@string/app_name"
                 android:screenOrientation="sensorLandscape"
diff --git a/android/build.gradle b/android/build.gradle
index a5ed087..cb9d71a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,6 +1,10 @@
+plugins {
+    id "kotlin-android"
+}
+
 android {
-    buildToolsVersion "28.0.3"
-    compileSdkVersion 29
+    namespace "ru.deadsoftware.cavedroid"
+    compileSdkVersion 34
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -16,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility 11
+        targetCompatibility 11
     }
     packagingOptions {
         exclude 'META-INF/robovm/ios/robovm.xml'
@@ -25,7 +29,7 @@ android {
     defaultConfig {
         applicationId "ru.deadsoftware.cavedroid"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 10
         versionName "alpha0.4"
     }
diff --git a/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java b/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java
index fcf0831..3019a9e 100644
--- a/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java
+++ b/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java
@@ -4,13 +4,13 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
+import com.badlogic.gdx.backends.android.BuildConfig;
 
 public class AndroidLauncher extends AndroidApplication {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-        config.hideStatusBar = true;
         config.useImmersiveMode = true;
         String gameFolder = "";
         try {
diff --git a/build.gradle b/build.gradle
index 11e9837..684f015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
     }
 }
@@ -19,7 +19,7 @@ allprojects {
     version = 'alpha0.4'
     ext {
         appName = "CaveDroid"
-        gdxVersion = '1.11.0'
+        gdxVersion = '1.12.0'
         guavaVersion = '28.1'
         daggerVersion = '2.40.1'
     }
@@ -30,6 +30,7 @@ allprojects {
         google()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+        maven { url "https://jitpack.io" }
     }
 }
 
@@ -38,7 +39,7 @@ project(":desktop") {
 
     dependencies {
         implementation project(":core")
-        api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+        api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
     }
 }
@@ -51,7 +52,6 @@ project(":android") {
     dependencies {
         implementation project(":core")
         api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
-        natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
         natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
         natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
         natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
diff --git a/core/build.gradle b/core/build.gradle
index af764b0..2c25846 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,11 +1,11 @@
 plugins {
     id "org.jetbrains.kotlin.jvm"
-    id "java"
+    id "kotlin"
     id "idea"
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 sourceSets.main.java.srcDirs = [ "src/" ]
 
-java.targetCompatibility = JavaVersion.VERSION_1_8
\ No newline at end of file
+java.targetCompatibility = JavaVersion.VERSION_11
\ No newline at end of file
diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
index a4b19ab..290f7ce 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
@@ -105,4 +105,8 @@ public abstract class Renderer implements InputProcessor {
         return false;
     }
 
+    @Override
+    public boolean touchCancelled(int i, int i1, int i2, int i3) {
+        return false;
+    }
 }
diff --git a/desktop/build.gradle b/desktop/build.gradle
index b3a6693..88ef144 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -1,6 +1,6 @@
-apply plugin: "java"
+apply plugin: "kotlin"
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 sourceSets.main.java.srcDirs = [ "src/" ]
 sourceSets.main.resources.srcDirs = ["../android/assets"]
 
@@ -34,6 +34,7 @@ task debug(dependsOn: classes, type: JavaExec) {
 }
 
 task dist(type: Jar) {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes 'Main-Class': project.mainClassName
     }
diff --git a/desktop/gradle/wrapper/gradle-wrapper.properties b/desktop/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d884b3f
--- /dev/null
+++ b/desktop/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Apr 13 17:22:59 NOVT 2024
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index 2e9ae42..62b554b 100644
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -1,25 +1,25 @@
 package ru.deadsoftware.cavedroid.desktop;
 
 import com.badlogic.gdx.Files;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 import ru.deadsoftware.cavedroid.CaveGame;
 
 class DesktopLauncher {
 	public static void main (String[] arg) {
-		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
-		config.addIcon("icons/icon256.png", Files.FileType.Internal);
-		config.addIcon("icons/icon128.png", Files.FileType.Internal);
-		config.foregroundFPS = 144;
-        config.title = "CaveDroid";
-		config.width = 960;
-		config.height = 540;
-		config.forceExit = false;
+		Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
+		config.setWindowIcon(Files.FileType.Internal, "icons/icon256.png", "icons/icon128.png");
+		config.setForegroundFPS(144);
+        config.setTitle("CaveDroid");
+		config.setWindowedMode(960, 540);
 
 		boolean touch = false;
 		for (String anArg : arg) {
-			if (anArg.equals("--touch")) touch = true;
+            if (anArg.equals("--touch")) {
+                touch = true;
+                break;
+            }
 		}
-        new LwjglApplication(new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch), config);
+        new Lwjgl3Application(new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch), config);
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 339fa15..b7f66d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms128m -Xmx1500m
 org.gradle.configureondemand=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 074840a..b349727 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 26 22:30:23 NOVT 2019
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME