From e0206f92abdfd7e2c3b7c68fa7569a76772d1692 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 25 Nov 2022 07:02:50 +0700
Subject: [PATCH] chore(android): Update Target SDK Version to 31

---
 android/KMAPro/kMAPro/build.gradle                          | 4 ++--
 android/KMAPro/kMAPro/src/main/AndroidManifest.xml          | 6 +++++-
 android/KMEA/app/build.gradle                               | 6 +++---
 android/KMEA/app/src/main/AndroidManifest.xml               | 6 ++++++
 android/Samples/KMSample1/app/build.gradle                  | 2 +-
 android/Samples/KMSample1/app/src/main/AndroidManifest.xml  | 1 +
 android/Samples/KMSample2/app/build.gradle                  | 2 +-
 android/Samples/KMSample2/app/src/main/AndroidManifest.xml  | 2 ++
 android/Tests/KeyboardHarness/app/build.gradle              | 2 +-
 .../Tests/KeyboardHarness/app/src/main/AndroidManifest.xml  | 1 +
 oem/firstvoices/android/app/build.gradle                    | 2 +-
 oem/firstvoices/android/app/src/main/AndroidManifest.xml    | 2 ++
 12 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 0a7bc9e321..bd243b2b5f 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -10,7 +10,7 @@ ext.rootPath = '../../'
 apply from: "$rootPath/version.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.2"
 
     // Don't compress kmp files so they can be copied via AssetManager
