From f728ade6ff9233374bb9003209d63692102af9cb Mon Sep 17 00:00:00 2001
From: adrian <adrianvictor@disroot.org>
Date: Thu, 22 Jan 2026 14:50:50 -0300
Subject: [PATCH] Update gradle and dependencies to compile with Java 21.

---
 app/build.gradle                         | 9 ++++++---
 app/src/main/AndroidManifest.xml         | 3 +--
 build.gradle                             | 4 ++--
 gradle.properties                        | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f8e64a05..2b63e370 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,10 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 32
+    namespace 'org.adrianvictor.geleia'
+
+    compileSdkVersion 34
 
     defaultConfig {
-        minSdkVersion 19
+        minSdk 19
         targetSdk 33
 
         versionCode 18
@@ -60,6 +62,7 @@ android {
         includeInApk = false
         includeInBundle = false
     }
+    namespace 'org.adrianvictor.geleia'
 }
 
 dependencies {
@@ -105,7 +108,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     annotationProcessor 'androidx.room:room-compiler:2.4.3'
     implementation 'androidx.room:room-runtime:2.4.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c86c24e6..2ad3febf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/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="org.adrianvictor.geleia">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/build.gradle b/build.gradle
index 445be090..b680cc8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
     }
@@ -19,4 +19,4 @@ allprojects {
             url 'https://jitpack.io'
         }
     }
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 030d17db..c98d3847 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,3 +3,6 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3d6dcd61..7db2b5af 100644
--- 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.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip