Skip to content

Commit bc80d38

Browse files
committed
gradle: various automatic updates
1 parent 3dd9af6 commit bc80d38

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ android {
4343
buildFeatures {
4444
viewBinding true
4545
}
46+
namespace 'app.trigger'
4647
}
4748

4849
dependencies {

app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="app.trigger">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<!-- For WiFi access -->
76
<uses-permission android:name="android.permission.INTERNET" />
87
<!-- Read WiFi SSID (ACCESS_COARSE_LOCATION was sufficient before Android 10) -->
98
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
9+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
10+
1011
<!-- For Bluetooth access -->
1112
<uses-permission android:name="android.permission.BLUETOOTH" />
12-
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
13+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" android:minSdkVersion="31" />
1314

1415
<!-- For Bluetooth Low Energy (BLE) access -->
1516
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false"/>
17+
<uses-feature
18+
android:name="android.hardware.camera"
19+
android:required="false" />
1620

1721
<!-- Check if communication is possible -->
1822
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
1923
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
20-
<!-- Scan Qr-Code -->
24+
<!-- Scan QR-Code -->
2125
<uses-permission android:name="android.permission.CAMERA"/>
2226
<!-- For MQTT -->
2327
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -33,8 +37,6 @@
3337
android:theme="@style/AppTheme" >
3438
<activity
3539
android:name=".MainActivity"
36-
android:label="@string/app_name"
37-
android:screenOrientation="portrait"
3840
android:exported="true">
3941
<intent-filter>
4042
<action android:name="android.intent.action.MAIN" />
@@ -43,32 +45,24 @@
4345
</activity>
4446
<activity
4547
android:name=".SetupActivity"
46-
android:label="@string/action_edit"
47-
android:screenOrientation="portrait" >
48-
</activity>
48+
android:label="@string/action_edit" />
4949
<activity
5050
android:name=".AboutActivity"
51-
android:label="@string/action_about"
52-
android:screenOrientation="portrait" >
53-
</activity>
51+
android:label="@string/action_about" />
5452
<activity
5553
android:name=".QRShowActivity"
5654
android:exported="true"
57-
android:label="@string/action_export"
58-
android:screenOrientation="portrait" />
55+
android:label="@string/action_export" />
5956
<activity
6057
android:name=".QRScanActivity"
61-
android:label="@string/action_import"
62-
android:screenOrientation="portrait" />
58+
android:label="@string/action_import" />
6359
<activity
6460
android:name=".BackupActivity"
6561
android:label="@string/action_backup"
66-
android:configChanges="orientation|screenSize"
67-
android:screenOrientation="portrait" />
62+
android:configChanges="orientation|screenSize" />
6863
<activity
6964
android:name=".ssh.SshKeyPairActivity"
7065
android:label="@string/manage_ssh_key_pair"
71-
android:screenOrientation="portrait"
7266
android:exported="false">
7367
<intent-filter>
7468
<action android:name=".ssh.KeyPairActivity" />
@@ -78,7 +72,6 @@
7872
<activity
7973
android:name=".mqtt.MqttClientKeyPairActivity"
8074
android:label="Manage Client Private Key"
81-
android:screenOrientation="portrait"
8275
android:exported="false">
8376
<intent-filter>
8477
<action android:name=".mqtt.MqttPrivateClientKeyActivity" />
@@ -88,7 +81,6 @@
8881
<activity
8982
android:name=".https.CertificateActivity"
9083
android:label="@string/manage_tls_certificate"
91-
android:screenOrientation="portrait"
9284
android:exported="false">
9385
<intent-filter>
9486
<action android:name=".https.CertificateActivity" />
@@ -98,7 +90,6 @@
9890
<activity
9991
android:name=".ImageActivity"
10092
android:label="Select Image"
101-
android:screenOrientation="portrait"
10293
android:exported="false">
10394
<intent-filter>
10495
<action android:name=".ImageActivity" />

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '7.4.2' apply false
4-
id 'com.android.library' version '7.4.2' apply false
3+
id 'com.android.application' version '8.5.1' apply false
4+
id 'com.android.library' version '8.5.1' apply false
55
id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
66
}
77

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ kotlin.code.style=official
2020
# Enables namespacing of each library's R class so that its R class includes only the
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true
23+
android.nonTransitiveRClass=true
24+
android.defaults.buildfeatures.buildconfig=true
25+
android.nonFinalResIds=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Apr 12 08:38:00 CEST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)