Merge pull request #37 from vincentisambart/arm64-mac

ra1028 · web-flow · commit 496ee1c17787 · 2021-06-09T00:03:59.000+09:00
Support for ARM64 Macs
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ra1028/DifferenceKit" ~> 1.1
+github "ra1028/DifferenceKit" ~> 1.2
diff --git 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
@@ -1 +1 @@
-Subproject commit bf0488b4683fbe113e8db9cf4dcf0d265ce39cfa
+Subproject commit 62745d7780deef4a023a792a1f8f763ec7bf9705
diff --git a/Package.resolved b/Package.resolved
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ra1028/DifferenceKit" ~> 1.1`
	`1`	`+github "ra1028/DifferenceKit" ~> 1.2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ra1028/DifferenceKit" "1.1.4"`
	`1`	`+github "ra1028/DifferenceKit" "1.2.0"`