Merge pull request #32 from erwald/release/1.1.0

Release/1.1.0
ReactiveCocoa · Jul 21, 2017 · a571d47 · a571d47
2 parents 9253284 + 8792366
commit a571d47
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git 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

diff --git 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.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
@@ -1,6 +1,6 @@
-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.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/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git 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

diff --git a/ReactiveObjCBridge.podspec b/ReactiveObjCBridge.podspec
@@ -1,9 +1,9 @@
 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).
+                   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
@@ -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
diff --git a/ReactiveObjCBridge/Info.plist b/ReactiveObjCBridge/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>