Skip to content

Commit bbe6bf3

Browse files
dilepingdileping
committed
Merge pull request #20 from ypopovych/develop
Fixed projects settings for iOS, tvOS, watchOS
2 parents 94105e3 + 8109e3d commit bbe6bf3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ matrix:
6262
# libuv v1
6363
- sudo add-apt-repository ppa:swiftexpress/swiftexpress --yes
6464
- sudo apt-get update
65-
- sudo apt-get install libuv1-dev
65+
- sudo apt-get install libuv1-dev --force-yes
6666
# get back home
6767
- cd $MODULE_NAME
6868
# get crossroad build script

‎ExecutionContext.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
65D637A01C9437BB000F5548 /* DispatchExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */; };
1414
65D637A11C9437BB000F5548 /* ExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379B1C9437BB000F5548 /* ExecutionContext.swift */; };
1515
65D637A21C9437BB000F5548 /* ImmediateExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */; };
16-
65D637A31C9437BB000F5548 /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
1716
65D637A51C9437F4000F5548 /* ExecutionContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637A41C9437F4000F5548 /* ExecutionContextTests.swift */; };
1817
65FD8EC01CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
1918
65FD8EC11CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
2019
65FD8EC21CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
2120
65FD8EC31CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65FD8EBF1CD9BC340046D5D6 /* ExecutionContextTenant.swift */; };
21+
92B0010A1CDCFB8D00E23C7B /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
2222
92E4091A1CBC32F2001ED069 /* ExecutionContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E409101CBC32F2001ED069 /* ExecutionContext.framework */; };
2323
92E409271CBC3369001ED069 /* ExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379B1C9437BB000F5548 /* ExecutionContext.swift */; };
2424
92E409281CBC336D001ED069 /* CustomExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637981C9437BB000F5548 /* CustomExecutionContext.swift */; };
2525
92E409291CBC3371001ED069 /* DefaultExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637991C9437BB000F5548 /* DefaultExecutionContext.swift */; };
2626
92E4092A1CBC3374001ED069 /* DispatchExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */; };
2727
92E4092B1CBC3378001ED069 /* ImmediateExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */; };
28-
92E4092C1CBC337B001ED069 /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
2928
92E409361CBC3427001ED069 /* Boilerplate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E4092E1CBC33F9001ED069 /* Boilerplate.framework */; };
3029
92E409371CBC3427001ED069 /* Foundation3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E4092F1CBC33F9001ED069 /* Foundation3.framework */; };
3130
92E409381CBC3427001ED069 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E409301CBC33F9001ED069 /* Result.framework */; };
@@ -63,7 +62,6 @@
6362
92E40A111CC10713001ED069 /* DefaultExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637991C9437BB000F5548 /* DefaultExecutionContext.swift */; };
6463
92E40A121CC10713001ED069 /* DispatchExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */; };
6564
92E40A131CC10713001ED069 /* ImmediateExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */; };
66-
92E40A141CC10713001ED069 /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
6765
92E40A151CC10717001ED069 /* ExecutionContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637A41C9437F4000F5548 /* ExecutionContextTests.swift */; };
6866
92E40A161CC10718001ED069 /* ExecutionContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637A41C9437F4000F5548 /* ExecutionContextTests.swift */; };
6967
92E40A1C1CC10761001ED069 /* Boilerplate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E40A181CC10761001ED069 /* Boilerplate.framework */; };
@@ -83,7 +81,6 @@
8381
92E40A381CC10816001ED069 /* DefaultExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D637991C9437BB000F5548 /* DefaultExecutionContext.swift */; };
8482
92E40A391CC10816001ED069 /* DispatchExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379A1C9437BB000F5548 /* DispatchExecutionContext.swift */; };
8583
92E40A3A1CC10816001ED069 /* ImmediateExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379C1C9437BB000F5548 /* ImmediateExecutionContext.swift */; };
86-
92E40A3B1CC10816001ED069 /* RunLoopExecutionContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65D6379D1C9437BB000F5548 /* RunLoopExecutionContext.swift */; };
8784
92E40A411CC10895001ED069 /* Boilerplate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E40A3D1CC10895001ED069 /* Boilerplate.framework */; };
8885
92E40A421CC10895001ED069 /* Foundation3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E40A3E1CC10895001ED069 /* Foundation3.framework */; };
8986
92E40A431CC10895001ED069 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E40A3F1CC10895001ED069 /* Result.framework */; };
@@ -673,10 +670,10 @@
673670
isa = PBXSourcesBuildPhase;
674671
buildActionMask = 2147483647;
675672
files = (
676-
65D637A31C9437BB000F5548 /* RunLoopExecutionContext.swift in Sources */,
677673
65FD8EC01CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
678674
65D6379F1C9437BB000F5548 /* DefaultExecutionContext.swift in Sources */,
679675
65D6379E1C9437BB000F5548 /* CustomExecutionContext.swift in Sources */,
676+
92B0010A1CDCFB8D00E23C7B /* RunLoopExecutionContext.swift in Sources */,
680677
65D637A21C9437BB000F5548 /* ImmediateExecutionContext.swift in Sources */,
681678
65D637A11C9437BB000F5548 /* ExecutionContext.swift in Sources */,
682679
65D637A01C9437BB000F5548 /* DispatchExecutionContext.swift in Sources */,
@@ -695,7 +692,6 @@
695692
isa = PBXSourcesBuildPhase;
696693
buildActionMask = 2147483647;
697694
files = (
698-
92E4092C1CBC337B001ED069 /* RunLoopExecutionContext.swift in Sources */,
699695
65FD8EC11CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
700696
92E409271CBC3369001ED069 /* ExecutionContext.swift in Sources */,
701697
92E409291CBC3371001ED069 /* DefaultExecutionContext.swift in Sources */,
@@ -717,7 +713,6 @@
717713
isa = PBXSourcesBuildPhase;
718714
buildActionMask = 2147483647;
719715
files = (
720-
92E40A141CC10713001ED069 /* RunLoopExecutionContext.swift in Sources */,
721716
65FD8EC21CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
722717
92E40A0F1CC10713001ED069 /* ExecutionContext.swift in Sources */,
723718
92E40A111CC10713001ED069 /* DefaultExecutionContext.swift in Sources */,
@@ -739,7 +734,6 @@
739734
isa = PBXSourcesBuildPhase;
740735
buildActionMask = 2147483647;
741736
files = (
742-
92E40A3B1CC10816001ED069 /* RunLoopExecutionContext.swift in Sources */,
743737
65FD8EC31CD9BC340046D5D6 /* ExecutionContextTenant.swift in Sources */,
744738
92E40A361CC10816001ED069 /* ExecutionContext.swift in Sources */,
745739
92E40A381CC10816001ED069 /* DefaultExecutionContext.swift in Sources */,
@@ -959,6 +953,7 @@
959953
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
960954
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
961955
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
956+
OTHER_SWIFT_FLAGS = "-Dnouv";
962957
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
963958
PRODUCT_NAME = "$(PROJECT_NAME)";
964959
SDKROOT = iphoneos;
@@ -984,6 +979,7 @@
984979
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
985980
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
986981
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
982+
OTHER_SWIFT_FLAGS = "-Dnouv";
987983
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
988984
PRODUCT_NAME = "$(PROJECT_NAME)";
989985
SDKROOT = iphoneos;
@@ -1045,6 +1041,7 @@
10451041
INFOPLIST_FILE = ExecutionContext/Info.plist;
10461042
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10471043
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1044+
OTHER_SWIFT_FLAGS = "-Dnouv";
10481045
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
10491046
PRODUCT_NAME = "$(PROJECT_NAME)";
10501047
SDKROOT = appletvos;
@@ -1069,6 +1066,7 @@
10691066
INFOPLIST_FILE = ExecutionContext/Info.plist;
10701067
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10711068
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1069+
OTHER_SWIFT_FLAGS = "-Dnouv";
10721070
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
10731071
PRODUCT_NAME = "$(PROJECT_NAME)";
10741072
SDKROOT = appletvos;
@@ -1130,6 +1128,7 @@
11301128
INFOPLIST_FILE = ExecutionContext/Info.plist;
11311129
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11321130
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1131+
OTHER_SWIFT_FLAGS = "-Dnouv";
11331132
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
11341133
PRODUCT_NAME = "$(PROJECT_NAME)";
11351134
SDKROOT = watchos;
@@ -1155,6 +1154,7 @@
11551154
INFOPLIST_FILE = ExecutionContext/Info.plist;
11561155
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11571156
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1157+
OTHER_SWIFT_FLAGS = "-Dnouv";
11581158
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContext;
11591159
PRODUCT_NAME = "$(PROJECT_NAME)";
11601160
SDKROOT = watchos;

0 commit comments

Comments
 (0)