Skip to content

Commit 041fba1

Browse files
authored
Merge pull request SwiftyJSON#2 from wongzigii/re-organize
Re-organize tests to satisfy SPM
2 parents ffbc7e4 + 2c9f373 commit 041fba1

19 files changed

+10
-9
lines changed

SwiftyJSON.xcodeproj/project.pbxproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
isa = PBXGroup;
184184
children = (
185185
2E4FEFDD19575BE100351305 /* Source */,
186-
2E4FEFEA19575BE100351305 /* Tests */,
186+
2E4FEFEA19575BE100351305 /* SwiftyJSONTests */,
187187
2E4FEFDC19575BE100351305 /* Products */,
188188
);
189189
sourceTree = "<group>";
@@ -223,7 +223,7 @@
223223
name = "Supporting Files";
224224
sourceTree = "<group>";
225225
};
226-
2E4FEFEA19575BE100351305 /* Tests */ = {
226+
2E4FEFEA19575BE100351305 /* SwiftyJSONTests */ = {
227227
isa = PBXGroup;
228228
children = (
229229
A885D1DA19CFCFF0002FD4C3 /* Tests.json */,
@@ -243,7 +243,8 @@
243243
A8B66C8D19E52F4200540692 /* ArrayTests.swift */,
244244
2E4FEFEB19575BE100351305 /* Supporting Files */,
245245
);
246-
path = Tests;
246+
name = SwiftyJSONTests;
247+
path = Tests/SwiftyJSONTests;
247248
sourceTree = "<group>";
248249
};
249250
2E4FEFEB19575BE100351305 /* Supporting Files */ = {
@@ -804,7 +805,7 @@
804805
"DEBUG=1",
805806
"$(inherited)",
806807
);
807-
INFOPLIST_FILE = "Tests/Info-iOS.plist";
808+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
808809
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
809810
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
810811
METAL_ENABLE_DEBUG_INFO = YES;
@@ -818,7 +819,7 @@
818819
buildSettings = {
819820
CODE_SIGN_IDENTITY = "";
820821
DEVELOPMENT_TEAM = "";
821-
INFOPLIST_FILE = "Tests/Info-iOS.plist";
822+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
822823
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
823824
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
824825
METAL_ENABLE_DEBUG_INFO = NO;
@@ -938,7 +939,7 @@
938939
"DEBUG=1",
939940
"$(inherited)",
940941
);
941-
INFOPLIST_FILE = "Tests/Info-OSX.plist";
942+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-OSX.plist";
942943
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
943944
MACOSX_DEPLOYMENT_TARGET = 10.10;
944945
MTL_ENABLE_DEBUG_INFO = YES;
@@ -955,7 +956,7 @@
955956
COMBINE_HIDPI_IMAGES = YES;
956957
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
957958
FRAMEWORK_SEARCH_PATHS = "";
958-
INFOPLIST_FILE = "Tests/Info-OSX.plist";
959+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-OSX.plist";
959960
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
960961
MACOSX_DEPLOYMENT_TARGET = 10.10;
961962
MTL_ENABLE_DEBUG_INFO = NO;
@@ -971,7 +972,7 @@
971972
CODE_SIGN_IDENTITY = "";
972973
DEBUG_INFORMATION_FORMAT = dwarf;
973974
GCC_NO_COMMON_BLOCKS = YES;
974-
INFOPLIST_FILE = "Tests/Info-tvOS.plist";
975+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
975976
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
976977
MTL_ENABLE_DEBUG_INFO = YES;
977978
PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
@@ -988,7 +989,7 @@
988989
COPY_PHASE_STRIP = NO;
989990
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
990991
GCC_NO_COMMON_BLOCKS = YES;
991-
INFOPLIST_FILE = "Tests/Info-tvOS.plist";
992+
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
992993
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
993994
MTL_ENABLE_DEBUG_INFO = NO;
994995
PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)