Update project structure to SPM structure

alickbass · Apr 11, 2020 · a842527 · a842527
1 parent 6b24a5a
commit a842527
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 9 deletions.
diff --git a/CodableFirebase.xcodeproj/project.pbxproj b/CodableFirebase.xcodeproj/project.pbxproj
@@ -69,8 +69,8 @@
 		CE7DD35D1F9CFA80000225C5 = {
 			isa = PBXGroup;
 			children = (
-				CE7DD3691F9CFA81000225C5 /* CodableFirebase */,
-				CE7DD3741F9CFA81000225C5 /* CodableFirebaseTests */,
+				DAA6B3AB2441B7D50013109D /* Sources */,
+				DAA6B3AC2441B7E90013109D /* Tests */,
 				CE7DD3681F9CFA81000225C5 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -110,6 +110,22 @@
 			path = CodableFirebaseTests;
 			sourceTree = "<group>";
 		};
+		DAA6B3AB2441B7D50013109D /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				CE7DD3691F9CFA81000225C5 /* CodableFirebase */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		DAA6B3AC2441B7E90013109D /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				CE7DD3741F9CFA81000225C5 /* CodableFirebaseTests */,
+			);
+			path = Tests;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -381,7 +397,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = CodableFirebase/Info.plist;
+				INFOPLIST_FILE = Sources/CodableFirebase/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -411,7 +427,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = CodableFirebase/Info.plist;
+				INFOPLIST_FILE = Sources/CodableFirebase/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -437,7 +453,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = CodableFirebaseTests/Info.plist;
+				INFOPLIST_FILE = Tests/CodableFirebaseTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -460,7 +476,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = CodableFirebaseTests/Info.plist;
+				INFOPLIST_FILE = Tests/CodableFirebaseTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;

diff --git a/Package.swift b/Package.swift
@@ -9,10 +9,9 @@ let package = Package(
     targets: [
         .target(
             name: "CodableFirebase",
-            path: "CodableFirebase"),
+            dependencies: []),
         .testTarget(
             name: "CodableFirebaseTests",
-            dependencies: ["CodableFirebase"],
-            path: "CodableFirebaseTests"),
+            dependencies: ["CodableFirebase"]),
     ]
 )
diff --git a/CodableFirebase/CodableFirebase.h → Sources/CodableFirebase/CodableFirebase.h b/CodableFirebase/CodableFirebase.h → Sources/CodableFirebase/CodableFirebase.h
diff --git a/CodableFirebase/Decoder.swift → Sources/CodableFirebase/Decoder.swift b/CodableFirebase/Decoder.swift → Sources/CodableFirebase/Decoder.swift
diff --git a/CodableFirebase/Encoder.swift → Sources/CodableFirebase/Encoder.swift b/CodableFirebase/Encoder.swift → Sources/CodableFirebase/Encoder.swift
diff --git a/CodableFirebase/FirebaseDecoder.swift → ...ces/CodableFirebase/FirebaseDecoder.swift b/CodableFirebase/FirebaseDecoder.swift → ...ces/CodableFirebase/FirebaseDecoder.swift
diff --git a/CodableFirebase/FirebaseEncoder.swift → ...ces/CodableFirebase/FirebaseEncoder.swift b/CodableFirebase/FirebaseEncoder.swift → ...ces/CodableFirebase/FirebaseEncoder.swift
diff --git a/CodableFirebase/FirestoreDecoder.swift → ...es/CodableFirebase/FirestoreDecoder.swift b/CodableFirebase/FirestoreDecoder.swift → ...es/CodableFirebase/FirestoreDecoder.swift
diff --git a/CodableFirebase/FirestoreEncoder.swift → ...es/CodableFirebase/FirestoreEncoder.swift b/CodableFirebase/FirestoreEncoder.swift → ...es/CodableFirebase/FirestoreEncoder.swift
diff --git a/CodableFirebase/Info.plist → Sources/CodableFirebase/Info.plist b/CodableFirebase/Info.plist → Sources/CodableFirebase/Info.plist
diff --git a/CodableFirebaseTests/CodaleTests.swift → Tests/CodableFirebaseTests/CodaleTests.swift b/CodableFirebaseTests/CodaleTests.swift → Tests/CodableFirebaseTests/CodaleTests.swift
diff --git a/CodableFirebaseTests/Info.plist → Tests/CodableFirebaseTests/Info.plist b/CodableFirebaseTests/Info.plist → Tests/CodableFirebaseTests/Info.plist
diff --git a/...leFirebaseTests/TestCodableFirebase.swift → ...leFirebaseTests/TestCodableFirebase.swift b/...leFirebaseTests/TestCodableFirebase.swift → ...leFirebaseTests/TestCodableFirebase.swift
diff --git a/...eFirebaseTests/TestCodableFirestore.swift → ...eFirebaseTests/TestCodableFirestore.swift b/...eFirebaseTests/TestCodableFirestore.swift → ...eFirebaseTests/TestCodableFirestore.swift