From cc77086162fb597d6c7f686d3a30212aeb2ba7c8 Mon Sep 17 00:00:00 2001
From: Hpsaturn <hpsaturn@gmail.com>
Date: Wed, 28 Feb 2024 12:19:28 -0500
Subject: [PATCH] gradle plugin migrations

---
 app/build.gradle                 | 3 ++-
 app/src/main/AndroidManifest.xml | 3 +--
 gradle.properties                | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 40388bd..838abfa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,7 @@ android {
     }
 
     ndkVersion "21.3.6528147"
+    namespace 'hpsaturn.pollutionreporter'
 
 }
 
@@ -55,7 +56,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.google.android.material:material:1.6.1'
-    implementation "androidx.preference:preference:1.2.0"
+    implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation 'com.jakewharton:butterknife:10.2.3'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 273c6b9..6f024f5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="hpsaturn.pollutionreporter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/gradle.properties b/gradle.properties
index 33833c6..e014be4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,10 @@ withoutDevice=false
 env="prod"
 ####################################################
 
-org.gradle.jvmargs=-Xmx3096m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3096m -Dfile.encoding=UTF-8 \
+--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
 mCompileSdkVersion=33
 mMinSdkVersion=23
@@ -17,3 +20,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 canairio.signing=/opt/.signing/canairio/canairio
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false