github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-04 00:13:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat!: API 31 support (#1410)

Browse Source 
* 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>
This commit is contained in:
Norman Breau 2022-04-17 07:43:45 -03:00 committed by GitHub
parent adcd9d9ff8
commit 5704ef9ea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/ci.yml vendored
View File

@ -38,10 +38,11 @@ jobs:
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- name: set up JDK 1.8 - name: set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
java-version: 1.8 distribution: 'adopt'
java-version: 11
- name: Environment Information - name: Environment Information
run: | run: |

8
framework/cdv-gradle-config-defaults.json
View File

@ -1,9 +1,9 @@
{ {
"MIN_SDK_VERSION": 22, "MIN_SDK_VERSION": 22,
"SDK_VERSION": 30, "SDK_VERSION": 31,
"GRADLE_VERSION": "7.1.1", "GRADLE_VERSION": "7.4.2",
"MIN_BUILD_TOOLS_VERSION": "30.0.3", "MIN_BUILD_TOOLS_VERSION": "31.0.0",
"AGP_VERSION": "4.2.2", "AGP_VERSION": "7.1.0",
"KOTLIN_VERSION": "1.5.21", "KOTLIN_VERSION": "1.5.21",
"ANDROIDX_APP_COMPAT_VERSION": "1.3.1", "ANDROIDX_APP_COMPAT_VERSION": "1.3.1",
"ANDROIDX_WEBKIT_VERSION": "1.4.0", "ANDROIDX_WEBKIT_VERSION": "1.4.0",

9
test/androidx/app/src/main/AndroidManifest.xml
View File

@ -29,7 +29,8 @@
<activity android:name=".EmbeddedWebViewActivity" <activity android:name=".EmbeddedWebViewActivity"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter > <intent-filter >
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -38,7 +39,8 @@
<activity android:name=".StandardActivity" <activity android:name=".StandardActivity"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter > <intent-filter >
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -47,7 +49,8 @@
<activity android:name=".TestActivity" <activity android:name=".TestActivity"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name" android:label="@string/app_name"
android:windowSoftInputMode="adjustPan"> android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter > <intent-filter >
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />