upgrade dependencies and gradle

diff --git a/build.gradle b/build.gradle
index ed846ef9ecd276fccf4cd108d0db9ce443052a1d..11e98376ca656b705d23b4870051fcb527e77ffe 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,12 @@ buildscript {
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
     }
 }
 
@@ -20,18 +19,14 @@ allprojects {
     version = 'alpha0.4'
     ext {
         appName = "CaveDroid"
-        gdxVersion = '1.9.10'
-        roboVMVersion = '2.3.7'
-        box2DLightsVersion = '1.4'
-        ashleyVersion = '1.7.0'
-        aiVersion = '1.8.0'
+        gdxVersion = '1.11.0'
         guavaVersion = '28.1'
+        daggerVersion = '2.40.1'
     }
 
     repositories {
         mavenLocal()
         mavenCentral()
-        jcenter()
         google()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
@@ -70,9 +65,9 @@ project(":core") {
     dependencies {
         api "com.badlogicgames.gdx:gdx:$gdxVersion"
         api "com.google.guava:guava:$guavaVersion-android"
-        api 'com.google.dagger:dagger:2.27'
-        implementation 'org.jetbrains:annotations:15.0'
+        api 'com.google.dagger:dagger:2.40.1'
+        implementation 'org.jetbrains:annotations:23.1.0'
         implementation "org.jetbrains.kotlin:kotlin-stdlib"
-        annotationProcessor 'com.google.dagger:dagger-compiler:2.27'
+        annotationProcessor 'com.google.dagger:dagger-compiler:2.40.1'
     }
 }
\ No newline at end of file

diff --git a/core/build.gradle b/core/build.gradle
index f17b1029a7e1f15f5ac5a79a78cfcde1c1986525..af764b0ba4b3910ad1d47869e3c5f080721f364e 100644 (file)
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -2,11 +2,10 @@ plugins {
     id "org.jetbrains.kotlin.jvm"
     id "java"
     id "idea"
-    id "net.ltgt.apt" version "0.21"
 }
 
 sourceCompatibility = 1.8
 
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceSets.main.java.srcDirs = [ "src/" ]
 
-sourceSets.main.java.srcDirs = [ "src/" ]
\ No newline at end of file
+java.targetCompatibility = JavaVersion.VERSION_1_8
\ No newline at end of file

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index ca603176453f1ac7e219c6d825c11dfeb1f8f528..594f8cc64d16df74b1c1dca1b7f032ad1a6b1be7 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
@@ -400,10 +400,10 @@ public class GameInput {
         }
     }
 
-    public void scrolled(int amount) {
+    public void scrolled(float amountX, float amountY) {
         switch (mMainConfig.getGameUiWindow()) {
             case NONE:
-                mPlayer.slot += amount;
+                mPlayer.slot += (int) amountY;
                 if (mPlayer.slot < 0) {
                     mPlayer.slot = 8;
                 }
@@ -412,7 +412,7 @@ public class GameInput {
                 }
                 break;
             case CREATIVE_INVENTORY:
-                mCreativeScroll += amount;
+                mCreativeScroll += (int) amountY;
                 if (mCreativeScroll < 0) {
                     mCreativeScroll = 0;
                 }

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java b/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
index 51cc897f4a1f891e5cf044325e4c09db572e55ff..5d86b2e5c5db5e5db2a5aaffc69711e085658490 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInputProcessor.java
@@ -152,8 +152,8 @@ public class GameInputProcessor extends InputAdapter {
     }
 
     @Override
-    public boolean scrolled(int amount) {
-        mGameInput.scrolled(amount);
+    public boolean scrolled(float amountX, float amountY) {
+        mGameInput.scrolled(amountX, amountY);
         return false;
     }
 }

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
index b59e977c5045c05195f72e870c2c3c0b82d69335..a4b19ab9b847ed8027f21860c81c1bab5e85e993 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
@@ -101,7 +101,7 @@ public abstract class Renderer implements InputProcessor {
     }
 
     @Override
-    public boolean scrolled(int amount) {
+    public boolean scrolled(float amountX, float amountY) {
         return false;
     }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 374585553662a55219dc2f375458e4cb4db35db0..074840a77c7b4f26dab9d75901819ee4850704af 100644 (file)
--- 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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME