From 444ad0cfaa5ad34e60183b505b9b7cb78b6090ed Mon Sep 17 00:00:00 2001 From: Vincent Isambart Date: Thu, 20 May 2021 15:23:42 +0900 Subject: [PATCH] Support for ARM64 Macs --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/DifferenceKit | 2 +- Package.resolved | 4 ++-- Package.swift | 2 +- XCConfigs/DiffableDataSources.xcconfig | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cartfile b/Cartfile index 02c9537..0028655 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ra1028/DifferenceKit" ~> 1.1 +github "ra1028/DifferenceKit" ~> 1.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 9ba02bd..a7d172a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ra1028/DifferenceKit" "1.1.4" +github "ra1028/DifferenceKit" "1.2.0" diff --git a/Carthage/Checkouts/DifferenceKit b/Carthage/Checkouts/DifferenceKit index bf0488b..62745d7 160000 --- a/Carthage/Checkouts/DifferenceKit +++ b/Carthage/Checkouts/DifferenceKit @@ -1 +1 @@ -Subproject commit bf0488b4683fbe113e8db9cf4dcf0d265ce39cfa +Subproject commit 62745d7780deef4a023a792a1f8f763ec7bf9705 diff --git a/Package.resolved b/Package.resolved index e5a9bc0..b547fdb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/ra1028/DifferenceKit.git", "state": { "branch": null, - "revision": "4eb31f8e85e4cb13732f9664d6e01e507cd592a0", - "version": "1.1.3" + "revision": "62745d7780deef4a023a792a1f8f763ec7bf9705", + "version": "1.2.0" } } ] diff --git a/Package.swift b/Package.swift index 66706dc..9e39c5b 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "DiffableDataSources", targets: ["DiffableDataSources"]) ], dependencies: [ - .package(url: "https://github.com/ra1028/DifferenceKit.git", .upToNextMinor(from: "1.1.0")) + .package(url: "https://github.com/ra1028/DifferenceKit.git", .upToNextMinor(from: "1.2.0")) ], targets: [ .target( diff --git a/XCConfigs/DiffableDataSources.xcconfig b/XCConfigs/DiffableDataSources.xcconfig index 1ede572..f863c18 100644 --- a/XCConfigs/DiffableDataSources.xcconfig +++ b/XCConfigs/DiffableDataSources.xcconfig @@ -5,11 +5,11 @@ TVOS_DEPLOYMENT_TARGET = 9.0 SDKROOT = SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator TARGETED_DEVICE_FAMILY = 1,2,3 -VALID_ARCHS[sdk=macosx*] = i386 x86_64 +VALID_ARCHS[sdk=macosx*] = arm64 i386 x86_64 VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s -VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64 +VALID_ARCHS[sdk=iphonesimulator*] = arm64 i386 x86_64 VALID_ARCHS[sdk=appletv*] = arm64 -VALID_ARCHS[sdk=appletvsimulator*] = x86_64 +VALID_ARCHS[sdk=appletvsimulator*] = arm64 x86_64 CODE_SIGN_IDENTITY = CODE_SIGN_STYLE = Manual