From 783f846761778856e7e354c508f735de4a3f909c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 28 Dec 2023 23:06:36 +0200
Subject: [PATCH] Remove source compatibility to java 8, in preparation for
 Gradle 8.5 upgrade See #10740

---
 android/AndroidManifest.xml | 4 ++--
 android/build.gradle.kts    | 3 +--
 core/build.gradle.kts       | 5 -----
 desktop/build.gradle.kts    | 4 ----
 ios/build.gradle.kts        | 4 ----
 server/build.gradle.kts     | 4 ----
 tests/build.gradle.kts      | 9 ---------
 7 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index cbe1819596..1e49d1bff2 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.unciv.app" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk/>
 
@@ -10,6 +9,7 @@
     <!-- See https://developer.android.com/training/tv/start/start -->
     <uses-feature android:name="android.software.leanback" android:required="false" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature android:glEsVersion="0x00020000" android:required="false" />
 
     <!--
         Known Lint warnings:
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 6907660add..963a2a665f 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -27,6 +27,7 @@ android {
         resources.excludes += "DebugProbesKt.bin"
     }
     defaultConfig {
+        namespace = "com.unciv.app"
         applicationId = "com.unciv.app"
         minSdk = 21
         targetSdk = 33 // See #5044
@@ -65,9 +66,7 @@ android {
         disable += "MissingTranslation"   // see res/values/strings.xml
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
-
         isCoreLibraryDesugaringEnabled = true
     }
     androidResources {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3e31d7c03e..472e79f177 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,11 +3,6 @@ plugins {
     id("kotlin")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
-
 sourceSets {
     main {
         java.srcDir("src/")
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index f7d02b2880..bbdaa634f3 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
     id("kotlin")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
 sourceSets {
     main {
         java.srcDir("src/")
diff --git a/ios/build.gradle.kts b/ios/build.gradle.kts
index ea3f9aa5dd..1349fb05cd 100644
--- a/ios/build.gradle.kts
+++ b/ios/build.gradle.kts
@@ -7,10 +7,6 @@ sourceSets {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
     compileJava {
         options.encoding = "UTF-8"
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 709873ef39..bee6aad4e1 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -4,10 +4,6 @@ plugins {
     id("kotlin")
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
 sourceSets {
     main {
         java.srcDir("src/")
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
index 7a815548ab..62831771cf 100644
--- a/tests/build.gradle.kts
+++ b/tests/build.gradle.kts
@@ -1,15 +1,6 @@
 import com.unciv.build.BuildConfig
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
-plugins {
-    id("java")
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 tasks {
     test {
         workingDir = file("../android/assets")