@@ -25,7 +25,7 @@ android {
     defaultConfig {
         applicationId "com.tavultesoft.kmapro"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         //println "===DUMPING PROPERTIES==="
         //dumpProperties(project) // Use this to dump all external properties for debugging TeamCity integration
diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index f6be7118ca..6acb4d9da1 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
     android:usesCleartextTraffic="true"
     android:theme="@style/AppTheme"
     android:supportsRtl="true">
-    <receiver android:name=".NetworkStateReceiver">
+    <receiver android:name=".NetworkStateReceiver"
+      android:exported="true">
       <intent-filter>
         <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
       </intent-filter>
@@ -39,6 +40,7 @@
 
     <service
       android:name="com.keyman.android.SystemKeyboard"
+      android:exported="true"
       android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
       android:permission="android.permission.BIND_INPUT_METHOD">
       <intent-filter>
@@ -56,6 +58,7 @@
 
     <activity
       android:name=".SplashScreenActivity"
+      android:exported="true"
       android:label="@string/app_name"
       android:theme="@style/AppTheme.BrandedLaunch">
       <intent-filter>
@@ -66,6 +69,7 @@
     </activity>
     <activity
       android:name=".MainActivity"
+      android:exported="true"
       android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
       android:label="@string/app_name"
       android:launchMode="singleTask">
diff --git a/android/KMEA/app/build.gradle b/android/KMEA/app/build.gradle
index a38c35ee92..f1fb5b5ad9 100644
--- a/android/KMEA/app/build.gradle
+++ b/android/KMEA/app/build.gradle
@@ -7,12 +7,12 @@ ext.rootPath = '../../'
 apply from: "$rootPath/version.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.2"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         // VERSION_CODE and VERSION_NAME from version.gradle but Gradle removes them for libraries
         buildConfigField "String", "KEYMAN_ENGINE_VERSION_NAME", "\""+VERSION_NAME+"\""
@@ -69,7 +69,7 @@ dependencies {
 
     // Robolectric
     testImplementation 'androidx.test:core:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'org.robolectric:robolectric:4.5.1'
 
     // Generate QR Codes
diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index e03facc3d5..4b73d68ed2 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
 
         <activity
             android:name="com.tavultesoft.kmea.KeyboardPickerActivity"
+            android:exported="true"
             android:launchMode="singleTask"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:label="@string/app_name"
@@ -28,24 +29,28 @@
         </activity>
         <activity
             android:name="com.tavultesoft.kmea.KeyboardInfoActivity"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Light.Dialog" >
         </activity>
         <activity
             android:name="com.tavultesoft.kmea.KMKeyboardDownloaderActivity"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:label=""
             android:theme="@style/AppTheme.Light.Dialog">
         </activity>
         <activity
             android:name="com.tavultesoft.kmea.ModelPickerActivity"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Light.Dialog">
         </activity>
         <activity
             android:name="com.tavultesoft.kmea.ModelInfoActivity"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Light.Dialog" >
@@ -55,6 +60,7 @@
         Ref https://stackoverflow.com/questions/40650643/timed-out-waiting-on-iinputcontextcallback-with-custom-keyboard-on-android -->
         <activity
             android:name="com.tavultesoft.kmea.KMHelpFileActivity"
+            android:exported="true"
             android:process=":KMHelpFileActivity"
             android:launchMode="singleTask"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
diff --git a/android/Samples/KMSample1/app/build.gradle b/android/Samples/KMSample1/app/build.gradle
index 0dd367e662..1907ccd20c 100644
--- a/android/Samples/KMSample1/app/build.gradle
+++ b/android/Samples/KMSample1/app/build.gradle
@@ -19,7 +19,7 @@ android {
     defaultConfig {
         applicationId "com.keyman.kmsample1"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
diff --git a/android/Samples/KMSample1/app/src/main/AndroidManifest.xml b/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
index 32a71eb3fc..664edec8b5 100644
--- a/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
+++ b/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize" >
             <intent-filter>
diff --git a/android/Samples/KMSample2/app/build.gradle b/android/Samples/KMSample2/app/build.gradle
index 86a16d44e3..f88ba19732 100644
--- a/android/Samples/KMSample2/app/build.gradle
+++ b/android/Samples/KMSample2/app/build.gradle
@@ -19,7 +19,7 @@ android {
     defaultConfig {
         applicationId "com.keyman.kmsample2"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
diff --git a/android/Samples/KMSample2/app/src/main/AndroidManifest.xml b/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
index eaad01654f..d6cdab3776 100644
--- a/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
+++ b/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
 
         <service
             android:name="com.keyman.kmsample2.SystemKeyboard"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:permission="android.permission.BIND_INPUT_METHOD" >
             <intent-filter>
@@ -23,6 +24,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize" >
             <intent-filter>
diff --git a/android/Tests/KeyboardHarness/app/build.gradle b/android/Tests/KeyboardHarness/app/build.gradle
index eea3258e55..89029f39db 100644
--- a/android/Tests/KeyboardHarness/app/build.gradle
+++ b/android/Tests/KeyboardHarness/app/build.gradle
@@ -21,7 +21,7 @@ android {
     defaultConfig {
         applicationId "com.keyman.android.tests.keyboardHarness"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         // VERSION_CODE and VERSION_NAME from version.gradle
         versionCode VERSION_CODE as Integer
diff --git a/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml b/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
index 8ca7121ff2..c741732523 100644
--- a/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
+++ b/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize" >
             <intent-filter>
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index 6216f2d336..29577e4e0f 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -19,7 +19,7 @@ android {
     defaultConfig {
         applicationId "com.firstvoices.keyboards"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         // VERSION_CODE and VERSION_NAME from version.gradle
         versionCode VERSION_CODE as Integer
diff --git a/oem/firstvoices/android/app/src/main/AndroidManifest.xml b/oem/firstvoices/android/app/src/main/AndroidManifest.xml
index 18f4773bc0..9647785494 100644
--- a/oem/firstvoices/android/app/src/main/AndroidManifest.xml
+++ b/oem/firstvoices/android/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
 
         <service
             android:name="com.firstvoices.keyboards.SystemKeyboard"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
             android:permission="android.permission.BIND_INPUT_METHOD" >
             <intent-filter>
@@ -42,6 +43,7 @@
 
         <activity
             android:name="com.firstvoices.keyboards.MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:configChanges="orientation|screenSize">
             <intent-filter>