From 267081998e9c4e2572053ef89015f83f463cda94 Mon Sep 17 00:00:00 2001
From: Yuri Volkov <yvolk@yurivolkov.com>
Date: Sat, 14 Dec 2024 20:52:53 +0300
Subject: [PATCH] v.1.15.0 Update Android app to Android 15 and KorGe 5.4.0

---
 game2048-android/build.gradle                 | 34 ++++++-------------
 game2048-android/gradle.properties            |  6 ++--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/game2048-android/build.gradle b/game2048-android/build.gradle
index 12de79d..54f9a67 100644
--- a/game2048-android/build.gradle
+++ b/game2048-android/build.gradle
@@ -1,16 +1,12 @@
 buildscript {
     repositories {
-		google();
 		mavenCentral()
-	}
+        google();
+    }
     dependencies {
-		classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20' }
-
-}
+		classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23' }
 
-plugins {
-  id 'com.github.triplet.play' version '3.8.4'
 }
 
 repositories {
@@ -61,13 +57,13 @@ android {
             ]
         }
     }
-    compileSdkVersion 33
+    compileSdk 35
     defaultConfig {
         applicationId 'org.andstatus.game2048'
         minSdkVersion 24
-        targetSdkVersion 33
-        versionCode 42
-        versionName '1.14.4'
+        targetSdkVersion 35
+        versionCode 43
+        versionName '1.15.0'
 
         archivesBaseName = "game2048-android-$versionName"
     }
@@ -93,20 +89,10 @@ android {
     }
 }
 
-if (project.hasProperty("andstatus.google-play-publisher")
-        && new File(project.property("andstatus.google-play-publisher").toString() + ".gradle").exists()) {
-    apply from: project.property("andstatus.google-play-publisher") + ".gradle";
-} else {
-    play {
-        enabled = false
-    }
-}
-
 dependencies {
-    def korgeVersion = '5.0.6'
+    def korgeVersion = '5.4.0'
 
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23'
     implementation "com.soywiz.korge:korge-android:$korgeVersion"
     implementation "com.soywiz.korge:korge-core-android:$korgeVersion"
-//    implementation "com.soywiz.korge:korge-foundation-android:$korgeVersion"
 }
diff --git a/game2048-android/gradle.properties b/game2048-android/gradle.properties
index 7b63593..00bee79 100644
--- a/game2048-android/gradle.properties
+++ b/game2048-android/gradle.properties
@@ -1,4 +1,6 @@
 org.gradle.jvmargs=-Xmx1536m
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
-android.enableJetifier=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
\ No newline at end of file
+android.enableJetifier=false
+kotlin.mpp.enableGranularSourceSetsMetadata=true
diff --git a/game2048-android/gradle/wrapper/gradle-wrapper.properties b/game2048-android/gradle/wrapper/gradle-wrapper.properties
index a363877..171d876 100644
--- a/game2048-android/gradle/wrapper/gradle-wrapper.properties
+++ b/game2048-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists