Merge pull request flexn-io#529 from pavjacko/fix/flexn-io#528-sdk-fi…

…led-merges fix: correct sdk field merges
trungpolit · Jun 25, 2020 · 9db9f87 · 9db9f87
2 parents 9f605ba + d4b63a6
commit 9db9f87
Show file tree

Hide file tree

Showing 24 changed files with 180 additions and 102 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,16 +6,18 @@ env:
     - PROJECT_NAME=renative
 jobs:
   include:
-    - name: "HelloWorld iOS: E2E"
+    - name: "RNV Android: Integration"
+      dist: trusty
       language: node_js
       cache:
         directories:
           - node_modules
       node_js: 13.13.0
-      os: osx
-      osx_image: xcode11.3
-      install: skip
-      script: ci/run_osx_ios.sh
+      install:
+        - rm -rf ~/.yarn/bin/yarn || true && npm uninstall --global yarn; npm install --global yarn; yarn --version
+        - yarn bootstrap
+        - cd packages/rnv
+      script: yarn test:integration
     - name: "RNV Android: Build"
       language: android
       dist: trusty
@@ -61,31 +63,6 @@ jobs:
         - yarn bootstrap
         - cd packages/rnv
       script: yarn test:ios
-    - name: "RNV Android: Integration"
-      language: android
-      dist: trusty
-      cache:
-        directories:
-          - node_modules
-          - $HOME/.gradle
-      sudo: required
-      jdk: oraclejdk8
-      android:
-        components:
-          - tools-26.1.1
-          - build-tools-28.0.3
-          - extra-google-m2repository
-          - extra-android-m2repository
-          - platform-tools-28.0.2
-          - android-28
-          - sys-img-x86-android-28
-      install:
-        - nvm install 13.13.0
-        - echo yes | sdkmanager "platforms;android-28"
-        - rm -rf ~/.yarn/bin/yarn || true && npm uninstall --global yarn; npm install --global yarn; yarn --version
-        - yarn bootstrap
-        - cd packages/rnv
-      script: yarn test:integration
     - name: "RNV Node: Unit Tests"
       dist: trusty
       language: node_js
@@ -109,3 +86,13 @@ jobs:
         - rm -rf ~/.yarn/bin/yarn || true && npm uninstall --global yarn; npm install --global yarn; yarn --version
         - yarn bootstrap
       script: yarn lint
+    - name: "HelloWorld iOS: E2E"
+      language: node_js
+      cache:
+        directories:
+          - node_modules
+      node_js: 13.13.0
+      os: osx
+      osx_image: xcode11.3
+      install: skip
+      script: ci/run_osx_ios.sh
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -5,12 +5,42 @@ sidebar_label: Changelog
 ---
 
 
+## v0.30.2-alpha.2 (2020-6-24)
+
+### Fixed
+
+- further SDK merge fixes
+- fix: #524 add default workspace to merge flow
+
+### Added Features
+
+- none
+
+### Breaking Changes
+
+- none
+
+
+## v0.30.2-alpha.1 (2020-6-24)
+
+### Fixed
+
+- update loggigng
+- fix: correct sdk field merges
+
+### Added Features
+
+- none
+
+### Breaking Changes
+
+- none
+
+
 ## v0.30.1 (2020-6-24)
 
 ### Fixed
 
-- feat: better logging + suggestions for crypto issues
-- feat: confirm folder replace during rnv new
 - update rnv plugins
 - fix: handle pugin add error in wrapper project
 - Merge pull request #526 from pavjacko/feature/react-native-localize-plugin-update
@@ -28,12 +58,19 @@ sidebar_label: Changelog
 
 ### Added Features
 
-- none
+- feat: better logging + suggestions for crypto issues
+- feat: confirm folder replace during rnv new
 
 ### Breaking Changes
 
 - none
 
+NOTE: Following plugins have been updated to newer versions:
+
+- `react-native-webview`
+- `react-native-prompt-android`
+- `react-native-root-toast`
+- `react-native-animatable`
 
 ## v0.30.0 (2020-6-23)
 

diff --git a/docs/changelog/0.30.2-alpha.1.md b/docs/changelog/0.30.2-alpha.1.md
@@ -0,0 +1,15 @@
+## v0.30.2-alpha.1 (2020-6-24)
+
+### Fixed
+
+- update loggigng
+- fix: correct sdk field merges
+
+### Added Features
+
+- none
+
+### Breaking Changes
+
+- none
+
diff --git a/docs/changelog/0.30.2-alpha.2.md b/docs/changelog/0.30.2-alpha.2.md
@@ -0,0 +1,15 @@
+## v0.30.2-alpha.2 (2020-6-24)
+
+### Fixed
+
+- further SDK merge fixes
+- fix: #524 add default workspace to merge flow
+
+### Added Features
+
+- none
+
+### Breaking Changes
+
+- none
+
diff --git a/docs/plugin.md b/docs/plugin.md
@@ -2672,7 +2672,7 @@ rnv plugin add react-web-vector-icons
 ## renative
 
 
