From 351fccc12fa69790ec0741290dd7a9bd7f34361f Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Tue, 18 Jul 2017 21:55:20 +0200 Subject: [PATCH 1/7] Update ReactiveSwift to 1.1.5. --- Cartfile | 2 +- Cartfile.resolved | 4 ++-- Carthage/Checkouts/ReactiveSwift | 2 +- Carthage/Checkouts/Result | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile b/Cartfile index fbfd8dba4..f79286220 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0 -github "ReactiveCocoa/ReactiveSwift" ~> 1.1 +github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5 diff --git a/Cartfile.resolved b/Cartfile.resolved index fc047a70d..d7ccdd61b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034" github "Quick/Quick" "v1.1.0" github "ReactiveCocoa/ReactiveObjC" "3.0.0" -github "antitypical/Result" "3.2.1" +github "antitypical/Result" "3.2.3" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" -github "ReactiveCocoa/ReactiveSwift" "1.1.2" +github "ReactiveCocoa/ReactiveSwift" "1.1.5" diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index 1ef76118c..7edae8c3a 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit 1ef76118cdf0843b3a4c11952c786ec76f456ae3 +Subproject commit 7edae8c3a99fcfa9ed1213d8f52d468292960f1d diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 2af7c1460..c84461852 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 2af7c146071c8d8fb3953f19924ecebf15c88ea7 +Subproject commit c8446185238659a2b27c0261f64ff1254291d07d From 07adcc9cd7c23bc2eb38caf9cadb4d3ea6b5c2f4 Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Tue, 18 Jul 2017 22:07:09 +0200 Subject: [PATCH 2/7] Update Nimble to 7.0.1. --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Nimble | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 04fba310d..0246f3047 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "3d9d996" github "Quick/Quick" ~> 1.1 -github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034" +github "Quick/Nimble" ~> 7.0.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index d7ccdd61b..8129f761e 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034" +github "Quick/Nimble" "v7.0.1" github "Quick/Quick" "v1.1.0" github "ReactiveCocoa/ReactiveObjC" "3.0.0" github "antitypical/Result" "3.2.3" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 8116a8386..39b670023 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 8116a83864ee78339798c3ef425c42f6ca6bf034 +Subproject commit 39b67002306fda9de4c9fd1290a6295f97edd09e From 019df4df4a967f65dd4960edceab2e6e27f6c7ef Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Wed, 19 Jul 2017 00:14:21 +0200 Subject: [PATCH 3/7] Update version number to 1.1.0. --- ReactiveObjCBridge/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactiveObjCBridge/Info.plist b/ReactiveObjCBridge/Info.plist index 26300228c..0ff447ce2 100644 --- a/ReactiveObjCBridge/Info.plist +++ b/ReactiveObjCBridge/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.1 + 1.1.0 CFBundleSignature ???? CFBundleVersion From 2296cf90989247a2ee2b6bf0b5ca9d302eb9aad4 Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Wed, 19 Jul 2017 00:17:39 +0200 Subject: [PATCH 4/7] Update podspec to v1.1.0. Update ReactiveSwift requirement in podspec. --- ReactiveObjCBridge.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactiveObjCBridge.podspec b/ReactiveObjCBridge.podspec index 036857823..818b2dbac 100644 --- a/ReactiveObjCBridge.podspec +++ b/ReactiveObjCBridge.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ReactiveObjCBridge" - s.version = "1.0.2" + s.version = "1.1.0" s.summary = "Bridge between ReactiveObjC and ReactiveSwift" s.description = <<-DESC After announced Swift, ReactiveCocoa was rewritten in Swift. This framework creates a bridge between those Swift and Objective-C APIs (ReactiveSwift and ReactiveObjC). @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.source_files = "ReactiveObjCBridge/*.{swift}" s.dependency 'ReactiveObjC', '~> 3.0.0' - s.dependency 'ReactiveSwift', '~> 1.1' + s.dependency 'ReactiveSwift', '~> 1.1.5' s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS[config=Release]" => "-suppress-warnings" } end From 0aaddda296028e3821d17074f9f1bfce4a0483b4 Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Wed, 19 Jul 2017 00:18:21 +0200 Subject: [PATCH 5/7] Improve wording in podspec description. --- ReactiveObjCBridge.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactiveObjCBridge.podspec b/ReactiveObjCBridge.podspec index 818b2dbac..013ddc4c8 100644 --- a/ReactiveObjCBridge.podspec +++ b/ReactiveObjCBridge.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.version = "1.1.0" s.summary = "Bridge between ReactiveObjC and ReactiveSwift" s.description = <<-DESC - After announced Swift, ReactiveCocoa was rewritten in Swift. This framework creates a bridge between those Swift and Objective-C APIs (ReactiveSwift and ReactiveObjC). + After the announcement of Swift, ReactiveCocoa was rewritten in Swift. This framework creates a bridge between those Swift and Objective-C APIs (now known as ReactiveSwift and ReactiveObjC respectively). Because the APIs are based on fundamentally different designs, the conversion is not always one-to-one; however, every attempt has been made to faithfully translate the concepts between the two APIs (and languages). DESC From 16b2111a9a0676c9977a55cf8ce9320afa95270b Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Wed, 19 Jul 2017 00:23:02 +0200 Subject: [PATCH 6/7] Improve wording of readme opening. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cd512b905..7151a70bf 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ReactiveObjCBridge -After announced Swift, ReactiveCocoa was rewritten in Swift. This framework -creates a bridge between those Swift and Objective-C APIs ([ReactiveSwift][] -and [ReactiveObjC][]). +After the announcement of Swift, ReactiveCocoa was rewritten in Swift. This framework +creates a bridge between those Swift and Objective-C APIs (now known as [ReactiveSwift][] +and [ReactiveObjC][] respectively). Because the APIs are based on fundamentally different designs, the conversion is not always one-to-one; however, every attempt has been made to faithfully From 87923662c8a260c40cabbe4e2df4eb7a9b775433 Mon Sep 17 00:00:00 2001 From: Erich Grunewald Date: Thu, 20 Jul 2017 22:56:05 +0200 Subject: [PATCH 7/7] In travis config, do pod repo update verbosely. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82b62fd16..d4fd27285 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ matrix: env: - JOB=CARTHAGE-watchOS - script: - - pod repo update --silent + - pod repo update --verbose - pod lib lint --allow-warnings env: - JOB=PODSPEC