gradle: various automatic updates

mwarning · Aug 1, 2024 · bc80d38 · bc80d38
1 parent 3dd9af6
commit bc80d38
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,6 +43,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'app.trigger'
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,23 +1,27 @@
 <?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="app.trigger">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- For WiFi access -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Read WiFi SSID (ACCESS_COARSE_LOCATION was sufficient before Android 10) -->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
     <!-- For Bluetooth access -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" android:minSdkVersion="31" />
 
     <!-- For Bluetooth Low Energy (BLE) access -->
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <!-- Check if communication is possible -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- Scan Qr-Code -->
+    <!-- Scan QR-Code -->
     <uses-permission android:name="android.permission.CAMERA"/>
     <!-- For MQTT -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -33,8 +37,6 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -43,32 +45,24 @@
         </activity>
         <activity
             android:name=".SetupActivity"
-            android:label="@string/action_edit"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:label="@string/action_edit" />
         <activity
             android:name=".AboutActivity"
-            android:label="@string/action_about"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:label="@string/action_about" />
         <activity
             android:name=".QRShowActivity"
             android:exported="true"
-            android:label="@string/action_export"
-            android:screenOrientation="portrait" />
+            android:label="@string/action_export" />
         <activity
             android:name=".QRScanActivity"
-            android:label="@string/action_import"
-            android:screenOrientation="portrait" />
+            android:label="@string/action_import" />
         <activity
             android:name=".BackupActivity"
             android:label="@string/action_backup"
-            android:configChanges="orientation|screenSize"
-            android:screenOrientation="portrait" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".ssh.SshKeyPairActivity"
             android:label="@string/manage_ssh_key_pair"
-            android:screenOrientation="portrait"
             android:exported="false">
             <intent-filter>
                 <action android:name=".ssh.KeyPairActivity" />
@@ -78,7 +72,6 @@
         <activity
             android:name=".mqtt.MqttClientKeyPairActivity"
             android:label="Manage Client Private Key"
-            android:screenOrientation="portrait"
             android:exported="false">
             <intent-filter>
                 <action android:name=".mqtt.MqttPrivateClientKeyActivity" />
@@ -88,7 +81,6 @@
         <activity
             android:name=".https.CertificateActivity"
             android:label="@string/manage_tls_certificate"
-            android:screenOrientation="portrait"
             android:exported="false">
             <intent-filter>
                 <action android:name=".https.CertificateActivity" />
@@ -98,7 +90,6 @@
         <activity
             android:name=".ImageActivity"
             android:label="Select Image"
-            android:screenOrientation="portrait"
             android:exported="false">
             <intent-filter>
                 <action android:name=".ImageActivity" />

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.5.1' apply false
+    id 'com.android.library' version '8.5.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Apr 12 08:38:00 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME