From 2d499703d7350e1a253101b22a2dcfdbf2376f1c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 24 Jul 2023 10:41:02 +0300
Subject: [PATCH] Resolved #9840 - targetSdk set to 33

Due to the upcoming Google Play deadline (see https://support.google.com/googleplay/android-developer/answer/11926878)
We're upgrading the target SDK and build tools for Unciv.

What this means for you, is that you need to download BOTH the new Android SDK AND the new build tools to compile to Android
If you're only doing Desktop development, this will not affect you

In Android Studio:
- Double-click shift (for search)
- "SDK manager"
- Go to SDK platforms tab, select Android 13 (Tiramisu) - this will lead to an SDK download
- Go to the SDK Tools tab
- Click 'show package details' at bottom-right
- Click 33.0.2 - this will lead to a Build Tools download
---
 android/build.gradle.kts            | 9 +++++----
 docs/Developers/Building-Locally.md | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index cfd212cfdc..910590c3e7 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -1,5 +1,6 @@
-import com.unciv.build.BuildConfig
+
 import com.unciv.build.AndroidImagePacker
+import com.unciv.build.BuildConfig
 import java.util.Properties
 
 plugins {
@@ -8,7 +9,7 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     sourceSets {
         getByName("main").apply {
             manifest.srcFile("AndroidManifest.xml")
@@ -28,7 +29,7 @@ android {
     defaultConfig {
         applicationId = "com.unciv.app"
         minSdk = 21
-        targetSdk = 32 // See #5044
+        targetSdk = 33 // See #5044
         versionCode = BuildConfig.appCodeNumber
         versionName = BuildConfig.appVersion
 
@@ -73,7 +74,7 @@ android {
         // Don't add local save files and fonts to release, obviously
         ignoreAssetsPattern = "!SaveFiles:!fonts:!maps:!music:!mods"
     }
-    buildToolsVersion = "32.0.0"
+    buildToolsVersion = "33.0.2"
 }
 
 task("texturePacker") {
diff --git a/docs/Developers/Building-Locally.md b/docs/Developers/Building-Locally.md
index 1ed310d4d7..da424f5661 100644
--- a/docs/Developers/Building-Locally.md
+++ b/docs/Developers/Building-Locally.md
@@ -20,7 +20,7 @@ By the end of this guide, you will have Unciv running locally from code, so you
         ![image](/docs/assets/Android_SDK_Platforms.png)
         - Click "SDK Tools"
         - Select "Show Package Details" in the bottom right
-        - Choose version 32.0.0 under "Android SDK Build-Tools"
+        - Choose version 33.0.2 under "Android SDK Build-Tools"
         ![image](/docs/assets/Android_SDK_Tools.png)
         - Click "Apply"
         - Restart Android Studio
@@ -100,7 +100,7 @@ You can (and in some cases _should_) run and even debug the unit tests locally.
 
 ### Linting
 
-Detekt checks for code smells and other linting issues. 
+Detekt checks for code smells and other linting issues.
 To generate Detekt reports:
 
 - Download [detekt-cli](https://github.com/detekt/detekt/releases/latest) (the zip file) and unzip it