Merge pull request #375 from serlo/ios

ios version release

app.json

@@ -3,17 +3,22 @@
     "name": "Serlo ABC",
     "slug": "serlo-abc",
     "privacy": "public",
-    "sdkVersion": "32.0.0",
     "platforms": ["ios", "android"],
-    "icon": "./appIcon.png",
+    "icon": "./appIcon-ios.png",
     "packagerOpts": {
       "nonPersistent": true
     },
     "updates": {
       "fallbackToCacheTimeout": 0
     },
+    "ios": {
+      "bundleIdentifier": "org.serlo.abc",
+      "icon": "./appIcon-ios.png",
+      "supportsTablet": true
+    },
     "android": {
       "package": "org.serlo.abc",
+      "icon": "./appIcon-android.png",
       "permissions": [
         "READ_EXTERNAL_STORAGE",
         "READ_INTERNAL_STORAGE",
@@ -23,8 +28,7 @@
         "com.android.launcher.permission.INSTALL_SHORTCUT",
         "com.htc.launcher.permission.READ_SETTINGS",
         "om.htc.launcher.permission.UPDATE_SHORTCUT"
-      ],
-      "versionCode": 5
+      ]
     },
     "assetBundlePatterns": [
       "src/assets/images/*",

package.json

@@ -1,15 +1,16 @@
 {
   "name": "@serlo/serlo-abc",
   "version": "1.2.2-0",
+  "versionCode": 5,
   "main": "node_modules/expo/AppEntry.js",
   "repository": "serlo/serlo-abc",
   "scripts": {
     "build": "expo start",
     "build:android": "expo build:android",
     "build:ios": "expo build:ios",
     "build:status": "expo build:status",
-    "deploy:development": "npm-run-all --serial expo:config:development expo:login:travis expo:publish",
-    "deploy:master": "npm-run-all --serial expo:config:master expo:login:travis expo:publish",
+    "deploy:development": "npm-run-all --serial expo:config:development expo:publish",
+    "deploy:master": "npm-run-all --serial expo:config:master expo:publish",
     "generate": "npm-run-all generate:*",
     "generate:ids": "node scripts/generate-ids",
     "generate:sounds": "ts-node scripts/generate-sounds",
@@ -21,7 +22,6 @@
     "expo:config:development": "ts-node scripts/generate-app-config development",
     "expo:config:master": "ts-node scripts/generate-app-config master",
     "expo:login": "expo login",
-    "expo:login:travis": "yarn expo:login --non-interactive --username $EXP_USERNAME --password $EXP_PASSWORD",
     "expo:publish": "expo publish --config app.travis.json",
     "start": "expo start",
     "android": "expo android",
@@ -58,6 +58,7 @@
     "@types/ramda": "^0.26.0",
     "@types/react-native": "^0.57.0",
     "@types/react-test-renderer": "^16.0.0",
+    "@types/semver": "^5.0.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.0.0",
     "babel-preset-expo": "^5.0.0",
@@ -77,6 +78,7 @@
     "react-dom": "16.5.0",
     "react-native-svg": "^8.0.0",
     "react-test-renderer": "^16.5.0",
+    "semver": "^5.0.0",
     "ts-jest": "^23.0.0",
     "ts-node": "^7.0.0",
     "tslint": "^5.0.0",

scripts/generate-app-config.ts

@@ -2,19 +2,33 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { mergeDeepRight } from 'ramda';
+import * as semver from 'semver';
 
 const config = require('../app.json');
-const { version } = require('../package.json');
+const {
+  version,
+  versionCode,
+  dependencies: { expo }
+} = require('../package.json');
 
 const isDev = process.argv[2] === 'development';
+const expoVersion = expo.replace('^', '');
+const sdkVersion = `${semver.major(expoVersion)}.0.0`;
 
 const travisConfig = mergeDeepRight(config, {
   expo: {
     name: `${config.expo.name}${isDev ? ' Nightly' : ''}`,
     slug: `${config.expo.slug}${isDev ? '-development' : ''}`,
+    sdkVersion,
     version,
     packagerOpts: {
       nonPersistent: true
+    },
+    ios: {
+      buildNumber: version
+    },
+    android: {
+      versionCode
     }
   }
 });

yarn.lock

@@ -1640,6 +1640,11 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
+"@types/semver@^5.0.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
+
 "@types/uuid-js@^0.7.1":
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/@types/uuid-js/-/uuid-js-0.7.1.tgz#8f58e32a9e7d3fccd434ce02deafeab013068e77"
@@ -12310,7 +12315,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==