Skip to content

Commit 159b1d9

Browse files
dilepingdileping
authored
Merge pull request #22 from killev/develop
Package swift support
2 parents 93854b5 + b4770b6 commit 159b1d9

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

‎ExecutionContext.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -152,25 +152,19 @@
152152
92E409101CBC32F2001ED069 /* ExecutionContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExecutionContext.framework; sourceTree = BUILT_PRODUCTS_DIR; };
153153
92E409191CBC32F2001ED069 /* ExecutionContextTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ExecutionContextTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
154154
92E4092E1CBC33F9001ED069 /* Boilerplate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Boilerplate.framework; sourceTree = "<group>"; };
155-
92E4092F1CBC33F9001ED069 /* Foundation3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Foundation3.framework; sourceTree = "<group>"; };
156155
92E409301CBC33F9001ED069 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = "<group>"; };
157-
92E409311CBC33F9001ED069 /* XCTest3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest3.framework; sourceTree = "<group>"; };
158156
92E4093E1CBC344D001ED069 /* Boilerplate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Boilerplate.framework; sourceTree = "<group>"; };
159-
92E4093F1CBC344D001ED069 /* Foundation3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Foundation3.framework; sourceTree = "<group>"; };
160157
92E409401CBC344D001ED069 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = "<group>"; };
161158
92E409411CBC344D001ED069 /* RunLoop.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RunLoop.framework; sourceTree = "<group>"; };
162159
92E409421CBC344D001ED069 /* UV.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = UV.framework; sourceTree = "<group>"; };
163-
92E409431CBC344D001ED069 /* XCTest3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest3.framework; sourceTree = "<group>"; };
164160
92E409EE1CC10541001ED069 /* RunLoop.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RunLoop.framework; sourceTree = "<group>"; };
165161
92E409F81CC10677001ED069 /* ExecutionContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExecutionContext.framework; sourceTree = BUILT_PRODUCTS_DIR; };
166162
92E40A011CC10677001ED069 /* ExecutionContextTests-tvOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ExecutionContextTests-tvOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
167163
92E40A181CC10761001ED069 /* Boilerplate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Boilerplate.framework; sourceTree = "<group>"; };
168-
92E40A191CC10761001ED069 /* Foundation3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Foundation3.framework; sourceTree = "<group>"; };
169164
92E40A1A1CC10761001ED069 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = "<group>"; };
170165
92E40A1B1CC10761001ED069 /* RunLoop.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RunLoop.framework; sourceTree = "<group>"; };
171166
92E40A2E1CC107D0001ED069 /* ExecutionContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ExecutionContext.framework; sourceTree = BUILT_PRODUCTS_DIR; };
172167
92E40A3D1CC10895001ED069 /* Boilerplate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Boilerplate.framework; sourceTree = "<group>"; };
173-
92E40A3E1CC10895001ED069 /* Foundation3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Foundation3.framework; sourceTree = "<group>"; };
174168
92E40A3F1CC10895001ED069 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = "<group>"; };
175169
92E40A401CC10895001ED069 /* RunLoop.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RunLoop.framework; sourceTree = "<group>"; };
176170
/* End PBXFileReference section */
@@ -298,7 +292,7 @@
298292
65D6378F1C943764000F5548 /* Info.plist */,
299293
);
300294
name = ExecutionContextTests;
301-
path = Tests/ExecutionContext;
295+
path = Tests/ExecutionContextTests;
302296
sourceTree = "<group>";
303297
};
304298
65D637A61C94383C000F5548 /* Frameworks */ = {
@@ -317,11 +311,9 @@
317311
isa = PBXGroup;
318312
children = (
319313
92E4093E1CBC344D001ED069 /* Boilerplate.framework */,
320-
92E4093F1CBC344D001ED069 /* Foundation3.framework */,
321314
92E409401CBC344D001ED069 /* Result.framework */,
322315
92E409411CBC344D001ED069 /* RunLoop.framework */,
323316
92E409421CBC344D001ED069 /* UV.framework */,
324-
92E409431CBC344D001ED069 /* XCTest3.framework */,
325317
);
326318
path = Mac;
327319
sourceTree = "<group>";
@@ -331,9 +323,7 @@
331323
children = (
332324
92E409EE1CC10541001ED069 /* RunLoop.framework */,
333325
92E4092E1CBC33F9001ED069 /* Boilerplate.framework */,
334-
92E4092F1CBC33F9001ED069 /* Foundation3.framework */,
335326
92E409301CBC33F9001ED069 /* Result.framework */,
336-
92E409311CBC33F9001ED069 /* XCTest3.framework */,
337327
);
338328
path = iOS;
339329
sourceTree = "<group>";
@@ -342,7 +332,6 @@
342332
isa = PBXGroup;
343333
children = (
344334
92E40A181CC10761001ED069 /* Boilerplate.framework */,
345-
92E40A191CC10761001ED069 /* Foundation3.framework */,
346335
92E40A1A1CC10761001ED069 /* Result.framework */,
347336
92E40A1B1CC10761001ED069 /* RunLoop.framework */,
348337
);
@@ -353,7 +342,6 @@
353342
isa = PBXGroup;
354343
children = (
355344
92E40A3D1CC10895001ED069 /* Boilerplate.framework */,
356-
92E40A3E1CC10895001ED069 /* Foundation3.framework */,
357345
92E40A3F1CC10895001ED069 /* Result.framework */,
358346
92E40A401CC10895001ED069 /* RunLoop.framework */,
359347
);
@@ -887,7 +875,7 @@
887875
"$(inherited)",
888876
"$(PROJECT_DIR)/Carthage/Build/Mac",
889877
);
890-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
878+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
891879
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
892880
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContextTests;
893881
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -904,7 +892,7 @@
904892
"$(inherited)",
905893
"$(PROJECT_DIR)/Carthage/Build/Mac",
906894
);
907-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
895+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
908896
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
909897
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContextTests;
910898
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -973,7 +961,7 @@
973961
"$(inherited)",
974962
"$(PROJECT_DIR)/Carthage/Build/iOS",
975963
);
976-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
964+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
977965
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
978966
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
979967
PRODUCT_BUNDLE_IDENTIFIER = "xyz.crossroadlabs.ExecutionContextTests-iOS";
@@ -991,7 +979,7 @@
991979
"$(inherited)",
992980
"$(PROJECT_DIR)/Carthage/Build/iOS",
993981
);
994-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
982+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
995983
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
996984
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
997985
PRODUCT_BUNDLE_IDENTIFIER = "xyz.crossroadlabs.ExecutionContextTests-iOS";
@@ -1062,7 +1050,7 @@
10621050
"$(inherited)",
10631051
"$(PROJECT_DIR)/Carthage/Build/tvOS",
10641052
);
1065-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
1053+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
10661054
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10671055
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContextTests;
10681056
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1079,7 +1067,7 @@
10791067
"$(inherited)",
10801068
"$(PROJECT_DIR)/Carthage/Build/tvOS",
10811069
);
1082-
INFOPLIST_FILE = Tests/ExecutionContext/Info.plist;
1070+
INFOPLIST_FILE = Tests/ExecutionContextTests/Info.plist;
10831071
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10841072
PRODUCT_BUNDLE_IDENTIFIER = xyz.crossroadlabs.ExecutionContextTests;
10851073
PRODUCT_NAME = "$(TARGET_NAME)";

‎Tests/ExecutionContext/ExecutionContextTests.swift‎ renamed to ‎Tests/ExecutionContextTests/ExecutionContextTests.swift‎

File renamed without changes.

‎Tests/ExecutionContext/Info.plist‎ renamed to ‎Tests/ExecutionContextTests/Info.plist‎

File renamed without changes.

0 commit comments

Comments
 (0)