build: fix configs for android release builds

This commit is contained in:
Rainer Killinger
2021-11-22 17:50:36 +01:00
parent 5ffa699f57
commit b509dd2e2d
6 changed files with 3247 additions and 6298 deletions

View File

@@ -49,9 +49,3 @@ try {
} catch(Exception e) { } catch(Exception e) {
logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work") logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
} }
configurations.all {
resolutionStrategy {
force 'androidx.appcompat:appcompat:1.3.1'
}
}

View File

@@ -14,8 +14,8 @@ dependencies {
implementation project(':capacitor-keyboard') implementation project(':capacitor-keyboard')
implementation project(':capacitor-splash-screen') implementation project(':capacitor-splash-screen')
implementation project(':capacitor-status-bar') implementation project(':capacitor-status-bar')
implementation "androidx.legacy:legacy-support-v4:1.+" implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.appcompat:appcompat:1.+" implementation "androidx.appcompat:appcompat:1.3.1"
} }

View File

@@ -7,17 +7,17 @@ const config: CapacitorConfig = {
bundledWebRuntime: false, bundledWebRuntime: false,
cordova: { cordova: {
preferences: { preferences: {
AndroidXEnabled: 'true', 'AndroidXEnabled': 'true',
ScrollEnabled: 'false', 'ScrollEnabled': 'false',
'android-minSdkVersion': '22', 'android-minSdkVersion': '22',
BackupWebStorage: 'none', 'BackupWebStorage': 'none',
SplashMaintainAspectRatio: 'true', 'SplashMaintainAspectRatio': 'true',
FadeSplashScreenDuration: '300', 'FadeSplashScreenDuration': '300',
SplashShowOnlyFirstTime: 'false', 'SplashShowOnlyFirstTime': 'false',
SplashScreen: 'screen', 'SplashScreen': 'screen',
SplashScreenDelay: '3000' 'SplashScreenDelay': '3000',
} },
} },
}; };
export default config; export default config;

View File

@@ -31,5 +31,5 @@
<engine name="ios" spec="6.2.0" /> <engine name="ios" spec="6.2.0" />
<engine name="browser" spec="6.0.0" /> <engine name="browser" spec="6.0.0" />
<engine name="android" spec="9.0.0" /> <engine name="android" spec="9.0.0" />
<plugin name="cordova.plugins.diagnostic" spec="6.0.3" /> <plugin name="cordova.plugins.diagnostic" spec="6.1.0" />
</widget> </widget>

9505
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,7 +20,7 @@
"check-configuration": "openstapps-configuration", "check-configuration": "openstapps-configuration",
"e2e": "LANGUAGE=de-DE ng e2e --no-webdriver-update", "e2e": "LANGUAGE=de-DE ng e2e --no-webdriver-update",
"docker:build": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"npm install && npm run build\"", "docker:build": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"npm install && npm run build\"",
"docker:build:android": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"ionic capacitor build android --no-open && cd android && ./gradlew assembleDebug && cd ..\"", "docker:build:android": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"ionic capacitor build android --no-open && cd android && ./gradlew clean assembleDebug && cd ..\"",
"docker:run:android": "sudo docker run -v $PWD:/app --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -it registry.gitlab.com/openstapps/app bash -c \"ionic capacitor run android --livereload --external\"", "docker:run:android": "sudo docker run -v $PWD:/app --privileged -v /dev/bus/usb:/dev/bus/usb --net=host -it registry.gitlab.com/openstapps/app bash -c \"ionic capacitor run android --livereload --external\"",
"docker:enter": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash", "docker:enter": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash",
"docker:fresh": "sudo docker pull registry.gitlab.com/openstapps/app", "docker:fresh": "sudo docker pull registry.gitlab.com/openstapps/app",
@@ -76,11 +76,10 @@
"cordova-plugin-geolocation": "4.1.0", "cordova-plugin-geolocation": "4.1.0",
"cordova-plugin-network-information": "2.0.2", "cordova-plugin-network-information": "2.0.2",
"cordova-plugin-whitelist": "1.3.4", "cordova-plugin-whitelist": "1.3.4",
"cordova.plugins.diagnostic": "6.0.3", "cordova.plugins.diagnostic": "6.1.0",
"core-js": "2.6.5", "core-js": "2.6.5",
"deepmerge": "3.3.0", "deepmerge": "3.3.0",
"form-data": "2.5.0", "form-data": "2.5.0",
"swiper": "7.1.0",
"geojson": "0.5.0", "geojson": "0.5.0",
"leaflet": "1.7.1", "leaflet": "1.7.1",
"leaflet.markercluster": "1.5.1", "leaflet.markercluster": "1.5.1",
@@ -91,6 +90,7 @@
"ngx-moment": "5.0.0", "ngx-moment": "5.0.0",
"opening_hours": "3.7.0", "opening_hours": "3.7.0",
"rxjs": "6.6.3", "rxjs": "6.6.3",
"swiper": "7.1.0",
"tslib": "2.0.0", "tslib": "2.0.0",
"zone.js": "0.11.4" "zone.js": "0.11.4"
}, },
@@ -156,7 +156,7 @@
"GPS_REQUIRED": "true" "GPS_REQUIRED": "true"
}, },
"cordova.plugins.diagnostic": { "cordova.plugins.diagnostic": {
"ANDROIDX_VERSION": "1.+" "ANDROIDX_VERSION": "1.0.0"
} }
}, },
"platforms": [ "platforms": [