starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-26 03:11:30 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'master' into prototype/propertyWrapperFields

Browse Source
This commit is contained in:
John Estropia
2020-02-08 09:47:35 +09:00
parent 8e4e308ccc 8cb8b95c2e
commit 38e9878c04
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreStore.podspec
View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = "CoreStore" s.name = "CoreStore"
s.version = "7.0.3" s.version = "7.0.4"
s.swift_version = "5.1" s.swift_version = "5.1"
s.license = "MIT" s.license = "MIT"
s.homepage = "https://github.com/JohnEstropia/CoreStore" s.homepage = "https://github.com/JohnEstropia/CoreStore"

4
CoreStore.xcodeproj/project.pbxproj
View File

@@ -3403,7 +3403,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath"; DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.0.3; MARKETING_VERSION = 7.0.4;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-weak_framework", "-weak_framework",
Combine, Combine,
@@ -3426,7 +3426,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath"; DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.0.3; MARKETING_VERSION = 7.0.4;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-weak_framework", "-weak_framework",
Combine, Combine,

4
Sources/DiffableDataSource.BaseAdapter.swift
View File

@@ -23,6 +23,8 @@
// SOFTWARE. // SOFTWARE.
// //
#if canImport(UIKit) || canImport(AppKit)
import Foundation import Foundation
import CoreData import CoreData
@@ -214,3 +216,5 @@ extension DiffableDataSource {
internal let dispatcher: Internals.DiffableDataUIDispatcher<O> internal let dispatcher: Internals.DiffableDataUIDispatcher<O>
} }
} }
#endif

4
Sources/DiffableDataSource.Target.swift
View File

@@ -23,6 +23,8 @@
// SOFTWARE. // SOFTWARE.
// //
#if canImport(UIKit) || canImport(AppKit)
import Foundation import Foundation
@@ -209,3 +211,5 @@ extension DiffableDataSource.Target {
} }
} }
} }
#endif

2
Sources/DiffableDataSource.swift
View File

@@ -23,7 +23,7 @@
// SOFTWARE. // SOFTWARE.
// //
#if os(iOS) || os(tvOS) || os(macOS) #if canImport(UIKit) || canImport(AppKit)
// MARK: - DiffableDataSource // MARK: - DiffableDataSource