SwiftPMに対応

masakih · Jun 28, 2020 · 2f46379 · 2f46379
1 parent 577c2ea
commit 2f46379
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 10 deletions.
diff --git a/Doutaku.xcodeproj/project.pbxproj b/Doutaku.xcodeproj/project.pbxproj
@@ -88,6 +88,7 @@
 		F405461D205E96B30012913F /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		F4054630205E998F0012913F /* Person.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
 		F4054633205E99DB0012913F /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
+		F475521D24A833780013D3DD /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		F47AC705206743F600793492 /* Predicate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Predicate.swift; sourceTree = "<group>"; };
 		F47AC707206747C100793492 /* PredicateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PredicateTests.swift; sourceTree = "<group>"; };
 		F47AC7092067C44600793492 /* SortDescriptors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortDescriptors.swift; sourceTree = "<group>"; };
@@ -124,9 +125,10 @@
 		F40545C4205E8E060012913F = {
 			isa = PBXGroup;
 			children = (
-				F40545D0205E8E060012913F /* Doutaku */,
+				F475521D24A833780013D3DD /* Package.swift */,
+				F40545D0205E8E060012913F /* Sources */,
 				F405460A205E8FBF0012913F /* DoutakuApp */,
-				F40545DB205E8E060012913F /* DoutakuTests */,
+				F40545DB205E8E060012913F /* Tests */,
 				F40545CF205E8E060012913F /* Products */,
 			);
 			sourceTree = "<group>";
@@ -141,7 +143,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		F40545D0205E8E060012913F /* Doutaku */ = {
+		F40545D0205E8E060012913F /* Sources */ = {
 			isa = PBXGroup;
 			children = (
 				F40545FC205E8F3A0012913F /* ApplicationDirecrories.swift */,
@@ -154,18 +156,18 @@
 				F40545D1205E8E060012913F /* Doutaku.h */,
 				F40545D2205E8E060012913F /* Info.plist */,
 			);
-			path = Doutaku;
+			path = Sources;
 			sourceTree = "<group>";
 		};
-		F40545DB205E8E060012913F /* DoutakuTests */ = {
+		F40545DB205E8E060012913F /* Tests */ = {
 			isa = PBXGroup;
 			children = (
 				F40545DC205E8E060012913F /* DoutakuTests.swift */,
 				F47AC707206747C100793492 /* PredicateTests.swift */,
 				F47AC70B2067C8EC00793492 /* SortDescriptorsTests.swift */,
 				F40545DE205E8E060012913F /* Info.plist */,
 			);
-			path = DoutakuTests;
+			path = Tests;
 			sourceTree = "<group>";
 		};
 		F405460A205E8FBF0012913F /* DoutakuApp */ = {
@@ -542,7 +544,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Doutaku/Info.plist;
+				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.1;
@@ -566,7 +568,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Doutaku/Info.plist;
+				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.1;
@@ -584,7 +586,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = DoutakuTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.DoutakuTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -600,7 +602,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = DoutakuTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.masakih.DoutakuTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,29 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Doutaku",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "Doutaku",
+            targets: ["Doutaku"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "Doutaku",
+            dependencies: [],
+            path: "Sources"),
+        .testTarget(
+            name: "DoutakuTests",
+            dependencies: ["Doutaku"]),
+    ]
+)
diff --git a/Doutaku/ApplicationDirecrories.swift → Sources/ApplicationDirecrories.swift b/Doutaku/ApplicationDirecrories.swift → Sources/ApplicationDirecrories.swift
diff --git a/Doutaku/CoreDataCore.swift → Sources/CoreDataCore.swift b/Doutaku/CoreDataCore.swift → Sources/CoreDataCore.swift
diff --git a/Doutaku/CoreDataManager.swift → Sources/CoreDataManager.swift b/Doutaku/CoreDataManager.swift → Sources/CoreDataManager.swift
diff --git a/Doutaku/Doutaku.h → Sources/Doutaku.h b/Doutaku/Doutaku.h → Sources/Doutaku.h
diff --git a/Doutaku/Entity.swift → Sources/Entity.swift b/Doutaku/Entity.swift → Sources/Entity.swift
diff --git a/Doutaku/Info.plist → Sources/Info.plist b/Doutaku/Info.plist → Sources/Info.plist
diff --git a/Doutaku/MOCGenerator.swift → Sources/MOCGenerator.swift b/Doutaku/MOCGenerator.swift → Sources/MOCGenerator.swift
diff --git a/Doutaku/Predicate.swift → Sources/Predicate.swift b/Doutaku/Predicate.swift → Sources/Predicate.swift
diff --git a/Doutaku/SortDescriptors.swift → Sources/SortDescriptors.swift b/Doutaku/SortDescriptors.swift → Sources/SortDescriptors.swift
diff --git a/DoutakuTests/DoutakuTests.swift → Tests/DoutakuTests.swift b/DoutakuTests/DoutakuTests.swift → Tests/DoutakuTests.swift
diff --git a/DoutakuTests/Info.plist → Tests/Info.plist b/DoutakuTests/Info.plist → Tests/Info.plist
diff --git a/DoutakuTests/PredicateTests.swift → Tests/PredicateTests.swift b/DoutakuTests/PredicateTests.swift → Tests/PredicateTests.swift
diff --git a/DoutakuTests/SortDescriptorsTests.swift → Tests/SortDescriptorsTests.swift b/DoutakuTests/SortDescriptorsTests.swift → Tests/SortDescriptorsTests.swift