-Version: `0.30.1`
+Version: `0.30.2-alpha.2`
 
 Platforms: `ios`,`android`,`androidtv`,`androidwear`,`web`,`web-next`,`tizen`,`tizenmobile`,`tvos`,`webos`,`macos`,`windows`,`tizenwatch`,`kaios`,`firefoxos`,`firefoxtv`,`chromecast`
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "renative-wrapper-app",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚀🚀🚀 Build universal cross-platform apps with React Native. Includes latest `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `Tizen Mobile`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS`, `Firefox TV` and `Chromecast` platforms",
     "keywords": [
         "android tv",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "app",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚀🚀🚀 Build universal cross-platform apps with React Native. Includes latest `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `Tizen Mobile`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS` and `Firefox TV` platforms",
     "homepage": "https://github.com/pavjacko/renative#readme",
     "bugs": {

diff --git a/packages/renative-template-blank/package.json b/packages/renative-template-blank/package.json
@@ -1,6 +1,6 @@
 {
     "name": "renative-template-blank",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚧 Blank Template for ReNative (https://www.npmjs.com/package/renative). Supports `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS`, `Firefox TV`",
     "keywords": [
         "android tv",

diff --git a/packages/renative-template-hello-world/appConfigs/base/renative.json b/packages/renative-template-hello-world/appConfigs/base/renative.json
@@ -58,8 +58,7 @@
             "buildSchemes": {
                 "debug": {
                     "runScheme": "Debug",
-                    "bundleAssets": false,
-                    "sdk": "iphonesimulator"
+                    "bundleAssets": false
                 },
                 "test": {
                     "runScheme": "Debug",
@@ -76,7 +75,7 @@
         "tvos": {
             "entryFile": "index.tvos",
             "teamID": "",
-            "provisioningStyle": "Manual",
+            "provisioningStyle": "Automatic",
             "entitlements": {},
             "permissions": ["*"],
             "scheme": "RNVAppTVOS",
@@ -85,6 +84,11 @@
                     "runScheme": "Debug",
                     "bundleAssets": false
                 },
+                "test": {
+                    "runScheme": "Debug",
+                    "bundleAssets": true,
+                    "sdk": "appletvsimulator"
+                },
                 "release": {
                     "scheme": "RNVAppTVOSRelease",
                     "runScheme": "Release",

diff --git a/packages/renative-template-hello-world/package.json b/packages/renative-template-hello-world/package.json
@@ -1,6 +1,6 @@
 {
     "name": "renative-template-hello-world",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚧 Hello World Template for ReNative (https://www.npmjs.com/package/renative). Supports `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS`, `Firefox TV`",
     "keywords": [
         "android tv",

diff --git a/packages/renative-template-kitchen-sink/package.json b/packages/renative-template-kitchen-sink/package.json
@@ -1,6 +1,6 @@
 {
     "name": "renative-template-kitchen-sink",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚀🚀🚀 Build universal cross-platform apps with React Native. Includes latest `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS` and `Firefox TV` platforms",
     "keywords": [
         "android tv",

diff --git a/packages/renative/package.json b/packages/renative/package.json
@@ -1,6 +1,6 @@
 {
     "name": "renative",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "🚀🚀🚀 Build universal cross-platform apps with React Native. Includes latest `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS` and `Firefox TV` platforms",
     "keywords": [
         "android tv",

diff --git a/packages/rnv/package.json b/packages/rnv/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rnv",
-    "version": "0.30.1",
+    "version": "0.30.2-alpha.2",
     "description": "💻 CLI for ReNative (https://www.npmjs.com/package/renative). Supports `iOS`, `tvOS`, `Android`, `Android TV`, `Android Wear`, `Web`, `Tizen TV`, `Tizen Watch`, `LG webOS`, `macOS/OSX`, `Windows`, `KaiOS`, `FirefoxOS`, `Firefox TV`",
     "keywords": [
         "android tv",

diff --git a/packages/rnv/pluginTemplates/renative.plugins.json b/packages/rnv/pluginTemplates/renative.plugins.json
@@ -16,7 +16,7 @@
             }
         },
         "renative": {
-            "version": "0.30.1",
+            "version": "0.30.2-alpha.2",
             "webpack": {
                 "modulePaths": [
                     "node_modules/renative"

diff --git a/packages/rnv/src/configTools/configParser.js b/packages/rnv/src/configTools/configParser.js
@@ -375,6 +375,7 @@ export const generateBuildConfig = (c) => {
     logDebug('generateBuildConfig');
 
     const mergeOrder = [
+        c.paths.defaultWorkspace.config,
         c.paths.rnv.projectTemplates.config,
         c.paths.rnv.pluginTemplates.config,
         // c.paths.rnv.platformTemplates.config,
@@ -418,6 +419,7 @@ export const generateBuildConfig = (c) => {
     const extraPlugins = getEnginesPluginDelta(c);
 
     const mergeFiles = [
+        c.files.defaultWorkspace.config,
         c.files.rnv.projectTemplates.config,
         { plugins: extraPlugins },
         ...pluginTemplates,
@@ -441,24 +443,6 @@ export const generateBuildConfig = (c) => {
         c.files.appConfig.configLocal
     ];
 
-    const mergeFolders = [
-        // platform templates
-        c.paths.rnv.platformTemplate.dir,
-        c.paths.project.projectConfig.buildsDir,
-        c.paths.workspace.project.projectConfig.buildsDir,
-        // ...c.paths.project.appConfigs.dirs,
-        c.paths.appConfig.buildsDir,
-        c.paths.workspace.appConfig.buildsDir
-        // PROJECT PLUGINS?
-        // PROJECT ASSETS?
-        // PROJECT FONTS?
-        // APP CONFIG PLUGINS?
-        // APP CONFIG ASSETS?
-        // APP CONFIG FONTS?
-    ];
-
-    logDebug('mergeFolders:', mergeFolders);
-
     const meta = [
         {
             _meta: {

diff --git a/packages/rnv/src/platformTools/android/index.js b/packages/rnv/src/platformTools/android/index.js
@@ -514,13 +514,13 @@ export const configureAndroidProperties = (c, platform) => new Promise((resolve)
 
     const appFolder = getAppFolder(c, platform);
 
-    const addNDK = c.files.workspace.config.sdks.ANDROID_NDK
-            && !c.files.workspace.config.sdks.ANDROID_NDK.includes('<USER>');
+    const addNDK = c.buildConfig?.sdks?.ANDROID_NDK
+            && !c.buildConfig.sdks.ANDROID_NDK.includes('<USER>');
     const ndkString = `ndk.dir=${getRealPath(
         c,
-        c.files.workspace.config.sdks.ANDROID_NDK
+        c.buildConfig?.sdks?.ANDROID_NDK
     )}`;
-    let sdkDir = getRealPath(c, c.files.workspace.config.sdks.ANDROID_SDK);
+    let sdkDir = getRealPath(c, c.buildConfig?.sdks?.ANDROID_SDK);
 
     if (isSystemWin) {
         sdkDir = sdkDir.replace(/\\/g, '/');

diff --git a/packages/rnv/src/platformTools/apple/provisionParser.js b/packages/rnv/src/platformTools/apple/provisionParser.js
@@ -1,17 +1,27 @@
 /* eslint-disable import/no-cycle */
 import { provision, cert } from 'ios-mobileprovision-finder';
+import chalk from 'chalk';
+import path from 'path';
 import { getConfigProp } from '../../common';
+import { logWarning } from '../../systemTools/logger';
+
 
 export const parseProvisioningProfiles = async (c) => {
     // PROJECT
     const teamID = getConfigProp(c, c.platform, 'teamID');
     const id = getConfigProp(c, c.platform, 'id');
     const certificates = cert.read();
-    const provisionProfiles = provision.read();
-    const result = provision.select(provisionProfiles, {
-        AppId: id,
-        TeamIdentifier: teamID,
-        Certificates: certificates.valid
-    });
-    return result;
+    try {
+        const provisionProfiles = provision.read();
+        const result = provision.select(provisionProfiles, {
+            AppId: id,
+            TeamIdentifier: teamID,
+            Certificates: certificates.valid
+        });
+        return result;
+    } catch (e) {
+        logWarning(`You have no provisioning files available. Check your ${chalk.white(path.join(c.paths.home.dir, 'Library/MobileDevice/Provisioning Profiles'))} folder`);
+    }
+
+    return null;
 };
diff --git a/packages/rnv/src/platformTools/apple/xcodeParser.js b/packages/rnv/src/platformTools/apple/xcodeParser.js
@@ -62,16 +62,19 @@ export const parseXcodeProject = async (c, platform) => {
 
         let eligibleProfile;
 
-        result.eligable.forEach((v) => {
-            const bundleId = v.Entitlements['application-identifier'];
+        if (result?.eligable) {
+            result.eligable.forEach((v) => {
+                const bundleId = v.Entitlements['application-identifier'];
+
+                if (
+                    bundleId
+                  === `${c.runtime.xcodeProj.teamID}.${c.runtime.xcodeProj.id}`
+                ) {
+                    eligibleProfile = v;
+                }
+            });
+        }
 
-            if (
-                bundleId
-                === `${c.runtime.xcodeProj.teamID}.${c.runtime.xcodeProj.id}`
-            ) {
-                eligibleProfile = v;
-            }
-        });
 
         if (eligibleProfile) {
             const { autoFix } = await inquirerPrompt({