Skip to content

Commit 32413d7

Browse files
wongzigiiwongzigii
committed
Re-organize directories
1 parent 184c688 commit 32413d7

22 files changed

+31
-31
lines changed

‎SwiftyJSON.xcodeproj/project.pbxproj

+31-31
Original file line numberDiff line numberDiff line change
@@ -114,37 +114,37 @@
114114

115115
/* Begin PBXFileReference section */
116116
030B6CDC1A6E171D00C2D4F1 /* Info-macOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = "<group>"; };
117-
1B587CC41DDE04360012D8DB /* MergeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MergeTests.swift; sourceTree = "<group>"; };
117+
1B587CC41DDE04360012D8DB /* MergeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MergeTests.swift; path = ../MergeTests.swift; sourceTree = "<group>"; };
118118
2E4FEFDB19575BE100351305 /* SwiftyJSON.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyJSON.framework; sourceTree = BUILT_PRODUCTS_DIR; };
119119
2E4FEFDF19575BE100351305 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
120120
2E4FEFE019575BE100351305 /* SwiftyJSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftyJSON.h; sourceTree = "<group>"; };
121121
2E4FEFE619575BE100351305 /* SwiftyJSON iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftyJSON iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
122-
5DD502901D9B21810004C112 /* NestedJSONTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NestedJSONTests.swift; sourceTree = "<group>"; };
123-
712921EE2004E4EB00DA6340 /* CodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableTests.swift; sourceTree = "<group>"; };
122+
5DD502901D9B21810004C112 /* NestedJSONTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NestedJSONTests.swift; path = ../NestedJSONTests.swift; sourceTree = "<group>"; };
123+
712921EE2004E4EB00DA6340 /* CodableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CodableTests.swift; path = ../CodableTests.swift; sourceTree = "<group>"; };
124124
7236B4F61BAC14150020529B /* SwiftyJSON.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyJSON.framework; sourceTree = BUILT_PRODUCTS_DIR; };
125125
7236B4F71BAC14150020529B /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
126-
9C459EF61A9103B1008C9A41 /* Info-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-macOS.plist"; sourceTree = "<group>"; };
126+
9C459EF61A9103B1008C9A41 /* Info-macOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-macOS.plist"; path = "../Info-macOS.plist"; sourceTree = "<group>"; };
127127
9C7DFC5B1A9102BD005AA3F7 /* SwiftyJSON.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyJSON.framework; sourceTree = BUILT_PRODUCTS_DIR; };
128128
9C7DFC651A9102BD005AA3F7 /* SwiftyJSON macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftyJSON macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
129-
A819C49619E1A7DD00ADCC3D /* LiteralConvertibleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiteralConvertibleTests.swift; sourceTree = "<group>"; };
130-
A819C49819E1B10300ADCC3D /* RawRepresentableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RawRepresentableTests.swift; sourceTree = "<group>"; };
131-
A819C49E19E2EE5B00ADCC3D /* SubscriptTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptTests.swift; sourceTree = "<group>"; };
132-
A819C4A019E37FC600ADCC3D /* PrintableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrintableTests.swift; sourceTree = "<group>"; };
133-
A82A1C0D19D922DC009A653D /* Info-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
134-
A830A6941E5B2DD8001D7F6D /* MutabilityTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MutabilityTests.swift; sourceTree = "<group>"; };
129+
A819C49619E1A7DD00ADCC3D /* LiteralConvertibleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LiteralConvertibleTests.swift; path = ../LiteralConvertibleTests.swift; sourceTree = "<group>"; };
130+
A819C49819E1B10300ADCC3D /* RawRepresentableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RawRepresentableTests.swift; path = ../RawRepresentableTests.swift; sourceTree = "<group>"; };
131+
A819C49E19E2EE5B00ADCC3D /* SubscriptTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SubscriptTests.swift; path = ../SubscriptTests.swift; sourceTree = "<group>"; };
132+
A819C4A019E37FC600ADCC3D /* PrintableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PrintableTests.swift; path = ../PrintableTests.swift; sourceTree = "<group>"; };
133+
A82A1C0D19D922DC009A653D /* Info-iOS.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-iOS.plist"; path = "../Info-iOS.plist"; sourceTree = "<group>"; };
134+
A830A6941E5B2DD8001D7F6D /* MutabilityTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MutabilityTests.swift; path = ../MutabilityTests.swift; sourceTree = "<group>"; };
135135
A8491E1D19CD6DAE00CCFAE6 /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = "<group>"; };
136136
A8580F741BCF5C5B00DA927B /* SwiftyJSON tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftyJSON tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
137-
A8580F781BCF5C5B00DA927B /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
138-
A863BE2719EED46F0092A41F /* RawTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RawTests.swift; sourceTree = "<group>"; };
139-
A86BAA0D19EBC32B009EAAEB /* PerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PerformanceTests.swift; sourceTree = "<group>"; };
140-
A87080E319E3C2A600CDE086 /* SequenceTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SequenceTypeTests.swift; sourceTree = "<group>"; };
141-
A87080E519E3DF7800CDE086 /* ComparableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComparableTests.swift; sourceTree = "<group>"; };
142-
A87080E719E439DA00CDE086 /* NumberTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumberTests.swift; sourceTree = "<group>"; };
143-
A87080E919E43C0700CDE086 /* StringTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringTests.swift; sourceTree = "<group>"; };
144-
A885D1D119CF1EE6002FD4C3 /* BaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTests.swift; sourceTree = "<group>"; };
137+
A8580F781BCF5C5B00DA927B /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-tvOS.plist"; path = "../Info-tvOS.plist"; sourceTree = "<group>"; };
138+
A863BE2719EED46F0092A41F /* RawTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RawTests.swift; path = ../RawTests.swift; sourceTree = "<group>"; };
139+
A86BAA0D19EBC32B009EAAEB /* PerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PerformanceTests.swift; path = ../PerformanceTests.swift; sourceTree = "<group>"; };
140+
A87080E319E3C2A600CDE086 /* SequenceTypeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SequenceTypeTests.swift; path = ../SequenceTypeTests.swift; sourceTree = "<group>"; };
141+
A87080E519E3DF7800CDE086 /* ComparableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ComparableTests.swift; path = ../ComparableTests.swift; sourceTree = "<group>"; };
142+
A87080E719E439DA00CDE086 /* NumberTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NumberTests.swift; path = ../NumberTests.swift; sourceTree = "<group>"; };
143+
A87080E919E43C0700CDE086 /* StringTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringTests.swift; path = ../StringTests.swift; sourceTree = "<group>"; };
144+
A885D1D119CF1EE6002FD4C3 /* BaseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BaseTests.swift; path = ../BaseTests.swift; sourceTree = "<group>"; };
145145
A885D1DA19CFCFF0002FD4C3 /* Tests.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Tests.json; sourceTree = "<group>"; };
146-
A8B66C8B19E51D6500540692 /* DictionaryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DictionaryTests.swift; sourceTree = "<group>"; };
147-
A8B66C8D19E52F4200540692 /* ArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayTests.swift; sourceTree = "<group>"; };
146+
A8B66C8B19E51D6500540692 /* DictionaryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryTests.swift; path = ../DictionaryTests.swift; sourceTree = "<group>"; };
147+
A8B66C8D19E52F4200540692 /* ArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayTests.swift; path = ../ArrayTests.swift; sourceTree = "<group>"; };
148148
E4D7CCE81B9465A700EE7221 /* SwiftyJSON.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyJSON.framework; sourceTree = BUILT_PRODUCTS_DIR; };
149149
E4D7CCE91B9465A800EE7221 /* Info-watchOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-watchOS.plist"; sourceTree = "<group>"; };
150150
/* End PBXFileReference section */
@@ -209,7 +209,7 @@
209209
isa = PBXGroup;
210210
children = (
211211
2E4FEFDD19575BE100351305 /* Source */,
212-
2E4FEFEA19575BE100351305 /* SwiftyJSONTests */,
212+
2E4FEFEA19575BE100351305 /* Tests */,
213213
2E4FEFDC19575BE100351305 /* Products */,
214214
);
215215
sourceTree = "<group>";
@@ -249,11 +249,10 @@
249249
name = "Supporting Files";
250250
sourceTree = "<group>";
251251
};
252-
2E4FEFEA19575BE100351305 /* SwiftyJSONTests */ = {
252+
2E4FEFEA19575BE100351305 /* Tests */ = {
253253
isa = PBXGroup;
254254
children = (
255255
1B587CC41DDE04360012D8DB /* MergeTests.swift */,
256-
A885D1DA19CFCFF0002FD4C3 /* Tests.json */,
257256
A86BAA0D19EBC32B009EAAEB /* PerformanceTests.swift */,
258257
A885D1D119CF1EE6002FD4C3 /* BaseTests.swift */,
259258
5DD502901D9B21810004C112 /* NestedJSONTests.swift */,
@@ -272,13 +271,14 @@
272271
712921EE2004E4EB00DA6340 /* CodableTests.swift */,
273272
2E4FEFEB19575BE100351305 /* Supporting Files */,
274273
);
275-
name = SwiftyJSONTests;
276-
path = Tests/SwiftyJSONTests;
274+
name = Tests;
275+
path = Tests/Tes;
277276
sourceTree = "<group>";
278277
};
279278
2E4FEFEB19575BE100351305 /* Supporting Files */ = {
280279
isa = PBXGroup;
281280
children = (
281+
A885D1DA19CFCFF0002FD4C3 /* Tests.json */,
282282
A82A1C0D19D922DC009A653D /* Info-iOS.plist */,
283283
9C459EF61A9103B1008C9A41 /* Info-macOS.plist */,
284284
A8580F781BCF5C5B00DA927B /* Info-tvOS.plist */,
@@ -891,7 +891,7 @@
891891
"DEBUG=1",
892892
"$(inherited)",
893893
);
894-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
894+
INFOPLIST_FILE = "Tests/Info-iOS.plist";
895895
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
896896
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
897897
METAL_ENABLE_DEBUG_INFO = YES;
@@ -909,7 +909,7 @@
909909
CODE_SIGN_IDENTITY = "";
910910
DEVELOPMENT_TEAM = "";
911911
GCC_OPTIMIZATION_LEVEL = s;
912-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-iOS.plist";
912+
INFOPLIST_FILE = "Tests/Info-iOS.plist";
913913
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
914914
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
915915
METAL_ENABLE_DEBUG_INFO = NO;
@@ -1042,7 +1042,7 @@
10421042
"DEBUG=1",
10431043
"$(inherited)",
10441044
);
1045-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-macOS.plist";
1045+
INFOPLIST_FILE = "Tests/Info-macOS.plist";
10461046
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
10471047
MACOSX_DEPLOYMENT_TARGET = 10.10;
10481048
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1062,7 +1062,7 @@
10621062
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10631063
FRAMEWORK_SEARCH_PATHS = "";
10641064
GCC_OPTIMIZATION_LEVEL = s;
1065-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-macOS.plist";
1065+
INFOPLIST_FILE = "Tests/Info-macOS.plist";
10661066
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
10671067
MACOSX_DEPLOYMENT_TARGET = 10.10;
10681068
MTL_ENABLE_DEBUG_INFO = NO;
@@ -1096,7 +1096,7 @@
10961096
DEBUG_INFORMATION_FORMAT = dwarf;
10971097
GCC_NO_COMMON_BLOCKS = YES;
10981098
GCC_OPTIMIZATION_LEVEL = 0;
1099-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
1099+
INFOPLIST_FILE = "Tests/Info-tvOS.plist";
11001100
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11011101
MTL_ENABLE_DEBUG_INFO = YES;
11021102
PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";
@@ -1116,7 +1116,7 @@
11161116
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11171117
GCC_NO_COMMON_BLOCKS = YES;
11181118
GCC_OPTIMIZATION_LEVEL = s;
1119-
INFOPLIST_FILE = "Tests/SwiftyJSONTests/Info-tvOS.plist";
1119+
INFOPLIST_FILE = "Tests/Info-tvOS.plist";
11201120
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11211121
MTL_ENABLE_DEBUG_INFO = NO;
11221122
PRODUCT_BUNDLE_IDENTIFIER = "com.tangplin.SwiftyJSON-tvOS-Tests";

‎Tests/SwiftyJSONTests/ArrayTests.swift renamed to ‎Tests/ArrayTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/BaseTests.swift renamed to ‎Tests/BaseTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/CodableTests.swift renamed to ‎Tests/CodableTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/ComparableTests.swift renamed to ‎Tests/ComparableTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/DictionaryTests.swift renamed to ‎Tests/DictionaryTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/Info-iOS.plist renamed to ‎Tests/Info-iOS.plist

File renamed without changes.

‎Tests/SwiftyJSONTests/Info-macOS.plist renamed to ‎Tests/Info-macOS.plist

File renamed without changes.

‎Tests/SwiftyJSONTests/Info-tvOS.plist renamed to ‎Tests/Info-tvOS.plist

File renamed without changes.

‎Tests/SwiftyJSONTests/LiteralConvertibleTests.swift renamed to ‎Tests/LiteralConvertibleTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/MergeTests.swift renamed to ‎Tests/MergeTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/MutabilityTests.swift renamed to ‎Tests/MutabilityTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/NestedJSONTests.swift renamed to ‎Tests/NestedJSONTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/NumberTests.swift renamed to ‎Tests/NumberTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/PerformanceTests.swift renamed to ‎Tests/PerformanceTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/PrintableTests.swift renamed to ‎Tests/PrintableTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/RawRepresentableTests.swift renamed to ‎Tests/RawRepresentableTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/RawTests.swift renamed to ‎Tests/RawTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/SequenceTypeTests.swift renamed to ‎Tests/SequenceTypeTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/StringTests.swift renamed to ‎Tests/StringTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/SubscriptTests.swift renamed to ‎Tests/SubscriptTests.swift

File renamed without changes.

‎Tests/SwiftyJSONTests/Tests.json renamed to ‎Tests/Tes/Tests.json

File renamed without changes.

0 commit comments

Comments
 (0)