From e23fe7a058df2a80cbe316448b8f6232db391b1a Mon Sep 17 00:00:00 2001
From: Kaarel Kaljurand <kaljurand@gmail.com>
Date: Sun, 21 May 2023 22:19:11 +0200
Subject: [PATCH] minSdkVersion 24 + update dependencies

---
 .github/workflows/android.yml                          | 10 +++++-----
 app/build.gradle                                       |  8 ++++----
 app/src/main/AndroidManifest.xml                       |  8 +++++++-
 .../ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt  |  7 ++++++-
 build.gradle                                           |  2 +-
 gradle.properties                                      |  3 +++
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 109f100b..5c2c83d8 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -18,15 +18,15 @@ jobs:
     steps:
 
     - name: Checkout repository and submodules
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: recursive
 
-    - name: Set up Java 11
-      uses: actions/setup-java@v2
+    - name: Set up Java 17
+      uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: '11'
+        distribution: 'temurin'
+        java-version: '17'
 
     - name: Build with Gradle
       run: ./gradlew build
diff --git a/app/build.gradle b/app/build.gradle
index 2a8e6837..e650e959 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     // implementation 'androidx.activity:activity:1.4.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     // Added only to resolve https://issuetracker.google.com/issues/242384116
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
 }
@@ -27,10 +27,10 @@ android {
     // API level 21: Jetpack Compose
     defaultConfig {
         applicationId 'ee.ioc.phon.android.speak'
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 33
-        versionCode 1901
-        versionName '1.9.01'
+        versionCode 1906
+        versionName '1.9.06'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs 'en', 'et'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e5aae095..6c03189b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,8 +25,14 @@
     In Android versions before v6.0 (~35% of the users as of 2017-06-18)
     the permission is granted at install time, which is not nice, but this user base will
     disappear over time.
+    Doc: "READ_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+.
+    If you need to query or interact with MediaStore or media files on the shared storage,
+    you should instead use one or more new storage permissions: READ_MEDIA_IMAGES, READ_MEDIA_VIDEO or READ_MEDIA_AUDIO."
+    TODO: test importing rewrite rules (which are plain text) on Android 13+.
     -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <!-- Permission SET_ALARM.
     Used to set the alarm clock if the transcription resolves to an AlarmClock intent.
diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt
index 98c9ddc6..7a52e449 100644
--- a/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt
+++ b/app/src/main/java/ee/ioc/phon/android/speak/demo/VoiceSearchDemo.kt
@@ -56,7 +56,12 @@ class VoiceSearchDemo : AbstractRecognizerDemoActivity() {
         // in the voice search system. We have to keep the bundle separate,
         // because it becomes immutable once it enters the PendingIntent.
         val queryIntent = Intent(Intent.ACTION_SEARCH)
-        val pending = PendingIntent.getActivity(this, 0, queryIntent, PendingIntent.FLAG_ONE_SHOT)
+        val pending = PendingIntent.getActivity(
+            this,
+            0,
+            queryIntent,
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+        )
 
         // Now set up the bundle that will be inserted into the pending intent
         // when it is time to do the search. We always build it here (even if empty)
diff --git a/build.gradle b/build.gradle
index cf8882ce..5270a503 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 89ff1912..7941f415 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2560m
 org.gradle.unsafe.configuration-cache=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9255cc20..a63625b4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip