MOBILE-4123 config: Upgrade Android target SDK to 31

main
Dani Palou 2022-08-23 15:17:15 +02:00 committed by Pau Ferrer Ocaña
parent ff2f342905
commit 92aa91e591
4 changed files with 1765 additions and 1744 deletions

View File

@ -1,6 +1,8 @@
os: linux os: linux
dist: trusty dist: trusty
node_js: 14 node_js: 14
jdk:
- oraclejdk11
git: git:
depth: 3 depth: 3
@ -51,7 +53,10 @@ jobs:
- npm --version - npm --version
- nvm --version - nvm --version
- npm ci - npm ci
- export JAVA_HOME_COPY=$JAVA_HOME
- export JAVA_HOME=/usr/lib/jvm/java-8-oracle
- yes | sdkmanager "build-tools;30.0.3" - yes | sdkmanager "build-tools;30.0.3"
- export JAVA_HOME=$JAVA_HOME_COPY
addons: addons:
apt: apt:
packages: packages:

View File

@ -40,7 +40,7 @@
<preference name="SplashMaintainAspectRatio" value="true" /> <preference name="SplashMaintainAspectRatio" value="true" />
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="android-minSdkVersion" value="22" /> <preference name="android-minSdkVersion" value="22" />
<preference name="android-targetSdkVersion" value="30" /> <preference name="android-targetSdkVersion" value="31" />
<preference name="AndroidPersistentFileLocation" value="Compatibility" /> <preference name="AndroidPersistentFileLocation" value="Compatibility" />
<preference name="AndroidInsecureFileModeEnabled" value="true" /> <preference name="AndroidInsecureFileModeEnabled" value="true" />
<preference name="CustomURLSchemePluginClearsAndroidIntent" value="true" /> <preference name="CustomURLSchemePluginClearsAndroidIntent" value="true" />
@ -64,7 +64,7 @@
<resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" /> <resource-file src="resources/android/icon/drawable-xhdpi-smallicon.png" target="app/src/main/res/mipmap-xhdpi/smallicon.png" />
<resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" /> <resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
<edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']"> <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" /> <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:exported="true" />
</edit-config> </edit-config>
<edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application"> <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">
<application android:largeHeap="true" android:networkSecurityConfig="@xml/network_security_config" /> <application android:largeHeap="true" android:networkSecurityConfig="@xml/network_security_config" />
@ -196,21 +196,6 @@
<param name="android-package" value="com.adobe.phonegap.push.PushPlugin" /> <param name="android-package" value="com.adobe.phonegap.push.PushPlugin" />
</feature> </feature>
</config-file> </config-file>
<config-file parent="/manifest/application" target="AndroidManifest.xml">
<activity android:exported="true" android:name="com.adobe.phonegap.push.PushHandlerActivity" android:permission="${applicationId}.permission.PushHandlerActivity" />
<receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler" />
<receiver android:name="com.adobe.phonegap.push.PushDismissedHandler" />
<service android:name="com.adobe.phonegap.push.FCMService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
<service android:name="com.adobe.phonegap.push.PushInstanceIDListenerService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>
</config-file>
<config-file parent="/*" target="res/xml/config.xml"> <config-file parent="/*" target="res/xml/config.xml">
<feature name="Media"> <feature name="Media">
<param name="android-package" value="org.apache.cordova.media.AudioHandler" /> <param name="android-package" value="org.apache.cordova.media.AudioHandler" />

3478
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -80,7 +80,7 @@
"@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3", "@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
"@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.4", "@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.4",
"@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1", "@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
"@moodlehq/phonegap-plugin-push": "2.0.0-moodle.4", "@moodlehq/phonegap-plugin-push": "4.0.0-moodle.1",
"@ngx-translate/core": "^13.0.0", "@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0", "@ngx-translate/http-loader": "^6.0.0",
"@types/chart.js": "^2.9.31", "@types/chart.js": "^2.9.31",
@ -232,9 +232,8 @@
"@moodlehq/cordova-plugin-zip": {}, "@moodlehq/cordova-plugin-zip": {},
"cordova-sqlite-storage": {}, "cordova-sqlite-storage": {},
"@moodlehq/phonegap-plugin-push": { "@moodlehq/phonegap-plugin-push": {
"ANDROID_SUPPORT_V13_VERSION": "28.0.0", "ANDROIDX_CORE_VERSION": "1.6.+",
"FCM_VERSION": "18.+", "FCM_VERSION": "23.+"
"IOS_FIREBASE_MESSAGING_VERSION": "~> 6.32.2"
}, },
"com-darryncampbell-cordova-plugin-intent": {}, "com-darryncampbell-cordova-plugin-intent": {},
"nl.kingsquare.cordova.background-audio": {}, "nl.kingsquare.cordova.background-audio": {},