From 61ee2f37b26722cf27b6235c9ce52fd43b7d9e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20L=C3=A4nge?= <tobias.laenge@kit.edu>
Date: Thu, 18 Jan 2024 14:17:20 +0100
Subject: [PATCH] Upgrade gradle to 8.1.2 with Upgrade Assistant

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

diff --git a/app/build.gradle b/app/build.gradle
index 8666ad2..b4d382d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
+    namespace 'org.secuso.privacyfriendlypaindiary'
+    lint {
         abortOnError false
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 642617a..33545a4 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.secuso.privacyfriendlypaindiary">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <supports-screens
         android:anyDensity="true"
diff --git a/build.gradle b/build.gradle
index 554fb79..646b43a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index d5f83e7..6908c68 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,7 @@
 # org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx1536m
\ No newline at end of file
+org.gradle.jvmargs=-Xmx1536m
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e589..da1db5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists