From b27e4c85eeefd94d0e54182b04d6406ddf6b4181 Mon Sep 17 00:00:00 2001
From: Hugh Daschbach <hugh@ccss.com>
Date: Thu, 16 Nov 2023 19:53:40 -0800
Subject: [PATCH] Adjustments for Gradle 8 build environment.

Gradle 8 requires JDK version 11.
Update build class path to pick up new Gradle version.
---
 app/build.gradle.kts | 6 +++---
 build.gradle.kts     | 2 +-
 gradle.properties    | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7b65b10..32ade53 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,8 +36,8 @@ androidGitVersion {
 
 android {
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   namespace = "audio.funkwhale.ffa"
@@ -47,7 +47,7 @@ android {
   }
 
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
   }
 
   buildFeatures {
diff --git a/build.gradle.kts b/build.gradle.kts
index 1c94f39..12fbc25 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
   val navVersion: String by extra
 
   dependencies {
-    classpath("com.android.tools.build:gradle:7.4.2")
+    classpath("com.android.tools.build:gradle:8.1.2")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
     classpath("com.github.bjoernq:unmockplugin:0.7.9")
     classpath("com.github.ben-manes:gradle-versions-plugin:0.46.0")
diff --git a/gradle.properties b/gradle.properties
index 09b3991..6e9d484 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,3 +4,6 @@ kotlin.code.style=official
 
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false