Skip to content

Commit

Permalink
Merge pull request #84 from jakubvano/update_versions
Browse files Browse the repository at this point in the history
Update dependencies and release version
  • Loading branch information
yoichitgy authored Mar 8, 2018
2 parents 73be7c0 + 4a122ff commit e33350c
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
3.2
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ script:
- xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION"
-configuration Release ENABLE_TESTABILITY=YES ONLY_ACTIVE_ARCH=NO $ACTION | xcpretty
- if [ $POD_LINT == "YES" ]; then
pod repo update --silent;
pod repo update;
pod lib lint;
fi
notifications:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Swinject/Swinject" ~> 2.1
github "Swinject/Swinject" ~> 2.2
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Quick" ~> 1.1
github "Quick/Quick" ~> 1.2
github "Quick/Nimble" ~> 7.0
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v7.0.1"
github "Quick/Quick" "v1.1.0"
github "Swinject/Swinject" "2.1.1"
github "Quick/Nimble" "v7.0.3"
github "Quick/Quick" "v1.2.0"
github "Swinject/Swinject" "2.2.0"
2 changes: 1 addition & 1 deletion Sources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.2</string>
<string>1.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions SwinjectStoryboard.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SwinjectStoryboard"
s.version = "1.1.2"
s.version = "1.2.0"
s.summary = "Swinject extension for automatic dependency injection via Storyboard"
s.description = <<-DESC
SwinjectStoryboard is an extension of Swinject to automatically inject dependency to view controllers instantiated by a storyboard.
Expand All @@ -17,6 +17,6 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
s.dependency 'Swinject', '~> 2.1'
s.dependency 'Swinject', '~> 2.2'
s.requires_arc = true
end

0 comments on commit e33350c

Please sign in to comment.