From a8927c121a1b7a926033d79e964efcdcb0cad905 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Wed, 17 May 2023 21:04:57 +0300
Subject: [PATCH] SDL: updated Android target version to API 33, you will need
 Java 17 because of the new Gradle

---
 changeAppSettings.sh                           |  1 -
 project/AndroidManifestTemplate.xml            |  1 -
 project/app/build-template.gradle              |  7 ++++---
 project/build.gradle                           | 18 +++---------------
 project/gradle.properties                      |  2 --
 .../gradle/wrapper/gradle-wrapper.properties   |  6 +++---
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 535d9fb6d..ebc2b5893 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -880,7 +880,6 @@ fi
 
 echo Patching project/AndroidManifest.xml
 cat $ANDROID_MANIFEST_TEMPLATE | \
-	sed "s/package=.*/package=\"$AppFullName\"/" | \
 	sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
 	sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
 	sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" | \
diff --git a/project/AndroidManifestTemplate.xml b/project/AndroidManifestTemplate.xml
index 787c99498..0c15054a1 100644
--- a/project/AndroidManifestTemplate.xml
+++ b/project/AndroidManifestTemplate.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.package.name"
 	  android:versionCode="100"
 	  android:versionName="1.0.0"
 	  android:installLocation="auto"
diff --git a/project/app/build-template.gradle b/project/app/build-template.gradle
index 888f5d514..ef6e1f016 100644
--- a/project/app/build-template.gradle
+++ b/project/app/build-template.gradle
@@ -3,13 +3,14 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    namespace 'net.olofson.ballfield'
+    compileSdk 33
     ndkVersion "23.1.7779620"
 
     defaultConfig {
         applicationId "net.olofson.ballfield"
         minSdk 19
-        targetSdk 31
+        targetSdk 33
     }
 
     buildTypes {
@@ -35,5 +36,5 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.gms:play-services-games:21.0.0' // ==GOOGLEPLAYGAMESERVICES==
+    implementation 'com.google.android.gms:play-services-games:23.1.0' // ==GOOGLEPLAYGAMESERVICES==
 }
diff --git a/project/build.gradle b/project/build.gradle
index 7cbb66447..1454d1b95 100644
--- a/project/build.gradle
+++ b/project/build.gradle
@@ -1,17 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.0.3"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+plugins {
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
 }
\ No newline at end of file
diff --git a/project/gradle.properties b/project/gradle.properties
index 3c5031eb7..3e927b11e 100644
--- a/project/gradle.properties
+++ b/project/gradle.properties
@@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # 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
diff --git a/project/gradle/wrapper/gradle-wrapper.properties b/project/gradle/wrapper/gradle-wrapper.properties
index a6de4ae08..8988457fd 100644
--- a/project/gradle/wrapper/gradle-wrapper.properties
+++ b/project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 27 22:44:43 EET 2021
+#Wed May 17 18:24:03 EEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists