From 7ac4754e08aac3f9c05284c42a069593b2398154 Mon Sep 17 00:00:00 2001 From: Zachary Waldowski Date: Sun, 27 May 2018 19:09:29 -0400 Subject: [PATCH 1/4] Update gems --- Gemfile.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6e1d6ff1..cb790f20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,10 +12,10 @@ GEM atomos (0.1.2) babosa (1.0.2) claide (1.0.2) - cocoapods (1.5.2) + cocoapods (1.5.3) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.2) + cocoapods-core (= 1.5.3) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,12 +31,12 @@ GEM nap (~> 1.0) ruby-macho (~> 1.1) xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.2) + cocoapods-core (1.5.3) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.0) + cocoapods-downloader (1.2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) @@ -58,7 +58,7 @@ GEM emoji_regex (0.1.1) escape (0.0.4) excon (0.62.0) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -66,7 +66,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.3) - fastlane (2.95.0) + fastlane (2.98.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -81,7 +81,7 @@ GEM faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.13.1, < 0.14.0) + google-api-client (>= 0.21.2, < 0.22.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -90,7 +90,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.1.0, < 2.0.0) + rubyzip (>= 1.2.1, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -100,15 +100,15 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.5.7, < 2.0.0) - xcpretty (>= 0.2.4, < 1.0.0) + xcpretty (~> 0.2.8) xcpretty-travis-formatter (>= 0.0.3) - ffi (1.9.23) + ffi (1.9.25) fourflusher (2.0.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-api-client (0.13.6) + google-api-client (0.21.2) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) @@ -127,7 +127,7 @@ GEM httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.9.2) + jazzy (0.9.3) cocoapods (~> 1.0) mustache (~> 0.99) open4 @@ -156,7 +156,7 @@ GEM mustache (0.99.8) nanaimo (0.2.5) nap (1.1.0) - naturally (2.1.0) + naturally (2.2.0) netrc (0.11.0) open4 (1.3.4) os (0.9.6) @@ -170,9 +170,9 @@ GEM declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - retriable (3.1.1) + retriable (3.1.2) rouge (2.0.7) - ruby-macho (1.1.0) + ruby-macho (1.2.0) rubyzip (1.2.1) sass (3.5.6) sass-listen (~> 4.0.0) @@ -205,11 +205,11 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) word_wrap (1.0.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.5.8) + xcodeproj (1.5.9) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.2) claide (>= 1.0.2, < 2.0) @@ -230,4 +230,4 @@ DEPENDENCIES semantic BUNDLED WITH - 1.16.1 + 1.16.2 From 4966f4740e9a8b34d2ec869de79d44e21f205478 Mon Sep 17 00:00:00 2001 From: Zachary Waldowski Date: Tue, 19 Jun 2018 12:45:10 -0400 Subject: [PATCH 2/4] Inhibit project update warnings --- Deferred.xcodeproj/project.pbxproj | 2 +- Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme | 2 +- .../xcshareddata/xcschemes/MobileDeferred.xcscheme | 2 +- Deferred.xcodeproj/xcshareddata/xcschemes/NanoDeferred.xcscheme | 2 +- Deferred.xcodeproj/xcshareddata/xcschemes/TVDeferred.xcscheme | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Deferred.xcodeproj/project.pbxproj b/Deferred.xcodeproj/project.pbxproj index 60ed75f9..c4e09d7f 100644 --- a/Deferred.xcodeproj/project.pbxproj +++ b/Deferred.xcodeproj/project.pbxproj @@ -625,7 +625,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Big Nerd Ranch"; TargetAttributes = { DB126C9F1E53685300054E95 = { diff --git a/Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme b/Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme index e9c78552..e175c2ba 100644 --- a/Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme +++ b/Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 11 Jun 2018 16:05:58 -0400 Subject: [PATCH 3/4] Improve compatibility with xcbuild --- Deferred.xcodeproj/project.pbxproj | 72 ++---------------------------- 1 file changed, 4 insertions(+), 68 deletions(-) diff --git a/Deferred.xcodeproj/project.pbxproj b/Deferred.xcodeproj/project.pbxproj index c4e09d7f..8119a827 100644 --- a/Deferred.xcodeproj/project.pbxproj +++ b/Deferred.xcodeproj/project.pbxproj @@ -258,13 +258,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - DB126C9C1E53685300054E95 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CA51E53685300054E95 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -273,13 +266,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CB81E53685C00054E95 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CC11E53685D00054E95 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -288,13 +274,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CD41E53686900054E95 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CDD1E53686900054E95 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -303,13 +282,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CF01E53687300054E95 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -496,10 +468,8 @@ isa = PBXNativeTarget; buildConfigurationList = DB126CB11E53685300054E95 /* Build configuration list for PBXNativeTarget "Deferred" */; buildPhases = ( - DB126C9B1E53685300054E95 /* Sources */, - DB126C9C1E53685300054E95 /* Frameworks */, DB126C9D1E53685300054E95 /* Headers */, - DB126C9E1E53685300054E95 /* Resources */, + DB126C9B1E53685300054E95 /* Sources */, ); buildRules = ( ); @@ -532,10 +502,8 @@ isa = PBXNativeTarget; buildConfigurationList = DB126CCD1E53685D00054E95 /* Build configuration list for PBXNativeTarget "MobileDeferred" */; buildPhases = ( - DB126CB71E53685C00054E95 /* Sources */, - DB126CB81E53685C00054E95 /* Frameworks */, DB126CB91E53685C00054E95 /* Headers */, - DB126CBA1E53685C00054E95 /* Resources */, + DB126CB71E53685C00054E95 /* Sources */, ); buildRules = ( ); @@ -568,10 +536,8 @@ isa = PBXNativeTarget; buildConfigurationList = DB126CE91E53686900054E95 /* Build configuration list for PBXNativeTarget "TVDeferred" */; buildPhases = ( - DB126CD31E53686900054E95 /* Sources */, - DB126CD41E53686900054E95 /* Frameworks */, DB126CD51E53686900054E95 /* Headers */, - DB126CD61E53686900054E95 /* Resources */, + DB126CD31E53686900054E95 /* Sources */, ); buildRules = ( ); @@ -604,10 +570,8 @@ isa = PBXNativeTarget; buildConfigurationList = DB126CF91E53687300054E95 /* Build configuration list for PBXNativeTarget "NanoDeferred" */; buildPhases = ( - DB126CEF1E53687300054E95 /* Sources */, - DB126CF01E53687300054E95 /* Frameworks */, DB126CF11E53687300054E95 /* Headers */, - DB126CF21E53687300054E95 /* Resources */, + DB126CEF1E53687300054E95 /* Sources */, ); buildRules = ( ); @@ -689,13 +653,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - DB126C9E1E53685300054E95 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CA61E53685300054E95 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -703,13 +660,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CBA1E53685C00054E95 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CC21E53685D00054E95 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -717,13 +667,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CD61E53686900054E95 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; DB126CDE1E53686900054E95 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -731,13 +674,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DB126CF21E53687300054E95 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ From 0d01f1998cea92aa5739ad30e06602140bd3927b Mon Sep 17 00:00:00 2001 From: Zachary Waldowski Date: Tue, 19 Jun 2018 12:46:30 -0400 Subject: [PATCH 4/4] Tag 3.3.2 --- BNRDeferred.podspec | 2 +- Configurations/Base.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BNRDeferred.podspec b/BNRDeferred.podspec index 21e01f3e..5abaf913 100644 --- a/BNRDeferred.podspec +++ b/BNRDeferred.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "BNRDeferred" - s.version = "3.3.1" + s.version = "3.3.2" s.summary = "Work with values that haven't been determined yet." s.description = <<-DESC diff --git a/Configurations/Base.xcconfig b/Configurations/Base.xcconfig index 23bc2cfe..bd543887 100755 --- a/Configurations/Base.xcconfig +++ b/Configurations/Base.xcconfig @@ -25,7 +25,7 @@ CODE_SIGN_IDENTITY = DEVELOPMENT_TEAM = // Versioning -CURRENT_PROJECT_VERSION = 3.3.1 +CURRENT_PROJECT_VERSION = 3.3.2 VERSION_INFO_PREFIX = VERSIONING_SYSTEM = apple-generic