From f5fb57c56e4595f5b41868341ed4d5228ff76d24 Mon Sep 17 00:00:00 2001 From: Marius Lindvall Date: Sun, 13 Aug 2023 14:51:09 +0200 Subject: [PATCH] Update to API level 33 (Android 13) --- android/.idea/gradle.xml | 6 ++--- android/.idea/misc.xml | 10 +++++--- android/.idea/runConfigurations.xml | 12 ---------- android/app/build.gradle | 24 +++++++++---------- android/app/src/main/AndroidManifest.xml | 4 +++- .../info/varden/hauk/notify/Receiver.java | 2 +- .../info/varden/hauk/notify/ReopenIntent.java | 2 +- android/build.gradle | 2 +- android/gradle.properties | 3 +++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 android/.idea/runConfigurations.xml diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml index 674414f..305e2ab 100644 --- a/android/.idea/gradle.xml +++ b/android/.idea/gradle.xml @@ -4,17 +4,17 @@ diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml index 82fb904..541f4e0 100644 --- a/android/.idea/misc.xml +++ b/android/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 601cc2c..3006434 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" + compileSdkVersion 33 defaultConfig { applicationId "info.varden.hauk" - minSdkVersion 23 - targetSdkVersion 29 - versionCode 13 - versionName "1.6.1" + minSdkVersion 24 + targetSdkVersion 33 + versionCode 14 + versionName "1.6.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -17,14 +16,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + namespace 'info.varden.hauk' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.preference:preference:1.1.1' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.preference:preference:1.2.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2ff1504..9b7e159 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ package="info.varden.hauk"> + @@ -31,7 +32,8 @@ android:launchMode="singleTop" android:screenOrientation="portrait" android:windowSoftInputMode="stateHidden" - android:theme="@style/HomeTheme"> + android:theme="@style/HomeTheme" + android:exported="true"> diff --git a/android/app/src/main/java/info/varden/hauk/notify/Receiver.java b/android/app/src/main/java/info/varden/hauk/notify/Receiver.java index 5d55ab5..30d425d 100644 --- a/android/app/src/main/java/info/varden/hauk/notify/Receiver.java +++ b/android/app/src/main/java/info/varden/hauk/notify/Receiver.java @@ -56,6 +56,6 @@ PendingIntent toPending() throws InstantiationException, IllegalAccessException, // the intent. intent.putExtra(Constants.EXTRA_BROADCAST_RECEIVER_REGISTRY_INDEX, ReceiverDataRegistry.register(this.data)); - return PendingIntent.getBroadcast(this.ctx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); + return PendingIntent.getBroadcast(this.ctx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } } diff --git a/android/app/src/main/java/info/varden/hauk/notify/ReopenIntent.java b/android/app/src/main/java/info/varden/hauk/notify/ReopenIntent.java index 629dbfc..86f257f 100644 --- a/android/app/src/main/java/info/varden/hauk/notify/ReopenIntent.java +++ b/android/app/src/main/java/info/varden/hauk/notify/ReopenIntent.java @@ -32,6 +32,6 @@ final class ReopenIntent { PendingIntent toPending() { Intent intent = new Intent(this.ctx, this.activity); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - return PendingIntent.getActivity(this.ctx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); + return PendingIntent.getActivity(this.ctx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } } diff --git a/android/build.gradle b/android/build.gradle index 95a3996..66fbaea 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:8.1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle.properties b/android/gradle.properties index 199d16e..46309a3 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -17,4 +17,7 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index fff0b73..46b5de0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip