Skip to content

Commit a571d47

Browse files
authored
Merge pull request #32 from erwald/release/1.1.0
Release/1.1.0
2 parents 9253284 + 8792366 commit a571d47

10 files changed

+16
-16
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ matrix:
5151
env:
5252
- JOB=CARTHAGE-watchOS
5353
- script:
54-
- pod repo update --silent
54+
- pod repo update --verbose
5555
- pod lib lint --allow-warnings
5656
env:
5757
- JOB=PODSPEC

Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "ReactiveCocoa/ReactiveObjC" ~> 3.0.0
2-
github "ReactiveCocoa/ReactiveSwift" ~> 1.1
2+
github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5

Cartfile.private

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jspahrsummers/xcconfigs" "3d9d996"
22
github "Quick/Quick" ~> 1.1
3-
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
3+
github "Quick/Nimble" ~> 7.0.1

Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
1+
github "Quick/Nimble" "v7.0.1"
22
github "Quick/Quick" "v1.1.0"
33
github "ReactiveCocoa/ReactiveObjC" "3.0.0"
4-
github "antitypical/Result" "3.2.1"
4+
github "antitypical/Result" "3.2.3"
55
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
6-
github "ReactiveCocoa/ReactiveSwift" "1.1.2"
6+
github "ReactiveCocoa/ReactiveSwift" "1.1.5"

Carthage/Checkouts/Nimble

Submodule Nimble updated 91 files

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# ReactiveObjCBridge
22

3-
After announced Swift, ReactiveCocoa was rewritten in Swift. This framework
4-
creates a bridge between those Swift and Objective-C APIs ([ReactiveSwift][]
5-
and [ReactiveObjC][]).
3+
After the announcement of Swift, ReactiveCocoa was rewritten in Swift. This framework
4+
creates a bridge between those Swift and Objective-C APIs (now known as [ReactiveSwift][]
5+
and [ReactiveObjC][] respectively).
66

77
Because the APIs are based on fundamentally different designs, the conversion is
88
not always one-to-one; however, every attempt has been made to faithfully

ReactiveObjCBridge.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Pod::Spec.new do |s|
22
s.name = "ReactiveObjCBridge"
3-
s.version = "1.0.2"
3+
s.version = "1.1.0"
44
s.summary = "Bridge between ReactiveObjC and ReactiveSwift"
55
s.description = <<-DESC
6-
After announced Swift, ReactiveCocoa was rewritten in Swift. This framework creates a bridge between those Swift and Objective-C APIs (ReactiveSwift and ReactiveObjC).
6+
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).
77
88
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).
99
DESC
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
s.source_files = "ReactiveObjCBridge/*.{swift}"
2121

2222
s.dependency 'ReactiveObjC', '~> 3.0.0'
23-
s.dependency 'ReactiveSwift', '~> 1.1'
23+
s.dependency 'ReactiveSwift', '~> 1.1.5'
2424

2525
s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS[config=Release]" => "-suppress-warnings" }
2626
end

ReactiveObjCBridge/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.1</string>
18+
<string>1.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)