From 82ced27398ce207460490b970d99f2bf59dd4546 Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 15 Jan 2020 09:02:05 +1100 Subject: [PATCH 1/4] Switch to Swift Package Manager for managing dependencies in Xcode This requires that Xcode 11 or greater is used. --- .gitignore | 1 + Bond.xcodeproj/project.pbxproj | 171 +++++++++++------- .../xcshareddata/swiftpm/Package.resolved | 25 +++ Package.resolved | 8 +- Package.swift | 6 +- README.md | 4 +- 6 files changed, 136 insertions(+), 79 deletions(-) create mode 100644 Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.gitignore b/.gitignore index 4498c52f..734ed5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ playground.xcworkspace # Swift Package Manager .build/ +.swiftpm/ # Carthage Carthage diff --git a/Bond.xcodeproj/project.pbxproj b/Bond.xcodeproj/project.pbxproj index 8aa7ca96..8a88d119 100644 --- a/Bond.xcodeproj/project.pbxproj +++ b/Bond.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXAggregateTarget section */ @@ -30,12 +30,6 @@ 6E8ECECD23A2F7D500856D90 /* MainBlockDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3895CCB223A25C61008FD491 /* MainBlockDisposable.swift */; }; 6E8ECECE23A2F7D600856D90 /* MainBlockDisposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3895CCB223A25C61008FD491 /* MainBlockDisposable.swift */; }; 75CA9E9220678E600011E5BB /* UISearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CA9E9120678E600011E5BB /* UISearchBar.swift */; }; - 824267CE225F7E4B001B1648 /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CC225F7E4B001B1648 /* Differ.framework */; }; - 824267CF225F7E4B001B1648 /* ReactiveKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CD225F7E4B001B1648 /* ReactiveKit.framework */; }; - 824267D2225F7E5F001B1648 /* ReactiveKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267D0225F7E5F001B1648 /* ReactiveKit.framework */; }; - 824267D3225F7E5F001B1648 /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267D1225F7E5F001B1648 /* Differ.framework */; }; - 824267D6225F7E68001B1648 /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267D4225F7E68001B1648 /* Differ.framework */; }; - 824267D7225F7E68001B1648 /* ReactiveKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267D5225F7E68001B1648 /* ReactiveKit.framework */; }; 901E85A1214A125A00F03A80 /* NSGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 901E85A0214A125A00F03A80 /* NSGestureRecognizer.swift */; }; 9025DCAB1F981693007B7689 /* Property+BidirectionalMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0220091F8BE898002F8380 /* Property+BidirectionalMap.swift */; }; 9025DCB01F981694007B7689 /* Property+BidirectionalMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0220091F8BE898002F8380 /* Property+BidirectionalMap.swift */; }; @@ -99,6 +93,12 @@ 90A4437A1E91390000D611FE /* BNDProtocolProxyBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C04D161E8F0B12000077C8 /* BNDProtocolProxyBase.m */; }; 90A4437D1E91391B00D611FE /* BNDProtocolProxyBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C04D161E8F0B12000077C8 /* BNDProtocolProxyBase.m */; }; 90A4437E1E91391D00D611FE /* BNDProtocolProxyBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C04D161E8F0B12000077C8 /* BNDProtocolProxyBase.m */; }; + 90AD163823CE700D00925831 /* ReactiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD163723CE700D00925831 /* ReactiveKit */; }; + 90AD163A23CE700D00925831 /* Differ in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD163923CE700D00925831 /* Differ */; }; + 90AD163C23CE703800925831 /* ReactiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD163B23CE703800925831 /* ReactiveKit */; }; + 90AD163E23CE703800925831 /* Differ in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD163D23CE703800925831 /* Differ */; }; + 90AD164023CE70B300925831 /* ReactiveKit in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD163F23CE70B300925831 /* ReactiveKit */; }; + 90AD164223CE70B300925831 /* Differ in Frameworks */ = {isa = PBXBuildFile; productRef = 90AD164123CE70B300925831 /* Differ */; }; 90B5F6332269D63D001917B4 /* NSCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B5F6322269D63D001917B4 /* NSCollectionView.swift */; }; 90B5F6342269D63D001917B4 /* NSCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B5F6322269D63D001917B4 /* NSCollectionView.swift */; }; 90B5F6352269D63D001917B4 /* NSCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B5F6322269D63D001917B4 /* NSCollectionView.swift */; }; @@ -247,8 +247,6 @@ EC930F47222B1EA7000D397C /* TreeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC930F45222B1EA7000D397C /* TreeView.swift */; }; EC930F48222B1EA7000D397C /* TreeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC930F45222B1EA7000D397C /* TreeView.swift */; }; EC9F9F552233C22000645634 /* TreeViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9F9F542233C22000645634 /* TreeViewTests.swift */; }; - ECA1943C2261352C00C500AC /* Differ.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CC225F7E4B001B1648 /* Differ.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - ECA1943E2261352C00C500AC /* ReactiveKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CD225F7E4B001B1648 /* ReactiveKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; ECAFB8D4200A7E3900EE0669 /* BNDInvocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECAFB8D3200A7E3900EE0669 /* BNDInvocation.swift */; }; ECAFB8D5200A7E3900EE0669 /* BNDInvocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECAFB8D3200A7E3900EE0669 /* BNDInvocation.swift */; }; ECAFB8D6200A7E3900EE0669 /* BNDInvocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECAFB8D3200A7E3900EE0669 /* BNDInvocation.swift */; }; @@ -345,8 +343,6 @@ ECFF44BC21692B5800B5EDB0 /* OutlineChangesetConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFF44BB21692B5800B5EDB0 /* OutlineChangesetConvertible.swift */; }; ECFF44BD21692B5800B5EDB0 /* OutlineChangesetConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFF44BB21692B5800B5EDB0 /* OutlineChangesetConvertible.swift */; }; ECFF44BE21692B5800B5EDB0 /* OutlineChangesetConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFF44BB21692B5800B5EDB0 /* OutlineChangesetConvertible.swift */; }; - ECFF843322612E120095040B /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CC225F7E4B001B1648 /* Differ.framework */; }; - ECFF843422612E120095040B /* ReactiveKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 824267CD225F7E4B001B1648 /* ReactiveKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -366,21 +362,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - ECA1943F2261352C00C500AC /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ECA1943E2261352C00C500AC /* ReactiveKit.framework in Embed Frameworks */, - ECA1943C2261352C00C500AC /* Differ.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 161D6D2D1D6F0D92004CA17D /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 16210A3C1D3EC474004AEDF3 /* Bond.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Bond.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -523,8 +504,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 824267CF225F7E4B001B1648 /* ReactiveKit.framework in Frameworks */, - 824267CE225F7E4B001B1648 /* Differ.framework in Frameworks */, + 90AD163823CE700D00925831 /* ReactiveKit in Frameworks */, + 90AD163A23CE700D00925831 /* Differ in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -533,8 +514,6 @@ buildActionMask = 2147483647; files = ( 16210A461D3EC474004AEDF3 /* Bond.framework in Frameworks */, - ECFF843322612E120095040B /* Differ.framework in Frameworks */, - ECFF843422612E120095040B /* ReactiveKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -550,8 +529,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 824267D3225F7E5F001B1648 /* Differ.framework in Frameworks */, - 824267D2225F7E5F001B1648 /* ReactiveKit.framework in Frameworks */, + 90AD163C23CE703800925831 /* ReactiveKit in Frameworks */, + 90AD163E23CE703800925831 /* Differ in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -559,8 +538,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 824267D7225F7E68001B1648 /* ReactiveKit.framework in Frameworks */, - 824267D6225F7E68001B1648 /* Differ.framework in Frameworks */, + 90AD164023CE70B300925831 /* ReactiveKit in Frameworks */, + 90AD164223CE70B300925831 /* Differ in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -923,6 +902,10 @@ dependencies = ( ); name = "Bond-iOS"; + packageProductDependencies = ( + 90AD163723CE700D00925831 /* ReactiveKit */, + 90AD163923CE700D00925831 /* Differ */, + ); productName = Bond; productReference = 16210A3C1D3EC474004AEDF3 /* Bond.framework */; productType = "com.apple.product-type.framework"; @@ -953,7 +936,6 @@ 16887E331D744ABB00EDA099 /* Sources */, 16887E341D744ABB00EDA099 /* Frameworks */, 16887E351D744ABB00EDA099 /* Resources */, - ECA1943F2261352C00C500AC /* Embed Frameworks */, ); buildRules = ( ); @@ -977,6 +959,10 @@ dependencies = ( ); name = "Bond-macOS"; + packageProductDependencies = ( + 90AD163B23CE703800925831 /* ReactiveKit */, + 90AD163D23CE703800925831 /* Differ */, + ); productName = "Bond-macOS"; productReference = 16D30EAE1D6591D300C2435D /* Bond.framework */; productType = "com.apple.product-type.framework"; @@ -994,6 +980,10 @@ dependencies = ( ); name = "Bond-tvOS"; + packageProductDependencies = ( + 90AD163F23CE70B300925831 /* ReactiveKit */, + 90AD164123CE70B300925831 /* Differ */, + ); productName = "Bond-tvOS"; productReference = 16D30ED61D65D11900C2435D /* Bond.framework */; productType = "com.apple.product-type.framework"; @@ -1048,6 +1038,10 @@ Base, ); mainGroup = 16210A321D3EC474004AEDF3; + packageReferences = ( + 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */, + 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */, + ); productRefGroup = 16210A3D1D3EC474004AEDF3 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1584,7 +1578,8 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = BUILDING_WITH_XCODE; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 4.2; SYSTEM_FRAMEWORK_SEARCH_PATHS = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1608,14 +1603,9 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1640,14 +1630,9 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1667,7 +1652,11 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "Swift-Bond.BondTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1684,7 +1673,11 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "Swift-Bond.BondTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1705,7 +1698,10 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Bond-App/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "Bond.Bond-App"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1726,7 +1722,10 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = "Bond-App/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "Bond.Bond-App"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1748,14 +1747,9 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; @@ -1783,14 +1777,9 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); FRAMEWORK_VERSION = A; INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; @@ -1816,13 +1805,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1850,13 +1834,8 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); INFOPLIST_FILE = "Supporting Files/$(PRODUCT_NAME)-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = ReactiveKit.Bond; PRODUCT_NAME = Bond; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1954,6 +1933,58 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "git@github.com:DeclarativeHub/ReactiveKit.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 3.15.6; + }; + }; + 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "git@github.com:tonyarnold/Differ.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.4.4; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 90AD163723CE700D00925831 /* ReactiveKit */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */; + productName = ReactiveKit; + }; + 90AD163923CE700D00925831 /* Differ */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */; + productName = Differ; + }; + 90AD163B23CE703800925831 /* ReactiveKit */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */; + productName = ReactiveKit; + }; + 90AD163D23CE703800925831 /* Differ */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */; + productName = Differ; + }; + 90AD163F23CE70B300925831 /* ReactiveKit */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */; + productName = ReactiveKit; + }; + 90AD164123CE70B300925831 /* Differ */ = { + isa = XCSwiftPackageProductDependency; + package = 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */; + productName = Differ; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 16210A331D3EC474004AEDF3 /* Project object */; } diff --git a/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..a19cfc57 --- /dev/null +++ b/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "Differ", + "repositoryURL": "git@github.com:tonyarnold/Differ.git", + "state": { + "branch": null, + "revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b", + "version": "1.4.4" + } + }, + { + "package": "ReactiveKit", + "repositoryURL": "git@github.com:DeclarativeHub/ReactiveKit.git", + "state": { + "branch": null, + "revision": "a45f218217175e7c933acc82681ec8ce62ec55a4", + "version": "3.15.6" + } + } + ] + }, + "version": 1 +} diff --git a/Package.resolved b/Package.resolved index 60153ee0..887d84b8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/tonyarnold/Differ.git", "state": { "branch": null, - "revision": "e2cca36e7258dd8add88ae46b5ea56509b066e21", - "version": "1.4.3" + "revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b", + "version": "1.4.4" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DeclarativeHub/ReactiveKit.git", "state": { "branch": null, - "revision": "318d99599469a53b0e0fcf0eb975dba75501ede6", - "version": "3.14.2" + "revision": "a45f218217175e7c933acc82681ec8ce62ec55a4", + "version": "3.15.6" } } ] diff --git a/Package.swift b/Package.swift index b13e8578..de8c13e9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.1 import PackageDescription let package = Package( @@ -10,8 +10,8 @@ let package = Package( .library(name: "Bond", targets: ["Bond"]) ], dependencies: [ - .package(url: "https://github.com/DeclarativeHub/ReactiveKit.git", .upToNextMajor(from: "3.14.2")), - .package(url: "https://github.com/tonyarnold/Differ.git", .upToNextMajor(from: "1.4.3")) + .package(url: "https://github.com/DeclarativeHub/ReactiveKit.git", .upToNextMajor(from: "3.15.6")), + .package(url: "https://github.com/tonyarnold/Differ.git", .upToNextMajor(from: "1.4.4")) ], targets: [ .target(name: "BNDProtocolProxyBase"), diff --git a/README.md b/README.md index b508d43e..b8e5fa13 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ If you have an extensions that makes your favourite framework work with Bond and ## Requirements * iOS 8.0+ / macOS 10.11+ / tvOS 9.0+ -* Swift 4.2 +* Xcode 11 / Swift 5.1 ## Communication @@ -245,7 +245,7 @@ If you have an extensions that makes your favourite framework work with Bond and The MIT License (MIT) -Copyright (c) 2015-2019 Srdan Rasic (@srdanrasic) +Copyright (c) 2015-2020 Srdan Rasic (@srdanrasic) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 67b3f1b1b058f255e06d7828ab8d6d97d40569cf Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 15 Jan 2020 09:03:13 +1100 Subject: [PATCH 2/4] Update dependencies and Swift versions for Carthage and CocoaPods --- Bond.podspec | 4 ++-- Cartfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bond.podspec b/Bond.podspec index fbc9988b..49c70b42 100644 --- a/Bond.podspec +++ b/Bond.podspec @@ -28,9 +28,9 @@ Pod::Spec.new do |s| s.osx.exclude_files = "Sources/Bond/UIKit" s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-DBUILDING_WITH_XCODE $(inherited)" } s.requires_arc = true - s.swift_version = '5.0' + s.swift_version = '5.1' - s.dependency "ReactiveKit", "~> 3.14" + s.dependency "ReactiveKit", "~> 3.15" s.dependency "Differ", "~> 1.4" end diff --git a/Cartfile b/Cartfile index 4ba06043..67eaad5f 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "DeclarativeHub/ReactiveKit" ~> 3.14 +github "DeclarativeHub/ReactiveKit" ~> 3.15 github "tonyarnold/Differ" ~> 1.4 From 8f04b16d0472d682848a69511c7d218b228f8a5e Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 15 Jan 2020 09:07:49 +1100 Subject: [PATCH 3/4] Update Travis CI simulator versions and update to the Xcode 11.3 osx_image --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d06f06c3..d2edfa1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: swift -osx_image: xcode10.2 +osx_image: xcode11.3 cache: directories: @@ -14,16 +14,15 @@ jobs: include: - stage: "Xcode" name: "Run tests on iOS" - script: xcrun xcodebuild test -destination "platform=iOS Simulator,OS=12.2,name=iPhone X" -workspace "Bond.xcworkspace" -scheme "Bond-iOS" + script: xcrun xcodebuild test -destination "platform=iOS Simulator,OS=13.3,name=iPhone 11" -workspace "Bond.xcworkspace" -scheme "Bond-iOS" after_success: 'bash <(curl -s https://codecov.io/bash)' - name: "Build for macOS" script: xcrun xcodebuild build -destination "platform=macOS" -workspace "Bond.xcworkspace" -scheme "Bond-macOS" - name: "Build for tvOS" - script: xcrun xcodebuild build -destination "platform=tvOS Simulator,OS=12.2,name=Apple TV 4K" -workspace "Bond.xcworkspace" -scheme "Bond-tvOS" + script: xcrun xcodebuild build -destination "platform=tvOS Simulator,OS=13.3,name=Apple TV 4K" -workspace "Bond.xcworkspace" -scheme "Bond-tvOS" - stage: "Swift Package Manager" name: "Run Tests" - script: swift test - \ No newline at end of file + script: swift test --enable-test-discovery From 3f2fa50080f4cce447198d422bf72e3079ce69db Mon Sep 17 00:00:00 2001 From: Tony Arnold Date: Wed, 15 Jan 2020 09:13:18 +1100 Subject: [PATCH 4/4] Use HTTPS Git URLs to reference dependencies --- Bond.xcodeproj/project.pbxproj | 4 ++-- Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bond.xcodeproj/project.pbxproj b/Bond.xcodeproj/project.pbxproj index 8a88d119..82af3796 100644 --- a/Bond.xcodeproj/project.pbxproj +++ b/Bond.xcodeproj/project.pbxproj @@ -1937,7 +1937,7 @@ /* Begin XCRemoteSwiftPackageReference section */ 90AD163523CE6FC500925831 /* XCRemoteSwiftPackageReference "ReactiveKit" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:DeclarativeHub/ReactiveKit.git"; + repositoryURL = "https://github.com/DeclarativeHub/ReactiveKit.git"; requirement = { kind = upToNextMajorVersion; minimumVersion = 3.15.6; @@ -1945,7 +1945,7 @@ }; 90AD163623CE700500925831 /* XCRemoteSwiftPackageReference "Differ" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "git@github.com:tonyarnold/Differ.git"; + repositoryURL = "https://github.com/tonyarnold/Differ.git"; requirement = { kind = upToNextMajorVersion; minimumVersion = 1.4.4; diff --git a/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved index a19cfc57..887d84b8 100644 --- a/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -3,7 +3,7 @@ "pins": [ { "package": "Differ", - "repositoryURL": "git@github.com:tonyarnold/Differ.git", + "repositoryURL": "https://github.com/tonyarnold/Differ.git", "state": { "branch": null, "revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b", @@ -12,7 +12,7 @@ }, { "package": "ReactiveKit", - "repositoryURL": "git@github.com:DeclarativeHub/ReactiveKit.git", + "repositoryURL": "https://github.com/DeclarativeHub/ReactiveKit.git", "state": { "branch": null, "revision": "a45f218217175e7c933acc82681ec8ce62ec55a4",