Bgerstle has uploaded a new change for review. https://gerrit.wikimedia.org/r/199160
Change subject: use pessimistic version specifiers ...................................................................... use pessimistic version specifiers the "~>" specifier allows updates of unspecified semver components. in our case, "~> 1.5" is equivalent to ">= 1.5.0 && < 1.6" Change-Id: I8f3dee9dcc17c4427e6326876e2fb2ca4e11901e --- M Gemfile M Gemfile.lock M Podfile M Podfile.lock 4 files changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/60/199160/1 diff --git a/Gemfile b/Gemfile index 2f4cb5f..0b7a460 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org"; -gem 'cocoapods', '< 0.36' +gem 'cocoapods', '~> 0.36' diff --git a/Gemfile.lock b/Gemfile.lock index 2d80a5f..3e99319 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,35 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.0) + activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (0.7.0) - cocoapods (0.35.0) + claide (0.8.1) + cocoapods (0.36.0) activesupport (>= 3.2.15) - claide (~> 0.7.0) - cocoapods-core (= 0.35.0) - cocoapods-downloader (~> 0.8.0) - cocoapods-plugins (~> 0.3.1) - cocoapods-trunk (~> 0.4.1) - cocoapods-try (~> 0.4.2) + claide (~> 0.8.1) + cocoapods-core (= 0.36.0) + cocoapods-downloader (~> 0.8.1) + cocoapods-plugins (~> 0.4.1) + cocoapods-trunk (~> 0.6.0) + cocoapods-try (~> 0.4.3) colored (~> 1.2) escape (~> 0.0.4) - molinillo (~> 0.1.2) + molinillo (~> 0.2.1) nap (~> 0.8) open4 (~> 1.3) - xcodeproj (~> 0.20.2) - cocoapods-core (0.35.0) + xcodeproj (~> 0.23.0) + cocoapods-core (0.36.0) activesupport (>= 3.2.15) fuzzy_match (~> 2.0.4) nap (~> 0.8.0) cocoapods-downloader (0.8.1) - cocoapods-plugins (0.3.2) + cocoapods-plugins (0.4.1) nap - cocoapods-trunk (0.4.1) + cocoapods-trunk (0.6.0) nap (>= 0.8) netrc (= 0.7.8) cocoapods-try (0.4.3) @@ -39,14 +39,14 @@ i18n (0.7.0) json (1.8.2) minitest (5.5.1) - molinillo (0.1.2) + molinillo (0.2.1) nap (0.8.0) netrc (0.7.8) open4 (1.3.4) - thread_safe (0.3.4) + thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (0.20.2) + xcodeproj (0.23.0) activesupport (>= 3) colored (~> 1.2) @@ -54,4 +54,4 @@ ruby DEPENDENCIES - cocoapods (< 0.36) + cocoapods (~> 0.36) diff --git a/Podfile b/Podfile index fa37926..9cde2c9 100644 --- a/Podfile +++ b/Podfile @@ -1,13 +1,13 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, :deployment_target => '6.0' -pod 'AFNetworking', '< 2.6' -pod 'hpple', '< 0.3' -pod 'blockskit/Core', '< 2.3' -pod 'Masonry', '< 0.7' +pod 'AFNetworking', '~> 2.5' +pod 'hpple', '~> 0.2' +pod 'blockskit/Core', '~> 2.2' +pod 'Masonry', '~> 0.6' pod 'HockeySDK', '3.6.2' target 'WikipediaUnitTests', :exclusive => false do - pod 'OCMockito', '< 1.5' - pod 'OCHamcrest', '< 4.2' + pod 'OCMockito', '~> 1.4' + pod 'OCHamcrest', '~> 4.1' end diff --git a/Podfile.lock b/Podfile.lock index c47e40b..be2de22 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -29,13 +29,13 @@ - OCHamcrest (~> 4.0) DEPENDENCIES: - - AFNetworking (< 2.6) - - blockskit/Core (< 2.3) + - AFNetworking (~> 2.5) + - blockskit/Core (~> 2.2) - HockeySDK (= 3.6.2) - - hpple (< 0.3) - - Masonry (< 0.7) - - OCHamcrest (< 4.2) - - OCMockito (< 1.5) + - hpple (~> 0.2) + - Masonry (~> 0.6) + - OCHamcrest (~> 4.1) + - OCMockito (~> 1.4) SPEC CHECKSUMS: AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a -- To view, visit https://gerrit.wikimedia.org/r/199160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f3dee9dcc17c4427e6326876e2fb2ca4e11901e Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle <bgers...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
