From ed38b2ce5af8b0345da9be57bde7f8d43104253d Mon Sep 17 00:00:00 2001 From: Daniel Thorpe Date: Tue, 22 Mar 2016 21:43:49 +0000 Subject: [PATCH 1/2] [VCD-14]: Updates typealias to associated type --- ValueCoding/ValueCoding.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ValueCoding/ValueCoding.swift b/ValueCoding/ValueCoding.swift index 753d4fa..24a97d6 100644 --- a/ValueCoding/ValueCoding.swift +++ b/ValueCoding/ValueCoding.swift @@ -30,7 +30,7 @@ public protocol CodingType { - see: ValueCoding */ - typealias ValueType + associatedtype ValueType /// The value type which is being encoded/decoded var value: ValueType { get } @@ -52,7 +52,7 @@ public protocol ValueCoding { - see: CodingType */ - typealias Coder: CodingType + associatedtype Coder: CodingType } // MARK: - Protocol Extensions From 8dfe14aa3eb7d67297372970e8424bab8fba6de7 Mon Sep 17 00:00:00 2001 From: Daniel Thorpe Date: Tue, 22 Mar 2016 21:58:08 +0000 Subject: [PATCH 2/2] [VCD-14]: Updates gem dependencies --- Gemfile.lock | 181 +++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 93 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4f975ac..0649092 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,36 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.5) + activesupport (4.2.6) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.3.8) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) babosa (1.0.2) - cert (1.2.7) - fastlane_core (>= 0.26.4, < 1.0.0) - spaceship (>= 0.15.1, < 1.0.0) + cert (1.4.0) + fastlane_core (>= 0.29.1, < 1.0.0) + spaceship (>= 0.22.0, < 1.0.0) claide (0.9.1) - coderay (1.1.0) colored (1.2) commander (4.3.5) highline (~> 1.7.2) - credentials_manager (0.13.0) + credentials_manager (0.15.0) colored + commander (>= 4.3.5) highline (>= 1.7.1) security - deliver (1.6.6) + deliver (1.10.5) credentials_manager (>= 0.12.0, < 1.0.0) fastimage (~> 1.6) - fastlane_core (>= 0.31.0, < 1.0.0) + fastlane_core (>= 0.37.0, < 1.0.0) plist (~> 3.1.0) - spaceship (>= 0.19.0, <= 1.0.0) - domain_name (0.5.25) + spaceship (>= 0.19.0, < 1.0.0) + domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) - dotenv (2.0.2) + dotenv (2.1.0) excon (0.45.4) - extlib (0.9.16) faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -45,35 +40,35 @@ GEM faraday (>= 0.7.4, < 0.10) fastimage (1.6.8) addressable (~> 2.3, >= 2.3.5) - fastlane (1.49.0) + fastlane (1.67.0) addressable (~> 2.3.8) - cert (>= 1.2.7, < 2.0.0) - credentials_manager (>= 0.13.0, < 1.0.0) - deliver (>= 1.6.5, < 2.0.0) - fastlane_core (>= 0.31.0, < 1.0.0) - frameit (>= 2.4.1, < 3.0.0) - gym (>= 1.1.6, < 2.0.0) + cert (>= 1.4.0, < 2.0.0) + credentials_manager (>= 0.15.0, < 1.0.0) + deliver (>= 1.10.5, < 2.0.0) + fastlane_core (>= 0.37.0, < 1.0.0) + frameit (>= 2.5.1, < 3.0.0) + gym (>= 1.6.2, < 2.0.0) krausefx-shenzhen (>= 0.14.7) - match (>= 0.2.2, < 1.0.0) - pem (>= 1.1.1, < 2.0.0) - pilot (>= 1.2.1, < 2.0.0) + match (>= 0.4.0, < 1.0.0) + pem (>= 1.3.0, < 2.0.0) + pilot (>= 1.4.1, < 2.0.0) plist (~> 3.1.0) - produce (>= 1.1.0, < 2.0.0) - scan (>= 0.3.3, < 1.0.0) - sigh (>= 1.2.1, < 2.0.0) + produce (>= 1.1.1, < 2.0.0) + scan (>= 0.5.2, < 1.0.0) + screengrab (>= 0.3.1, < 1.0.0) + sigh (>= 1.6.0, < 2.0.0) slack-notifier (~> 1.3) - snapshot (>= 1.4.2, < 2.0.0) - spaceship (>= 0.18.1, < 1.0.0) - supply (>= 0.2.2, < 1.0.0) + snapshot (>= 1.12.0, < 2.0.0) + spaceship (>= 0.24.0, < 1.0.0) + supply (>= 0.4.0, < 1.0.0) terminal-notifier (~> 1.6.2) terminal-table (~> 1.4.5) - xcode-install (~> 1.0.1) - xcodeproj (>= 0.20, < 1.0.0) + xcodeproj (>= 0.20, < 2.0.0) xcpretty (>= 0.2.1) - fastlane_core (0.32.0) + fastlane_core (0.39.0) babosa colored - commander (>= 4.3.5) + commander (= 4.3.5) credentials_manager (>= 0.11.0, < 1.0.0) excon (~> 0.45.0) highline (>= 1.7.2) @@ -83,31 +78,31 @@ GEM rubyzip (~> 1.1.6) sentry-raven (~> 0.15) terminal-table (~> 1.4.5) - frameit (2.4.1) + frameit (2.5.1) deliver (> 0.3) fastimage (~> 1.6.3) - fastlane_core (>= 0.16.0, < 1.0.0) + fastlane_core (>= 0.36.1, < 1.0.0) mini_magick (~> 4.0.2) - google-api-client (0.8.6) - activesupport (>= 3.2) + google-api-client (0.9.4) addressable (~> 2.3) - autoparse (~> 0.3) - extlib (~> 0.9) - faraday (~> 0.9) - googleauth (~> 0.3) - launchy (~> 2.4) - multi_json (~> 1.10) - retriable (~> 1.4) - signet (~> 0.6) - googleauth (0.5.0) + googleauth (~> 0.5) + httpclient (~> 2.7) + hurley (~> 0.1) + memoist (~> 0.11) + mime-types (>= 1.6) + representable (~> 2.3.0) + retriable (~> 2.0) + thor (~> 0.19) + googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) + os (~> 0.9) signet (~> 0.7) - gym (1.2.0) - fastlane_core (>= 0.25.0, < 1.0.0) + gym (1.6.2) + fastlane_core (>= 0.36.1, < 1.0.0) plist rubyzip (>= 1.1.7) terminal-table @@ -115,9 +110,11 @@ GEM highline (1.7.8) http-cookie (1.0.2) domain_name (~> 0.5) + httpclient (2.7.1) + hurley (0.2) i18n (0.7.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.3) krausefx-shenzhen (0.14.7) commander (~> 4.3) dotenv (>= 0.7) @@ -130,74 +127,74 @@ GEM rubyzip (~> 1.1) security (~> 0.1.3) terminal-table (~> 1.4.5) - launchy (2.4.3) - addressable (~> 2.3) little-plugger (1.1.4) - logging (2.0.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) - match (0.2.3) - cert (>= 1.2.7, < 2.0.0) + match (0.4.0) + cert (>= 1.2.8, < 2.0.0) credentials_manager (>= 0.13.0, < 1.0.0) - fastlane_core (>= 0.31.0, < 1.0.0) + fastlane_core (>= 0.39.0, < 1.0.0) security - sigh (>= 1.2.1, < 2.0.0) - spaceship (>= 0.18.1, < 1.0.0) + sigh (>= 1.2.2, < 2.0.0) + spaceship (>= 0.24.0, < 1.0.0) memoist (0.14.0) - method_source (0.8.2) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_magick (4.0.4) - minitest (5.8.3) + minitest (5.8.4) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (3.0.2) - pem (1.1.1) - fastlane_core (>= 0.30.0, < 1.0.0) - spaceship (>= 0.18.1, < 1.0.0) - pilot (1.2.1) + net-ssh (3.1.0) + os (0.9.6) + pem (1.3.0) + fastlane_core (>= 0.36.1, < 1.0.0) + spaceship (>= 0.22.0, < 1.0.0) + pilot (1.4.1) credentials_manager (>= 0.3.0) - fastlane_core (>= 0.31.0, < 1.0.0) - spaceship (>= 0.16.0, < 1.0.0) + fastlane_core (>= 0.36.5, < 1.0.0) + spaceship (>= 0.20.0, < 1.0.0) terminal-table (~> 1.4.5) plist (3.1.0) produce (1.1.1) fastlane_core (>= 0.30.0, < 1.0.0) spaceship (>= 0.16.0) - pry (0.10.3) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - retriable (1.4.1) + representable (2.3.0) + uber (~> 0.0.7) + retriable (2.1.0) rouge (1.10.1) rubyzip (1.1.7) - scan (0.3.3) - fastlane_core (>= 0.26.6, < 1.0.0) + scan (0.5.2) + fastlane_core (>= 0.36.1, < 1.0.0) slack-notifier (~> 1.3) terminal-table xcpretty (>= 0.2.1) xcpretty-travis-formatter (>= 0.0.3) + screengrab (0.3.1) + fastlane_core (>= 0.38.0, < 1.0.0) security (0.1.3) - sentry-raven (0.15.2) + sentry-raven (0.15.6) faraday (>= 0.7.6) - sigh (1.2.1) - fastlane_core (>= 0.26.4, < 1.0.0) + sigh (1.6.0) + fastlane_core (>= 0.36.1, < 1.0.0) plist (~> 3.1) - spaceship (>= 0.12.3) + spaceship (>= 0.22.0, < 1.0.0) signet (0.7.2) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) slack-notifier (1.5.1) - slop (3.6.0) - snapshot (1.4.2) + snapshot (1.12.1) fastimage (~> 1.6.3) - fastlane_core (>= 0.21.0, < 1.0.0) + fastlane_core (>= 0.36.1, < 1.0.0) plist (~> 3.1.0) xcpretty (>= 0.2.1) - spaceship (0.19.0) + spaceship (0.24.0) colored credentials_manager (>= 0.9.0) faraday (~> 0.9) @@ -206,22 +203,20 @@ GEM fastimage (~> 1.6) multi_xml (~> 0.5) plist (~> 3.1) - pry - supply (0.2.2) - credentials_manager (>= 0.10.0) - fastlane_core (>= 0.19.0) - google-api-client (~> 0.8.6) + supply (0.5.2) + credentials_manager (>= 0.15.0) + fastlane_core (>= 0.35.0) + google-api-client (~> 0.9.1) terminal-notifier (1.6.3) terminal-table (1.4.5) + thor (0.19.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) + uber (0.0.15) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - xcode-install (1.0.1) - claide (~> 0.9.1) - spaceship (>= 0.13.0, < 1.0.0) + unf_ext (0.0.7.2) xcodeproj (0.28.2) activesupport (>= 3) claide (~> 0.9.1)