From 14e3b21a66efdaf199726fb3eab6fcc26618c949 Mon Sep 17 00:00:00 2001
From: xivilay <xivilay@gmail.com>
Date: Fri, 12 Jan 2024 00:51:35 +0100
Subject: [PATCH] chore: update gradle and targets for android build

---
 android/app/build.gradle                      | 23 ++++++++++---------
 android/app/src/main/AndroidManifest.xml      |  6 ++---
 android/build.gradle                          |  2 +-
 android/gradle.properties                     |  3 +++
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 5 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 android/gradle.properties

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 53e90ad..bb51f20 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     externalNativeBuild {
         cmake {
             path "../../CMakeLists.txt"
@@ -17,21 +17,14 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError true        // true by default
-        checkAllWarnings false
-        checkReleaseBuilds false
-        ignoreWarnings true       // false by default
-        quiet false               // false by default
-    }
 
     defaultConfig {
         applicationId "dev.xivilay.scaleremapper"
-        minSdkVersion    29
-        targetSdkVersion 29
+        minSdkVersion    31
+        targetSdkVersion 31
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_PLATFORM=android-29", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF"
+                arguments "-DANDROID_PLATFORM=android-31", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF"
             }
         }
         ndk {
@@ -78,5 +71,13 @@ android {
 
     dependencies {
     }
+    namespace 'dev.xivilay.scaleremapper'
+    lint {
+        abortOnError true        // true by default
+        checkAllWarnings false
+        checkReleaseBuilds false
+        ignoreWarnings true       // false by default
+        quiet false               // false by default
+    }
 
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2cba02f..6d5c9e6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0.0"
-          package="dev.xivilay.scaleremapper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0.0">
   <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"
                     android:xlargeScreens="true"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
   <uses-permission android:name="android.permission.BLUETOOTH"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -15,7 +15,7 @@
   <uses-feature android:glEsVersion="0x00030000" android:required="true"/>
   <application android:label="@string/app_name" android:name="com.rmsl.juce.JuceApp" android:icon="@drawable/icon" android:hardwareAccelerated="false">
     <activity android:name="com.rmsl.juce.JuceActivity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation|screenSize"
-              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true">
+              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/android/build.gradle b/android/build.gradle
index f157948..55f2a42 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:7.5.1'
+       classpath 'com.android.tools.build:gradle:8.1.0'
    }
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 0000000..f82049a
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,3 @@
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 702c227..0b9cb95 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
\ No newline at end of file