Merge pull request #1 from heikomat/feature/dependency_updates

dependency updates
heikomat · Mar 10, 2019 · 3e48fdb · 3e48fdb
2 parents 5e2b134 + ed3db24
commit 3e48fdb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -137,15 +137,15 @@ pipeline {
                   script {
                     // create gradlew file in the android project folder. This is needed by fastlane
                     docker
-                      .image('amsitoperations/ams-android-gradle')
+                      .image('thyrlian/android-sdk')
                       /**
                       * we run as root inside the docker container, otherwise this step
                       * will fail if additional android sdk components need to be
                       * installed. This makes some files in the android folder have
                       * incorrect ownership, but that will be corrected in the build step
                       */
                       .inside('--user=0:0') { c ->
-                      sh 'gradle wrapper';
+                      sh "sdkmanager 'build-tools;28.0.3' && cd '${env.WORKSPACE}/platforms/android' && gradle wrapper";
                     }
                   }
                 }
@@ -190,7 +190,7 @@ pipeline {
                       .image('bigoloo/gitlab-ci-android-fastlane')
                       // we run as root inside the docker container, otherwise the installed tools won't be accessible
                       .inside('--user=0:0') { c ->
-                        sh("""
+                        sh("""yes | sdkmanager --licenses &&
                           KEYSTORE_FILE="${env.WORKSPACE}/android.keystore" \
                           KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} \
                           SIGNING_KEY_ALIAS=${SIGNING_KEY_ALIAS} \

diff --git a/package.json b/package.json
@@ -15,45 +15,45 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "~7.0.0",
-    "@angular/core": "~7.0.0",
-    "@angular/forms": "~7.0.0",
-    "@angular/http": "~7.0.0",
-    "@angular/platform-browser": "~7.0.0",
-    "@angular/platform-browser-dynamic": "~7.0.0",
-    "@angular/router": "~7.0.0",
-    "@ionic-native/core": "5.0.0-beta.21",
-    "@ionic-native/splash-screen": "5.0.0-beta.21",
-    "@ionic-native/status-bar": "5.0.0-beta.21",
-    "@ionic/angular": "4.0.0-beta.17",
+    "@angular/common": "~7.2.8",
+    "@angular/core": "~7.2.8",
+    "@angular/forms": "~7.2.8",
+    "@angular/http": "~7.2.8",
+    "@angular/platform-browser": "~7.2.8",
+    "@angular/platform-browser-dynamic": "~7.2.8",
+    "@angular/router": "~7.2.8",
+    "@ionic-native/core": "5.2.0",
+    "@ionic-native/splash-screen": "5.2.0",
+    "@ionic-native/status-bar": "5.2.0",
+    "@ionic/angular": "4.1.1",
     "cordova": "^8.1.2",
     "cordova-ios": "4.5.5",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-ionic-keyboard": "^2.1.3",
-    "cordova-plugin-ionic-webview": "^2.3.1",
+    "cordova-plugin-ionic-webview": "^4.0.0",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-statusbar": "^2.4.2",
     "cordova-plugin-whitelist": "^1.3.3",
-    "core-js": "^2.5.4",
-    "rxjs": "~6.3.3",
-    "zone.js": "~0.8.26"
+    "core-js": "^2.6.5",
+    "rxjs": "~6.4.0",
+    "zone.js": "~0.8.29"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.10.0",
-    "@angular-devkit/build-angular": "~0.10.0",
-    "@angular-devkit/core": "~7.0.0",
-    "@angular-devkit/schematics": "~7.0.0",
-    "@angular/cli": "~7.0.0",
-    "@angular/compiler": "~7.0.0",
-    "@angular/compiler-cli": "~7.0.0",
-    "@angular/language-service": "~7.0.0",
-    "@ionic/angular-toolkit": "~1.2.0",
-    "@ionic/lab": "1.0.15",
+    "@angular-devkit/architect": "~0.13.5",
+    "@angular-devkit/build-angular": "~0.13.5",
+    "@angular-devkit/core": "~7.3.5",
+    "@angular-devkit/schematics": "~7.3.5",
+    "@angular/cli": "~7.3.5",
+    "@angular/compiler": "~7.2.8",
+    "@angular/compiler-cli": "~7.2.8",
+    "@angular/language-service": "~7.2.8",
+    "@ionic/angular-toolkit": "~1.4.0",
+    "@ionic/lab": "1.0.23",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~10.12.0",
     "codelyzer": "~4.5.0",
-    "ionic": "~4.5.0",
+    "ionic": "~4.11.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~3.0.0",
@@ -62,9 +62,9 @@
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.6"
+    "ts-node": "~8.0.3",
+    "tslint": "~5.13.1",
+    "typescript": "~3.2.4"
   },
   "description": "An Ionic project",
   "cordova": {