Merge branch 'master' into advance-by-timeinterval

carsten-wenderdel · web-flow · commit 4dfa99f53110 · 2021-07-23T09:05:42.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -6,4 +6,4 @@
 	url = https://github.com/Quick/Quick.git
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
-	url = https://github.com/jspahrsummers/xcconfigs.git
+	url = https://github.com/xcconfigs/xcconfigs.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # master
+*Please add new entries at the top.*
 
 1. `TestScheduler` can `advance` by `TimeInterval`. (#828)
 
-1. Fixed issue with `SignalProducer.Type.interval()` making Swift 5.3 a requirement. (#823 kudos to @mluisbrown) 
+1. Fixed spelling error in `Token` class documentation.
 
-*Please add new entries at the top.*
+# 6.6.1
+1. Updated Carthage xcconfig dependency to 1.1 for proper building arm64 macOS variants. (#826, kudos to @MikeChugunov)
+
+1. Fixed issue with `SignalProducer.Type.interval()` making Swift 5.3 a requirement. (#823 kudos to @mluisbrown) 
 
 # 6.6.0
 
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "jspahrsummers/xcconfigs" == 0.12
+github "xcconfigs/xcconfigs" ~> 1.1
 github "Quick/Quick" ~> 3.0.0
 github "Quick/Nimble" ~> 9.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "Quick/Nimble" "v9.0.0"
 github "Quick/Quick" "v3.0.0"
-github "jspahrsummers/xcconfigs" "0.12"
+github "xcconfigs/xcconfigs" "1.1"
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d
+Subproject commit 4ced0ad5a971220917994a4edfa6abf9702e3818
diff --git a/ReactiveSwift.podspec b/ReactiveSwift.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ReactiveSwift"
   # Version goes here and will be used to access the git tag later on, once we have a first release.
-  s.version      = "6.6.0"
+  s.version      = "6.6.1"
   s.summary      = "Streams of values over time"
   s.description  = <<-DESC
                    ReactiveSwift is a Swift framework inspired by Functional Reactive Programming. It provides APIs for composing and transforming streams of values over time.
diff --git a/ReactiveSwift.xcodeproj/project.pbxproj b/ReactiveSwift.xcodeproj/project.pbxproj
diff --git a/Sources/Lifetime.swift b/Sources/Lifetime.swift
@@ -88,7 +88,7 @@ extension Lifetime {
 	/// A token object which completes its associated `Lifetime` when
 	/// it deinitializes, or when `dispose()` is called.
 	///
-	/// It is generally used in conjuncion with `Lifetime` as a private
+	/// It is generally used in conjunction with `Lifetime` as a private
 	/// deinitialization trigger.
 	///
 	/// ```
