Merge branch 'fix/android-version' into 'master'

fix(android): use api level 28

See merge request papers/airgap/airgap-vault!134

.gitlab-ci.yml

@@ -56,14 +56,14 @@ build_android:
     - sed -i -e "s/version=\"0.0.0\"/version=\"$VERSION\"/g" config.xml
     - docker build -f build/android/Dockerfile -t $IMAGE_TAG_ANDROID_CURRENT --build-arg BUILD_NR="$CI_PIPELINE_ID" --build-arg VERSION="$VERSION" .
     - docker run --name $CI_PIPELINE_ID $IMAGE_TAG_ANDROID_CURRENT echo "container ran."
-    - docker cp $CI_PIPELINE_ID:/app/android-release-unsigned.apk android-release-unsigned-$CI_PIPELINE_ID.apk
-    - docker cp $CI_PIPELINE_ID:/app/android-debug.apk android-debug-$CI_PIPELINE_ID.apk
+    - docker cp $CI_PIPELINE_ID:/app/android-release-unsigned.apk airgap-vault-release-unsigned-$CI_PIPELINE_ID.apk
+    - docker cp $CI_PIPELINE_ID:/app/android-debug.apk airgap-vault-debug-$CI_PIPELINE_ID.apk
   after_script:
     - docker rm -f $CI_PIPELINE_ID || true
   artifacts:
     paths:
-      - android-release-unsigned-$CI_PIPELINE_ID.apk
-      - android-debug-$CI_PIPELINE_ID.apk
+      - airgap-vault-release-unsigned-$CI_PIPELINE_ID.apk
+      - airgap-vault-debug-$CI_PIPELINE_ID.apk
 
 build_ios:
   stage: native_build

build/android/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -y && apt-get install -y \
     libcairo2-dev 
 
 # android build tools version
-RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter build-tools-26.0.2,android-27"]
+RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter build-tools-28.0.3,android-28"]
 
 # create app directory
 RUN mkdir /app

config.xml

@@ -114,11 +114,11 @@
         <variable name="PHOTOLIBRARY_ADD_USAGE_DESCRIPTION" value="This app needs write-access to photo library" />
         <variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="This app needs read/write-access photo library access" />
     </plugin>
-    <plugin name="cordova-android-support-gradle-release" spec="1.4.7">
-        <variable name="ANDROID_SUPPORT_VERSION" value="26.1.0" />
+    <plugin name="cordova-android-support-gradle-release" spec="3.0.1">
+        <variable name="ANDROID_SUPPORT_VERSION" value="28.+" />
     </plugin>
-    <plugin name="cordova-plugin-camera-preview" spec="git+https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git">
-        <variable name="ANDROID_SUPPORT_LIBRARY_VERSION" value="26.1.0" />
+    <plugin name="cordova-plugin-camera-preview" spec="0.11.1">
+        <variable name="ANDROID_SUPPORT_LIBRARY_VERSION" value="28.+" />
     </plugin>
     <plugin name="cordova-plugin-statusbar" spec="2.4.2" />
     <plugin name="ionic-plugin-deeplinks" spec="https://github.com/airgap-it/ionic-plugin-deeplinks#cordova-ios-v5.0.0-fix">
@@ -152,5 +152,5 @@
     <plugin name="cordova-plugin-qrscanner" spec="3.0.1" />
     <plugin name="cordova-plugin-airgap-security-utils" spec="0.3.6" />
     <engine name="ios" spec="5.0.1" />
-    <engine name="android" spec="7.1.4" />
+    <engine name="android" spec="8.1.0" />
 </widget>