From 1ddce5aa8dd3d2730cf4df4ae5ae0a22d1fde911 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 21 Oct 2019 22:39:54 +0900
Subject: [PATCH] Package.swift update

---
 CoreStore.podspec                             |  2 +-
 CoreStore.xcodeproj/project.pbxproj           | 72 +++++++++++++------
 .../xcschemes/CoreStore iOS.xcscheme          |  2 +-
 .../{BaseTests => }/BaseTestCase.swift        |  0
 .../BaseTestDataTestCase.swift                |  0
 .../{TestEntities => }/TestEntity1.swift      |  0
 .../{TestEntities => }/TestEntity2.swift      |  0
 Package.swift                                 |  8 ++-
 8 files changed, 61 insertions(+), 23 deletions(-)
 rename CoreStoreTests/{BaseTests => }/BaseTestCase.swift (100%)
 rename CoreStoreTests/{BaseTests => }/BaseTestDataTestCase.swift (100%)
 rename CoreStoreTests/{TestEntities => }/TestEntity1.swift (100%)
 rename CoreStoreTests/{TestEntities => }/TestEntity2.swift (100%)

diff --git a/CoreStore.podspec b/CoreStore.podspec
index 549d04e..2876fb0 100644
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
     s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine' }
 end
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index c767761..8227e2d 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -1248,7 +1248,7 @@
 		2F03A53C19C5C6DA005002A5 /* CoreStoreTests */ = {
 			isa = PBXGroup;
 			children = (
-				B5489F4A1CF5F743008B4978 /* BaseTests */,
+				B5AA37FE235DEBD700FFD4B9 /* BaseTests */,
 				B5DBE2DD1C9939E100B5CEFA /* BridgingTests.h */,
 				B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */,
 				B5D339B31E925C2B00C880DE /* DynamicModelTests.swift */,
@@ -1270,7 +1270,7 @@
 				B596BBAD1DD59FDB001DCDD9 /* ConvenienceTests.swift */,
 				B5DC47C91C93D9C800FA3BF3 /* StorageInterfaceTests.swift */,
 				2F03A53D19C5C6DA005002A5 /* Supporting Files */,
-				B5489F3C1CF5EEBC008B4978 /* TestEntities */,
+				B5AA37FF235DEBF500FFD4B9 /* TestEntities */,
 				B5489F451CF5F017008B4978 /* TransactionTests.swift */,
 				B525577F1D029D2500E51965 /* TweakTests.swift */,
 				B59A51822256C85E00CEF3C5 /* VersionLockTests.swift */,
@@ -1406,24 +1406,6 @@
 			name = StorageInterfaces;
 			sourceTree = "<group>";
 		};
-		B5489F3C1CF5EEBC008B4978 /* TestEntities */ = {
-			isa = PBXGroup;
-			children = (
-				B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */,
-				B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */,
-			);
-			path = TestEntities;
-			sourceTree = "<group>";
-		};
-		B5489F4A1CF5F743008B4978 /* BaseTests */ = {
-			isa = PBXGroup;
-			children = (
-				B5489F4B1CF5F743008B4978 /* BaseTestCase.swift */,
-				B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */,
-			);
-			path = BaseTests;
-			sourceTree = "<group>";
-		};
 		B5519A5D1CA20093002BEF78 /* Transactions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1539,6 +1521,24 @@
 			name = Swift;
 			sourceTree = "<group>";
 		};
+		B5AA37FE235DEBD700FFD4B9 /* BaseTests */ = {
+			isa = PBXGroup;
+			children = (
+				B5489F4B1CF5F743008B4978 /* BaseTestCase.swift */,
+				B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */,
+			);
+			name = BaseTests;
+			sourceTree = "<group>";
+		};
+		B5AA37FF235DEBF500FFD4B9 /* TestEntities */ = {
+			isa = PBXGroup;
+			children = (
+				B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */,
+				B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */,
+			);
+			name = TestEntities;
+			sourceTree = "<group>";
+		};
 		B5DBE2CB1C99148100B5CEFA /* ObjectiveC */ = {
 			isa = PBXGroup;
 			children = (
@@ -3106,6 +3106,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 7.0.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3125,6 +3129,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 7.0.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3180,6 +3188,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3201,6 +3213,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3261,6 +3277,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3285,6 +3305,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3346,6 +3370,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3369,6 +3397,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme
index 01ffb76..fdef8e3 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
@@ -71,7 +71,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/CoreStoreTests/BaseTests/BaseTestCase.swift b/CoreStoreTests/BaseTestCase.swift
similarity index 100%
rename from CoreStoreTests/BaseTests/BaseTestCase.swift
rename to CoreStoreTests/BaseTestCase.swift
diff --git a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift b/CoreStoreTests/BaseTestDataTestCase.swift
similarity index 100%
rename from CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
rename to CoreStoreTests/BaseTestDataTestCase.swift
diff --git a/CoreStoreTests/TestEntities/TestEntity1.swift b/CoreStoreTests/TestEntity1.swift
similarity index 100%
rename from CoreStoreTests/TestEntities/TestEntity1.swift
rename to CoreStoreTests/TestEntity1.swift
diff --git a/CoreStoreTests/TestEntities/TestEntity2.swift b/CoreStoreTests/TestEntity2.swift
similarity index 100%
rename from CoreStoreTests/TestEntities/TestEntity2.swift
rename to CoreStoreTests/TestEntity2.swift
diff --git a/Package.swift b/Package.swift
index f6ec31f..662641a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -41,6 +41,12 @@ let package = Package(
             dependencies: [],
             path: "Sources",
             exclude: ["CoreStoreBridge.h", "CoreStoreBridge.m"]
+        ),
+        .testTarget(
+            name: "CoreStoreTests",
+            dependencies: ["CoreStore"],
+            path: "CoreStoreTests"
         )
-    ]
+    ],
+    swiftLanguageVersions: [.v5_1]
 )