mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-22 17:42:57 +00:00
build: fix configs for android release builds
This commit is contained in:
@@ -49,9 +49,3 @@ try {
|
||||
} catch(Exception e) {
|
||||
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'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ dependencies {
|
||||
implementation project(':capacitor-keyboard')
|
||||
implementation project(':capacitor-splash-screen')
|
||||
implementation project(':capacitor-status-bar')
|
||||
implementation "androidx.legacy:legacy-support-v4:1.+"
|
||||
implementation "androidx.appcompat:appcompat:1.+"
|
||||
implementation "androidx.legacy:legacy-support-v4:1.0.0"
|
||||
implementation "androidx.appcompat:appcompat:1.3.1"
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -7,17 +7,17 @@ const config: CapacitorConfig = {
|
||||
bundledWebRuntime: false,
|
||||
cordova: {
|
||||
preferences: {
|
||||
AndroidXEnabled: 'true',
|
||||
ScrollEnabled: 'false',
|
||||
'AndroidXEnabled': 'true',
|
||||
'ScrollEnabled': 'false',
|
||||
'android-minSdkVersion': '22',
|
||||
BackupWebStorage: 'none',
|
||||
SplashMaintainAspectRatio: 'true',
|
||||
FadeSplashScreenDuration: '300',
|
||||
SplashShowOnlyFirstTime: 'false',
|
||||
SplashScreen: 'screen',
|
||||
SplashScreenDelay: '3000'
|
||||
}
|
||||
}
|
||||
'BackupWebStorage': 'none',
|
||||
'SplashMaintainAspectRatio': 'true',
|
||||
'FadeSplashScreenDuration': '300',
|
||||
'SplashShowOnlyFirstTime': 'false',
|
||||
'SplashScreen': 'screen',
|
||||
'SplashScreenDelay': '3000',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export default config;
|
||||
|
||||
@@ -31,5 +31,5 @@
|
||||
<engine name="ios" spec="6.2.0" />
|
||||
<engine name="browser" spec="6.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>
|
||||
|
||||
9505
package-lock.json
generated
9505
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -20,7 +20,7 @@
|
||||
"check-configuration": "openstapps-configuration",
|
||||
"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: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: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",
|
||||
@@ -76,11 +76,10 @@
|
||||
"cordova-plugin-geolocation": "4.1.0",
|
||||
"cordova-plugin-network-information": "2.0.2",
|
||||
"cordova-plugin-whitelist": "1.3.4",
|
||||
"cordova.plugins.diagnostic": "6.0.3",
|
||||
"cordova.plugins.diagnostic": "6.1.0",
|
||||
"core-js": "2.6.5",
|
||||
"deepmerge": "3.3.0",
|
||||
"form-data": "2.5.0",
|
||||
"swiper": "7.1.0",
|
||||
"geojson": "0.5.0",
|
||||
"leaflet": "1.7.1",
|
||||
"leaflet.markercluster": "1.5.1",
|
||||
@@ -91,6 +90,7 @@
|
||||
"ngx-moment": "5.0.0",
|
||||
"opening_hours": "3.7.0",
|
||||
"rxjs": "6.6.3",
|
||||
"swiper": "7.1.0",
|
||||
"tslib": "2.0.0",
|
||||
"zone.js": "0.11.4"
|
||||
},
|
||||
@@ -156,7 +156,7 @@
|
||||
"GPS_REQUIRED": "true"
|
||||
},
|
||||
"cordova.plugins.diagnostic": {
|
||||
"ANDROIDX_VERSION": "1.+"
|
||||
"ANDROIDX_VERSION": "1.0.0"
|
||||
}
|
||||
},
|
||||
"platforms": [
|
||||
|
||||
Reference in New Issue
Block a user