From 14014af0056c8dd65b45038c465e5c372283bc3a Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Thu, 27 Jul 2023 06:08:30 -0300
Subject: [PATCH] chore: update android gradle plugin to 8.0.2

---
 app/build.gradle  | 10 ++++++----
 build.gradle      |  4 ++--
 gradle.properties |  3 +++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ceb31fcc5..081a64224 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,17 +80,19 @@ android {
     buildFeatures {
         viewBinding true
         compose true
+        aidl true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.8"
     }
-    // Set both the Java and Kotlin compilers to target Java 8.
+    // Configure the build-logic plugins to target JDK 17
+    // This matches the JDK used to build the project, and is not related to what is running on device.
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn']
     }
     lint {
diff --git a/build.gradle b/build.gradle
index 7e072f6ed..bf859fca7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
@@ -28,7 +28,7 @@ buildscript {
         }
 
         // protobuf plugin - docs here https://github.com/google/protobuf-gradle-plugin
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.19'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
 
         // for unit testing https://github.com/bjoernQ/unmock-plugin
         classpath 'com.github.bjoernq:unmockplugin:0.7.9'
diff --git a/gradle.properties b/gradle.properties
index eb7f44e16..f5ea6f07b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,3 +18,6 @@ org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false