Cleans up ResourceTests folder to make it more compatible with SPM

SwifterSwift · Jun 13, 2022 · 5651fba · 5651fba
1 parent 9c9a49f
commit 5651fba
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 13 deletions.
diff --git a/Package.swift b/Package.swift
@@ -21,5 +21,5 @@ let package = Package(
             dependencies: ["SwifterSwift"],
             path: "Tests",
             exclude: ["Info.plist"],
-            resources: [.process("ResourcesTests")])
+            resources: [.process("ResourcesTests/Resources")])
     ])
diff --git a/SwifterSwift.xcodeproj/project.pbxproj b/SwifterSwift.xcodeproj/project.pbxproj
@@ -1417,6 +1417,7 @@
 		8D50E51D24D0D6FB00972E2D /* tvOS */ = {
 			isa = PBXGroup;
 			children = (
+				F88C491824AF73A400BA0503 /* TestStoryboard-tvOS.storyboard */,
 				8D50E52024D0D73E00972E2D /* UIImageViewTvOS.xib */,
 			);
 			path = tvOS;
@@ -1483,17 +1484,8 @@
 		CAC5EBBE2125270A00AB27EC /* ResourcesTests */ = {
 			isa = PBXGroup;
 			children = (
-				8D50E51D24D0D6FB00972E2D /* tvOS */,
-				CAC5EBC52125270A00AB27EC /* big_buck_bunny_720p_1mb.mp4 */,
-				CAC5EBC22125270A00AB27EC /* test.json */,
-				CAC5EBBF2125270A00AB27EC /* TestImage.png */,
-				CAC5EBC02125270A00AB27EC /* TestStoryboard.storyboard */,
-				F88C491824AF73A400BA0503 /* TestStoryboard-tvOS.storyboard */,
-				CAC5EBC12125270A00AB27EC /* UICollectionViewCell.xib */,
-				8D50E51E24D0D71E00972E2D /* UIImageView.xib */,
-				CAC5EBC32125270A00AB27EC /* UITableViewCell.xib */,
-				CAC5EBC42125270A00AB27EC /* UITableViewHeaderFooterView.xib */,
-				5E36CB6424AC9909007727DA /* MyViewController.swift */,
+				F8830FC3285478EC00C1D802 /* Resources */,
+				F8830FC2285478EC00C1D802 /* Sources */,
 			);
 			path = ResourcesTests;
 			sourceTree = "<group>";
@@ -1525,6 +1517,30 @@
 			path = CoreAnimationTests;
 			sourceTree = "<group>";
 		};
+		F8830FC2285478EC00C1D802 /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				5E36CB6424AC9909007727DA /* MyViewController.swift */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		F8830FC3285478EC00C1D802 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8D50E51D24D0D6FB00972E2D /* tvOS */,
+				CAC5EBC52125270A00AB27EC /* big_buck_bunny_720p_1mb.mp4 */,
+				CAC5EBC22125270A00AB27EC /* test.json */,
+				CAC5EBBF2125270A00AB27EC /* TestImage.png */,
+				CAC5EBC02125270A00AB27EC /* TestStoryboard.storyboard */,
+				CAC5EBC12125270A00AB27EC /* UICollectionViewCell.xib */,
+				8D50E51E24D0D71E00972E2D /* UIImageView.xib */,
+				CAC5EBC32125270A00AB27EC /* UITableViewCell.xib */,
+				CAC5EBC42125270A00AB27EC /* UITableViewHeaderFooterView.xib */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		F8E62DA224D0184E00BF35AE /* XCTestTests */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Tests/ResourcesTests/TestImage.png → Tests/ResourcesTests/Resources/TestImage.png b/Tests/ResourcesTests/TestImage.png → Tests/ResourcesTests/Resources/TestImage.png
diff --git a/.../ResourcesTests/TestStoryboard.storyboard → ...Tests/Resources/TestStoryboard.storyboard b/.../ResourcesTests/TestStoryboard.storyboard → ...Tests/Resources/TestStoryboard.storyboard
diff --git a/...s/ResourcesTests/UICollectionViewCell.xib → ...sTests/Resources/UICollectionViewCell.xib b/...s/ResourcesTests/UICollectionViewCell.xib → ...sTests/Resources/UICollectionViewCell.xib
diff --git a/Tests/ResourcesTests/UIImageView.xib → .../ResourcesTests/Resources/UIImageView.xib b/Tests/ResourcesTests/UIImageView.xib → .../ResourcesTests/Resources/UIImageView.xib
diff --git a/Tests/ResourcesTests/UITableViewCell.xib → ...ourcesTests/Resources/UITableViewCell.xib b/Tests/ResourcesTests/UITableViewCell.xib → ...ourcesTests/Resources/UITableViewCell.xib
diff --git a/...rcesTests/UITableViewHeaderFooterView.xib → ...Resources/UITableViewHeaderFooterView.xib b/...rcesTests/UITableViewHeaderFooterView.xib → ...Resources/UITableViewHeaderFooterView.xib
diff --git a/...esourcesTests/big_buck_bunny_720p_1mb.mp4 → ...sts/Resources/big_buck_bunny_720p_1mb.mp4 b/...esourcesTests/big_buck_bunny_720p_1mb.mp4 → ...sts/Resources/big_buck_bunny_720p_1mb.mp4
diff --git a/Tests/ResourcesTests/test.json → Tests/ResourcesTests/Resources/test.json b/Tests/ResourcesTests/test.json → Tests/ResourcesTests/Resources/test.json
diff --git a/...urcesTests/TestStoryboard-tvOS.storyboard → ...urces/tvOS/TestStoryboard-tvOS.storyboard b/...urcesTests/TestStoryboard-tvOS.storyboard → ...urces/tvOS/TestStoryboard-tvOS.storyboard
diff --git a/...s/ResourcesTests/tvOS/UIImageViewTvOS.xib → ...sTests/Resources/tvOS/UIImageViewTvOS.xib b/...s/ResourcesTests/tvOS/UIImageViewTvOS.xib → ...sTests/Resources/tvOS/UIImageViewTvOS.xib
diff --git a/Tests/ResourcesTests/MyViewController.swift → ...urcesTests/Sources/MyViewController.swift b/Tests/ResourcesTests/MyViewController.swift → ...urcesTests/Sources/MyViewController.swift
@@ -1,4 +1,4 @@
-// MyViewController.swift - Copyright 2020 SwifterSwift
+// MyViewController.swift - Copyright 2022 SwifterSwift
 
 #if canImport(UIKit) && !os(watchOS)
 import UIKit