From 5704ef9ea5b34e520b42e2dfab0de38cd597acc8 Mon Sep 17 00:00:00 2001
From: Norman Breau <norman@nbsolutions.ca>
Date: Sun, 17 Apr 2022 07:43:45 -0300
Subject: [PATCH] feat!: API 31 support (#1410)

* feat(breaking): API 31 support
* ci: bump actions/setup-java@3 w/ java 11
* ci: set setup-java distribution to adopt

Co-authored-by: Erisu <erisu@apache.org>
---
 .github/workflows/ci.yml                       | 7 ++++---
 framework/cdv-gradle-config-defaults.json      | 8 ++++----
 test/androidx/app/src/main/AndroidManifest.xml | 9 ++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aeecdbd8..04e9b7a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,10 +38,11 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: 11
 
       - name: Environment Information
         run: |
diff --git a/framework/cdv-gradle-config-defaults.json b/framework/cdv-gradle-config-defaults.json
index bf5caf2e..af0cfcec 100644
--- a/framework/cdv-gradle-config-defaults.json
+++ b/framework/cdv-gradle-config-defaults.json
@@ -1,9 +1,9 @@
 {
     "MIN_SDK_VERSION": 22,
-    "SDK_VERSION": 30,
-    "GRADLE_VERSION": "7.1.1",
-    "MIN_BUILD_TOOLS_VERSION": "30.0.3",
-    "AGP_VERSION": "4.2.2",
+    "SDK_VERSION": 31,
+    "GRADLE_VERSION": "7.4.2",
+    "MIN_BUILD_TOOLS_VERSION": "31.0.0",
+    "AGP_VERSION": "7.1.0",
     "KOTLIN_VERSION": "1.5.21",
     "ANDROIDX_APP_COMPAT_VERSION": "1.3.1",
     "ANDROIDX_WEBKIT_VERSION": "1.4.0",
diff --git a/test/androidx/app/src/main/AndroidManifest.xml b/test/androidx/app/src/main/AndroidManifest.xml
index 9d404fe6..a6ca5c41 100644
--- a/test/androidx/app/src/main/AndroidManifest.xml
+++ b/test/androidx/app/src/main/AndroidManifest.xml
@@ -29,7 +29,8 @@
         <activity android:name=".EmbeddedWebViewActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -38,7 +39,8 @@
         <activity android:name=".StandardActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -47,7 +49,8 @@
         <activity android:name=".TestActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/app_name"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />