Browse Source

Xcode10 (#4795)

* Add -UseModernBuildSystem=NO for xcodebuild

* Add -UseModernBuildSystem to detox build
Shalom Yerushalmy 5 years ago
parent
commit
e50906d887
2 changed files with 3 additions and 2 deletions
  1. 2
    2
      package.json
  2. 1
    0
      scripts/test-unit.js

+ 2
- 2
package.json View File

133
       },
133
       },
134
       "ios.sim.debug": {
134
       "ios.sim.debug": {
135
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
135
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
136
-        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Debug -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet",
136
+        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Debug -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=NO",
137
         "type": "ios.simulator",
137
         "type": "ios.simulator",
138
         "name": "iPhone X"
138
         "name": "iPhone X"
139
       },
139
       },
140
       "ios.sim.release": {
140
       "ios.sim.release": {
141
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Release-iphonesimulator/playground.app",
141
         "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Release-iphonesimulator/playground.app",
142
-        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground_release -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Release -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet",
142
+        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground_release -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Release -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet -UseModernBuildSystem=NO",
143
         "type": "ios.simulator",
143
         "type": "ios.simulator",
144
         "name": "iPhone X"
144
         "name": "iPhone X"
145
       },
145
       },

+ 1
- 0
scripts/test-unit.js View File

30
             -configuration ${conf}
30
             -configuration ${conf}
31
             -derivedDataPath ./DerivedData/playground
31
             -derivedDataPath ./DerivedData/playground
32
             -quiet
32
             -quiet
33
+            -UseModernBuildSystem=NO
33
             ONLY_ACTIVE_ARCH=YES`);
34
             ONLY_ACTIVE_ARCH=YES`);
34
 
35
 
35
   exec.execSync(`cd ./playground/ios &&
36
   exec.execSync(`cd ./playground/ios &&