Skip to content

Commit 33a0816

Browse files
authored
Merge pull request #239 from MaximBelov/cordova-android-11-fix-demo
Update demo for compatibility with cordova-android 11
2 parents 010a327 + 731367d commit 33a0816

13 files changed

+5084
-9324
lines changed

demo/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ log.txt
1818
npm-debug.log*
1919

2020
/.idea
21+
/.angular
2122
/.ionic
2223
/.sass-cache
2324
/.sourcemaps

demo/angular.json

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,6 @@
9090
"browserTarget": "app:build"
9191
}
9292
},
93-
"test": {
94-
"builder": "@angular-devkit/build-angular:karma",
95-
"options": {
96-
"main": "src/test.ts",
97-
"polyfills": "src/polyfills.ts",
98-
"tsConfig": "tsconfig.spec.json",
99-
"karmaConfig": "karma.conf.js",
100-
"styles": [],
101-
"scripts": [],
102-
"assets": [
103-
{
104-
"glob": "favicon.ico",
105-
"input": "src/",
106-
"output": "/"
107-
},
108-
{
109-
"glob": "**/*",
110-
"input": "src/assets",
111-
"output": "/assets"
112-
}
113-
]
114-
},
115-
"configurations": {
116-
"ci": {
117-
"progress": false,
118-
"watch": false
119-
}
120-
}
121-
},
12293
"lint": {
12394
"builder": "@angular-eslint/builder:lint",
12495
"options": {
@@ -144,7 +115,7 @@
144115
}
145116
},
146117
"ionic-cordova-build": {
147-
"builder": "@ionic/angular-toolkit:cordova-build",
118+
"builder": "@ionic/cordova-builders:cordova-build",
148119
"options": {
149120
"browserTarget": "app:build"
150121
},
@@ -155,7 +126,7 @@
155126
}
156127
},
157128
"ionic-cordova-serve": {
158-
"builder": "@ionic/angular-toolkit:cordova-serve",
129+
"builder": "@ionic/cordova-builders:cordova-serve",
159130
"options": {
160131
"cordovaBuildTarget": "app:ionic-cordova-build",
161132
"devServerTarget": "app:serve"

demo/config.xml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="io.ionic.starter" version="0.0.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>Upload Demo</name>
44
<description>An awesome Ionic/Cordova app.</description>
55
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
@@ -12,7 +12,7 @@
1212
<allow-intent href="mailto:*" />
1313
<allow-intent href="geo:*" />
1414
<preference name="android-minSdkVersion" value="22" />
15-
<preference name="android-targetSdkVersion" value="31" />
15+
<preference name="android-targetSdkVersion" value="32" />
1616
<preference name="ScrollEnabled" value="false" />
1717
<preference name="BackupWebStorage" value="none" />
1818
<preference name="SplashMaintainAspectRatio" value="true" />
@@ -37,18 +37,7 @@
3737
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
3838
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
3939
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
40-
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
41-
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
42-
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
43-
<splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
44-
<splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
45-
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
46-
<splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
47-
<splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
48-
<splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
49-
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
50-
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
51-
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
40+
<preference name="AndroidWindowSplashScreenAnimatedIcon" value="resources/android/icon/drawable-xxxhdpi-icon.png" />
5241
</platform>
5342
<platform name="ios">
5443
<allow-intent href="itms:*" />
@@ -104,11 +93,4 @@
10493
<splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
10594
<splash height="828" src="resources/ios/splash/Default-Landscape-1792h~iphone.png" width="1792" />
10695
</platform>
107-
<plugin name="cordova-plugin-whitelist" spec="1.3.3" />
108-
<plugin name="cordova-plugin-statusbar" spec="2.4.2" />
109-
<plugin name="cordova-plugin-device" spec="2.0.2" />
110-
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
111-
<plugin name="cordova-plugin-ionic-webview" spec="^4.0.0" />
112-
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
113-
<allow-navigation href="http://localhost:8100" sessionid="7c348973" />
11496
</widget>

demo/e2e/protractor.conf.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

demo/e2e/src/app.e2e-spec.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

demo/e2e/src/app.po.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

demo/e2e/tsconfig.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

demo/karma.conf.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)