From 1c6ad193ba76ed42723975b79d9670c27529d0bc Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Fri, 12 Jun 2020 16:21:20 -0700 Subject: [PATCH 1/4] Support for APPLICATION_EXTENSION_API_ONLY --- BonMot.podspec | 6 ++-- BonMot.xcodeproj/project.pbxproj | 52 ++++++++++++++++++---------- Example-iOS/Example-iOS.entitlements | 10 ++++++ Package.swift | 4 +-- Sources/UIKit/UIKit+Helpers.swift | 15 ++------ 5 files changed, 52 insertions(+), 35 deletions(-) create mode 100644 Example-iOS/Example-iOS.entitlements diff --git a/BonMot.podspec b/BonMot.podspec index 67e36473..b741446f 100644 --- a/BonMot.podspec +++ b/BonMot.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "BonMot" - s.version = "5.5.1" + s.version = "5.6.0" s.summary = "Beautiful, easy attributed strings in Swift" s.swift_versions = ["4.0", "4.2", "5.0"] s.description = <<-DESC @@ -13,10 +13,10 @@ Pod::Spec.new do |s| s.social_media_url = 'https://twitter.com/ZevEisenberg' s.requires_arc = true - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '10.0' s.ios.source_files = 'Sources/**/*.swift' - s.tvos.deployment_target = '9.0' + s.tvos.deployment_target = '10.0' s.tvos.source_files = 'Sources/**/*.swift' s.osx.deployment_target = '10.11' diff --git a/BonMot.xcodeproj/project.pbxproj b/BonMot.xcodeproj/project.pbxproj index 3bf71365..ad5e05be 100644 --- a/BonMot.xcodeproj/project.pbxproj +++ b/BonMot.xcodeproj/project.pbxproj @@ -332,6 +332,7 @@ CDEA84301D9EEC390099BD73 /* Image+Tinting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Image+Tinting.swift"; sourceTree = ""; }; CDEA84351D9EEC490099BD73 /* ImageTintingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageTintingTests.swift; sourceTree = ""; }; CDF7E97E1D9C612800FF46BF /* MutableCopying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MutableCopying.swift; sourceTree = ""; }; + D915E01024944361009F455B /* Example-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Example-iOS.entitlements"; sourceTree = ""; }; D9C5521023D24796001D7504 /* BonMot-iOSTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = "BonMot-iOSTests.xctestplan"; path = "Tests/BonMot-iOSTests.xctestplan"; sourceTree = ""; }; D9C5521123D24872001D7504 /* BonMot-OSXTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = "BonMot-OSXTests.xctestplan"; path = "Tests/BonMot-OSXTests.xctestplan"; sourceTree = ""; }; D9C5521223D248A0001D7504 /* BonMot-tvOSTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = "BonMot-tvOSTests.xctestplan"; path = "Tests/BonMot-tvOSTests.xctestplan"; sourceTree = ""; }; @@ -473,6 +474,7 @@ ABC7774C1DC29F3000815FB9 /* Example-iOS */ = { isa = PBXGroup; children = ( + D915E01024944361009F455B /* Example-iOS.entitlements */, ABC7775E1DC29F7700815FB9 /* DemoStrings.swift */, ABC777651DC29F7700815FB9 /* StyleViewController.swift */, ABC7775D1DC29F7700815FB9 /* CatalogViewController.swift */, @@ -790,14 +792,12 @@ }; ABC7774A1DC29F3000815FB9 = { CreatedOnToolsVersion = 8.0; - DevelopmentTeam = 2KJHM26Y46; LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; ABCBFD561D96E61000FAD37A = { CreatedOnToolsVersion = 8.0; LastSwiftMigration = 1020; - ProvisioningStyle = Automatic; }; ABCBFD5E1D96E61100FAD37A = { CreatedOnToolsVersion = 8.0; @@ -1351,7 +1351,7 @@ ABA75DE81D99E10400B64705 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1375,7 +1375,7 @@ ABA75DE91D99E10400B64705 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1401,10 +1401,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "Example-iOS/Example-iOS.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 2KJHM26Y46; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Example-iOS/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1412,6 +1414,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.Example-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1421,10 +1424,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "Example-iOS/Example-iOS.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 2KJHM26Y46; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Example-iOS/Resources/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1432,6 +1437,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.Example-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; + SUPPORTS_MACCATALYST = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1559,15 +1565,17 @@ ABCBFD691D96E61100FAD37A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1575,23 +1583,28 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.BonMot-iOS"; PRODUCT_NAME = BonMot; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; ABCBFD6A1D96E61100FAD37A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1599,8 +1612,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.BonMot-iOS"; PRODUCT_NAME = BonMot; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; @@ -1641,7 +1657,7 @@ ABCD3DEA1D96F6A500273936 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1658,14 +1674,14 @@ PRODUCT_NAME = BonMot; SDKROOT = appletvos; SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Debug; }; ABCD3DEB1D96F6A500273936 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; CODE_SIGN_IDENTITY = ""; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1682,7 +1698,7 @@ PRODUCT_NAME = BonMot; SDKROOT = appletvos; SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Release; }; @@ -1723,7 +1739,7 @@ ABCD3E231D980E4900273936 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1747,7 +1763,7 @@ ABCD3E241D980E4900273936 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = NO; + APPLICATION_EXTENSION_API_ONLY = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/Example-iOS/Example-iOS.entitlements b/Example-iOS/Example-iOS.entitlements new file mode 100644 index 00000000..ee95ab7e --- /dev/null +++ b/Example-iOS/Example-iOS.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/Package.swift b/Package.swift index 78742195..60371f3f 100644 --- a/Package.swift +++ b/Package.swift @@ -6,9 +6,9 @@ import PackageDescription let package = Package( name: "BonMot", platforms: [ - .iOS(.v9), + .iOS(.v10), .macOS(.v10_11), - .tvOS(.v9), + .tvOS(.v10), .watchOS(.v2), ], products: [ diff --git a/Sources/UIKit/UIKit+Helpers.swift b/Sources/UIKit/UIKit+Helpers.swift index c95b9bae..5b862b16 100644 --- a/Sources/UIKit/UIKit+Helpers.swift +++ b/Sources/UIKit/UIKit+Helpers.swift @@ -40,19 +40,10 @@ extension UITraitCollection { /// `UIApplication.shared.preferredContentSizeCategory` if the trait collection's /// `preferredContentSizeCategory` is `UIContentSizeCategory.unspecified`. public var bon_preferredContentSizeCategory: BonMotContentSizeCategory { - if #available(iOS 10.0, tvOS 10.0, *) { - if preferredContentSizeCategory != .unspecified { - return preferredContentSizeCategory - } - } - // `UIApplication.shared` is not a valid object in unit tests. Fall back - // to a default value if the delegate is nil. - if UIApplication.shared.delegate != nil { - return UIApplication.shared.preferredContentSizeCategory - } - else { - return UIContentSizeCategory.large + if preferredContentSizeCategory != .unspecified { + return preferredContentSizeCategory } + return UIScreen.main.traitCollection.preferredContentSizeCategory } } From 78025603aa7ef48d5f915d4a8da061fe578e4da8 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Fri, 18 Sep 2020 09:55:48 -0700 Subject: [PATCH 2/4] Use Xcode 11.7 on CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a24a57e..06c2bba1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,7 +100,7 @@ jobs: executors: xcode-11: macos: - xcode: "11.4.0" + xcode: "11.7.0" environment: LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 From de1f614a5dc144e02b595e33bb2efbba2bce9162 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Fri, 18 Sep 2020 10:06:20 -0700 Subject: [PATCH 3/4] Bump min deployment target for tests to iOS 10.0 --- BonMot.xcodeproj/project.pbxproj | 8 +- Gemfile.lock | 148 +++++++++++++++---------------- fastlane/README.md | 2 +- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/BonMot.xcodeproj/project.pbxproj b/BonMot.xcodeproj/project.pbxproj index ad5e05be..fa1c58ad 100644 --- a/BonMot.xcodeproj/project.pbxproj +++ b/BonMot.xcodeproj/project.pbxproj @@ -1625,7 +1625,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1642,7 +1642,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1715,7 +1715,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.BonMot-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Debug; }; @@ -1732,7 +1732,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.rightpoint.BonMot-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 10.0; }; name = Release; }; diff --git a/Gemfile.lock b/Gemfile.lock index 4d1feff6..c71c9114 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,33 +2,33 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.1) + algoliasearch (1.27.4) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.296.0) - aws-sdk-core (3.94.0) + aws-partitions (1.372.0) + aws-sdk-core (3.107.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.38.0) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.61.2) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-s3 (1.81.0) + aws-sdk-core (~> 3, >= 3.104.3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.1) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.3) circleci (2.0.3) circleci_artifact (0.1.0) @@ -38,11 +38,11 @@ GEM cork nap open4 (~> 1.3) - clamp (1.3.1) - cocoapods (1.9.1) + clamp (1.3.2) + cocoapods (1.9.3) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.9.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -58,7 +58,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.1) + cocoapods-core (1.9.3) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -67,93 +67,92 @@ GEM netrc (~> 0.11) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.3.0) + cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) commander-fastlane (4.4.6) highline (~> 1.7.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) cork (0.3.0) colored2 (~> 3.1) - danger (6.3.2) + danger (8.0.5) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (~> 0.9) + faraday (>= 0.9.0, < 2.0) faraday-http-cache (~> 2.0) - git (~> 1.6) - kramdown (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) terminal-table (~> 1) - danger-junit (1.0.0) + danger-junit (1.0.2) danger (> 2.0) ox (~> 2.0) - danger-swiftlint (0.24.2) + danger-swiftlint (0.24.4) danger rake (> 10) thor (~> 0.19) - danger-xcov (0.4.1) + danger-xcov (0.5.0) danger (>= 2.1) - xcov (>= 1.1.2) - declarative (0.0.10) + xcov (>= 1.7.3) + declarative (0.0.20) declarative-option (0.1.0) - digest-crc (0.5.1) + digest-crc (0.6.1) + rake (~> 13.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.5) - emoji_regex (1.0.1) + dotenv (2.7.6) + emoji_regex (3.0.0) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - excon (0.73.0) - faraday (0.17.3) + excon (0.76.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday-http-cache (2.2.0) faraday (>= 0.8) - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - fastimage (2.1.7) - fastlane (2.145.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.2.0) + fastlane (2.160.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.2, < 2.0.0) + babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored commander-fastlane (>= 4.4.6, < 5.0.0) dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 2.0) + emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) - faraday (~> 0.17) + faraday (~> 1.0) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.13.1) + faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.29.2, < 0.37.0) + google-api-client (>= 0.37.0, < 0.39.0) google-cloud-storage (>= 1.15.0, < 2.0.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) - jwt (~> 2.1.0) + jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multi_xml (~> 0.5) multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) - public_suffix (~> 2.0.0) - rubyzip (>= 1.3.0, < 2.0.0) + rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -165,13 +164,13 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - ffi (1.12.2) + ffi (1.13.1) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.6.0) + git (1.7.0) rchardet (~> 1.8) - google-api-client (0.36.4) + google-api-client (0.38.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) @@ -182,17 +181,17 @@ GEM google-cloud-core (1.5.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.3.1) + google-cloud-env (1.3.3) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.0) - google-cloud-storage (1.26.0) + google-cloud-errors (1.0.1) + google-cloud-storage (1.28.0) addressable (~> 2.5) digest-crc (~> 0.4) google-api-client (~> 0.33) google-cloud-core (~> 1.2) googleauth (~> 0.9) mini_mime (~> 1.0) - googleauth (0.12.0) + googleauth (0.13.1) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -206,35 +205,35 @@ GEM i18n (0.9.5) concurrent-ruby (~> 1.0) jmespath (1.4.0) - json (2.3.0) - jwt (2.1.0) - kramdown (2.1.0) + json (2.3.1) + jwt (2.2.2) + kramdown (2.3.0) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) memoist (0.16.2) mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.2) molinillo (0.6.6) - multi_json (1.14.1) - multi_xml (0.6.0) + multi_json (1.15.0) multipart-post (2.0.0) - nanaimo (0.2.6) + nanaimo (0.3.0) nap (1.1.0) naturally (2.2.0) netrc (0.11.0) no_proxy_fix (0.1.2) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - os (1.1.0) - ox (2.13.2) + os (1.1.1) + ox (2.13.4) plist (3.5.0) - public_suffix (2.0.5) + public_suffix (4.0.6) rake (13.0.1) rchardet (1.8.0) representable (3.0.4) @@ -242,9 +241,10 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) retriable (3.1.2) + rexml (3.2.4) rouge (2.0.7) ruby-macho (1.4.0) - rubyzip (1.3.0) + rubyzip (2.3.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) @@ -258,9 +258,9 @@ GEM CFPropertyList naturally slack-notifier (2.3.2) - slather (2.4.7) + slather (2.5.0) CFPropertyList (>= 2.2, < 4) - activesupport (>= 4.0.2, < 5) + activesupport clamp (~> 1.3) nokogiri (~> 1.8) xcodeproj (~> 1.7) @@ -270,10 +270,10 @@ GEM thor (0.20.3) thread_safe (0.3.6) tty-cursor (0.7.1) - tty-screen (0.7.1) + tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) @@ -283,13 +283,13 @@ GEM unf_ext (0.0.7.7) unicode-display_width (1.7.0) word_wrap (1.0.0) - xcodeproj (1.16.0) + xcodeproj (1.18.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) - xcov (1.7.2) + nanaimo (~> 0.3.0) + xcov (1.7.4) fastlane (>= 2.141.0, < 3.0.0) multipart-post slack-notifier @@ -300,7 +300,7 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) - xcresult (0.2.0) + xcresult (0.2.1) PLATFORMS ruby diff --git a/fastlane/README.md b/fastlane/README.md index 0ff60796..fb931b4b 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -12,7 +12,7 @@ Install _fastlane_ using ``` [sudo] gem install fastlane -NV ``` -or alternatively using `brew cask install fastlane` +or alternatively using `brew install fastlane` # Available Actions ### coverage_all From c11dc6ab8da687fb864045845fb2cc63115f95a8 Mon Sep 17 00:00:00 2001 From: Chris Ballinger Date: Fri, 18 Sep 2020 10:12:30 -0700 Subject: [PATCH 4/4] Update bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c71c9114..e8e3c90d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -318,4 +318,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.17.3 + 2.1.4