From 71e4beb5e67bc5f0e8030dd03b1d1955dfbe485c Mon Sep 17 00:00:00 2001
From: Robbie Nesmith <bobberto1995@gmail.com>
Date: Thu, 10 Oct 2024 07:00:32 -0500
Subject: [PATCH 1/4] Update SDK to 34

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4dd960f..c98a0c5 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33 // 13.0
+    compileSdk 34 // 13.0
     buildToolsVersion "33.0.0"
     project.archivesBaseName = "blokish-3.5" // sync with Manifest
 
     defaultConfig {
         applicationId "org.scoutant.blokish"
         minSdkVersion 28 // Android 9
-        targetSdkVersion 32  // Android 12.1
+        targetSdkVersion 34  // Android 14
         versionCode 23
         versionName "3.5"
         project.ext.set("archivesBaseName", "blokish-" + defaultConfig.versionName)

From 0e87950bb9f650ccd847a8bbeed2d351b7a802e9 Mon Sep 17 00:00:00 2001
From: Robbie Nesmith <bobberto1995@gmail.com>
Date: Thu, 10 Oct 2024 07:01:37 -0500
Subject: [PATCH 2/4] Remove deprecated buildToolsVersion

---
 app/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c98a0c5..b7d9a2a 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdk 34 // 13.0
-    buildToolsVersion "33.0.0"
     project.archivesBaseName = "blokish-3.5" // sync with Manifest
 
     defaultConfig {

From 904a21a7170b54ba8a5dc6193224cc8928ac8bc4 Mon Sep 17 00:00:00 2001
From: Robbie Nesmith <bobberto1995@gmail.com>
Date: Thu, 10 Oct 2024 07:14:58 -0500
Subject: [PATCH 3/4] Use Upgrade Assistant to upgrade gradle version

---
 build.gradle                             | 2 +-
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index e2f52cc..3fa6c71 100755
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 3cb99a0..29b2d12 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,5 +15,8 @@
 #Fri May 27 16:34:25 CEST 2016
 
 # android.useDeprecatedNdk=true
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac7fa3e..00086b0 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

From 96a3cc578244a4043e6de2c749031bf786311d84 Mon Sep 17 00:00:00 2001
From: Robbie Nesmith <bobberto1995@gmail.com>
Date: Thu, 10 Oct 2024 07:17:50 -0500
Subject: [PATCH 4/4] Update dependencies

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7d9a2a..debabb6 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,9 +21,9 @@ android {
     dependencies {
         testImplementation 'junit:junit:4.13.2'
 
-        implementation 'com.google.android.material:material:1.7.0'
+        implementation 'com.google.android.material:material:1.12.0'
         implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-        implementation 'androidx.appcompat:appcompat:1.5.1'
+        implementation 'androidx.appcompat:appcompat:1.7.0'
         implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 //        implementation 'androidx.preference:preference:1.1.0' // TODO migrate preferences