From 178ace02867239044fe7073a49f25d59f8210f47 Mon Sep 17 00:00:00 2001 From: "Lippmann, Erik" Date: Wed, 13 Mar 2024 17:34:19 +0100 Subject: [PATCH 1/4] [action][swiftlint] Adds '--progress' flag available from swiftlint 0.49.1 and above. --- Gemfile.lock | 393 ------------------ fastlane/lib/fastlane/actions/swiftlint.rb | 9 +- fastlane/spec/actions_specs/swiftlint_spec.rb | 39 ++ .../project.pbxproj | 17 +- 4 files changed, 63 insertions(+), 395 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 744377ec302..00000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,393 +0,0 @@ -PATH - remote: . - specs: - fastlane (2.219.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.8, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored (~> 1.2) - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.3) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, < 2.0.0) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - http-cookie (~> 1.0.5) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (>= 2.0.0, < 3.0.0) - naturally (~> 2.2) - optparse (>= 0.1.1, < 1.0.0) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.5) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (~> 3) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.6) - rexml - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) - ast (2.4.2) - atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.876.0) - aws-sdk-core (3.190.1) - aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.75.0) - aws-sdk-core (~> 3, >= 3.188.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.142.0) - aws-sdk-core (~> 3, >= 3.189.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - byebug (11.1.3) - claide (1.0.3) - claide-plugins (0.9.2) - cork - nap - open4 (~> 1.3) - climate_control (0.2.0) - coderay (1.1.3) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - cork (0.3.0) - colored2 (~> 3.1) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) - crack (0.4.5) - rexml - danger (8.6.1) - claide (~> 1.0) - claide-plugins (>= 0.9.2) - colored2 (~> 3.1) - cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) - faraday-http-cache (~> 2.0) - git (~> 1.7) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0) - no_proxy_fix - octokit (~> 4.7) - terminal-table (>= 1, < 4) - danger-junit (1.0.2) - danger (> 2.0) - ox (~> 2.0) - debug_inspector (1.0.0) - declarative (0.0.20) - diff-lcs (1.5.0) - digest-crc (0.6.5) - rake (>= 12.0.0, < 14.0.0) - docile (1.3.5) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.8.1) - emoji_regex (3.2.3) - excon (0.108.0) - fakefs (1.8.0) - faraday (1.4.1) - faraday-excon (~> 1.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-excon (1.1.0) - faraday-http-cache (2.5.0) - faraday (>= 0.8) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - faraday_middleware (1.2.0) - faraday (~> 1.0) - fastimage (2.3.0) - fastlane-plugin-clubmate (0.1.0) - fastlane-plugin-ruby (0.1.3) - fastlane-plugin-slack_train (0.2.0) - gh_inspector (1.1.3) - git (1.18.0) - addressable (~> 2.8) - rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.54.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.2) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-playcustomapp_v1 (0.13.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.29.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) - google-cloud-env (>= 1.0, < 3.a) - google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.45.0) - addressable (~> 2.8) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) - google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) - mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - hashdiff (1.0.1) - highline (2.0.3) - http-cookie (1.0.5) - domain_name (~> 0.5) - httpclient (2.8.3) - interception (0.5) - jmespath (1.6.2) - json (2.5.1) - jwt (2.7.1) - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - method_source (1.0.0) - mime-types (3.5.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) - mini_magick (4.12.0) - mini_mime (1.1.5) - multi_json (1.15.0) - multipart-post (2.0.0) - mustermann (2.0.2) - ruby2_keywords (~> 0.0.1) - nanaimo (0.3.0) - nap (1.1.0) - naturally (2.2.1) - no_proxy_fix (0.1.2) - octokit (4.25.1) - faraday (>= 1, < 3) - sawyer (~> 0.9) - open4 (1.3.4) - optparse (0.4.0) - os (1.1.4) - ox (2.13.2) - parallel (1.23.0) - parser (3.2.2.3) - ast (~> 2.4.1) - racc - plist (3.7.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.8.0) - byebug (~> 11.0) - pry (~> 0.10) - pry-rescue (1.5.2) - interception (>= 0.5) - pry (>= 0.12.0) - pry-stack_explorer (0.4.12) - binding_of_caller (~> 0.7) - pry (~> 0.13) - public_suffix (5.0.4) - racc (1.7.1) - rack (2.2.8) - rack-protection (2.2.4) - rack - rainbow (3.1.1) - rake (13.0.3) - rb-readline (0.5.5) - rchardet (1.8.0) - regexp_parser (2.8.1) - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.6) - rouge (2.0.7) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rspec_junit_formatter (0.4.1) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.50.2) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-performance (1.10.2) - rubocop (>= 0.90.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-require_tools (0.1.2) - rubocop (>= 0.49.1) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - sawyer (0.9.2) - addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) - security (0.1.5) - signet (0.18.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.10) - CFPropertyList - naturally - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sinatra (2.2.4) - mustermann (~> 2.0) - rack (~> 2.2) - rack-protection (= 2.2.4) - tilt (~> 2.0) - slack-notifier (2.3.2) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - terminal-notifier (2.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thor (1.1.0) - tilt (2.3.0) - tins (1.28.0) - sync - trailblazer-option (0.1.2) - tty-cursor (0.7.1) - tty-screen (0.8.2) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) - webmock (3.18.1) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.1) - word_wrap (1.0.0) - xcode-install (2.6.8) - claide (>= 0.9.1, < 1.1.0) - fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.22.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcov (1.4.3) - fastlane (>= 2.82.0, < 3.0.0) - multipart-post - slack-notifier - terminal-table - xcodeproj - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - yard (0.9.26) - -PLATFORMS - ruby - -DEPENDENCIES - climate_control (~> 0.2.0) - coveralls (~> 0.8.13) - danger (~> 8.0) - danger-junit (~> 1.0) - fakefs (= 1.8) - fastlane! - fastlane-plugin-clubmate - fastlane-plugin-ruby - fastlane-plugin-slack_train (>= 0.2.0) - mime-types (>= 1.16, < 4.0) - ox (= 2.13.2) - pry - pry-byebug - pry-rescue - pry-stack_explorer - rake - rb-readline - rspec (~> 3.10) - rspec_junit_formatter (~> 0.4.1) - rubocop (= 1.50.2) - rubocop-performance - rubocop-require_tools - sinatra (>= 2.2.3, < 3.0) - webmock (~> 3.18) - xcode-install (>= 2.6.7) - xcov (~> 1.4.1) - yard (~> 0.9.11) - -BUNDLED WITH - 2.3.21 diff --git a/fastlane/lib/fastlane/actions/swiftlint.rb b/fastlane/lib/fastlane/actions/swiftlint.rb index a282add405e..1f25c9f43cc 100644 --- a/fastlane/lib/fastlane/actions/swiftlint.rb +++ b/fastlane/lib/fastlane/actions/swiftlint.rb @@ -57,6 +57,7 @@ def self.optional_flags(params) command << supported_option_switch(params, :format, "0.11.0", true) if params[:mode] == :autocorrect command << supported_no_cache_option(params) if params[:no_cache] command << " --compiler-log-path #{params[:compiler_log_path].shellescape}" if params[:compiler_log_path] + command << supported_option_switch(params, :progress, "0.49.1", true) if params[:progress] return command end @@ -182,7 +183,13 @@ def self.available_options optional: true, verify_block: proc do |value| UI.user_error!("Couldn't find compiler_log_path '#{File.expand_path(value)}'") unless File.exist?(value) - end) + end), + FastlaneCore::ConfigItem.new(key: :progress, + env_name: "FL_SWIFTLINT_PROGRESS", + description: "Show a live-updating progress bar instead of each file being processed", + default_value: false, + type: Boolean, + optional: true) ] end diff --git a/fastlane/spec/actions_specs/swiftlint_spec.rb b/fastlane/spec/actions_specs/swiftlint_spec.rb index 2147c77fff2..2965b59ea8b 100644 --- a/fastlane/spec/actions_specs/swiftlint_spec.rb +++ b/fastlane/spec/actions_specs/swiftlint_spec.rb @@ -503,6 +503,45 @@ end.to raise_error(/Couldn't find compiler_log_path '.*#{path}'/) end end + + context "when specifying progress option" do + it "adds progress option" do + allow(Fastlane::Actions::SwiftlintAction).to receive(:swiftlint_version).and_return(Gem::Version.new('0.49.1')) + + result = Fastlane::FastFile.new.parse("lane :test do + swiftlint( + progress: true + ) + end").runner.execute(:test) + + expect(result).to eq("swiftlint lint --progress") + end + + it "omits progress option if swiftlint does not support it" do + allow(Fastlane::Actions::SwiftlintAction).to receive(:swiftlint_version).and_return(Gem::Version.new('0.49.0')) + expect(FastlaneCore::UI).to receive(:important).with(/Your version of swiftlint \(0.49.0\) does not support/) + + result = Fastlane::FastFile.new.parse("lane :test do + swiftlint( + progress: true + ) + end").runner.execute(:test) + + expect(result).to eq("swiftlint lint") + end + end + + context "when specify false for progress option" do + it "doesn't add progress option" do + result = Fastlane::FastFile.new.parse("lane :test do + swiftlint( + progress: false + ) + end").runner.execute(:test) + + expect(result).to eq("swiftlint lint") + end + end end end end diff --git a/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj b/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj index 0d624db4403..2a6a9ab2302 100644 --- a/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj +++ b/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ B3BA65AD1F5A269100B34850 /* SocketResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65A41F5A269100B34850 /* SocketResponse.swift */; }; B3BA65AF1F5A2D5C00B34850 /* RunnerArgument.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65AE1F5A2D5C00B34850 /* RunnerArgument.swift */; }; C0459CAC27261897002CDFB9 /* FastlaneRunner in CopyFiles */ = {isa = PBXBuildFile; fileRef = D556D6A91F6A08F5003108E3 /* FastlaneRunner */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + D05E6975E2038C05962DFCD0 /* FastlaneRunner in FastlaneRunnerCopySigned */ = {isa = PBXBuildFile; fileRef = D556D6A91F6A08F5003108E3 /* FastlaneRunner */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D55B28C31F6C588300DC42C5 /* Deliverfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BC1F6C588300DC42C5 /* Deliverfile.swift */; }; D55B28C41F6C588300DC42C5 /* Gymfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BD1F6C588300DC42C5 /* Gymfile.swift */; }; D55B28C51F6C588300DC42C5 /* Matchfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BE1F6C588300DC42C5 /* Matchfile.swift */; }; @@ -46,13 +47,24 @@ C0459CAB27261886002CDFB9 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = $SRCROOT/../..; + dstPath = "$SRCROOT/../.."; dstSubfolderSpec = 0; files = ( C0459CAC27261897002CDFB9 /* FastlaneRunner in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; + CD506EA15202229DCA770DC6 /* FastlaneRunnerCopySigned */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "$SRCROOT/../.."; + dstSubfolderSpec = 0; + files = ( + D05E6975E2038C05962DFCD0 /* FastlaneRunner in FastlaneRunnerCopySigned */, + ); + name = FastlaneRunnerCopySigned; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -199,6 +211,7 @@ B33BAF531F51F8D90001A751 /* Sources */, B33BAF541F51F8D90001A751 /* Frameworks */, C0459CAB27261886002CDFB9 /* CopyFiles */, + CD506EA15202229DCA770DC6 /* FastlaneRunnerCopySigned */, ); buildRules = ( ); @@ -404,6 +417,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; @@ -416,6 +430,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.0; }; From 7e79a433747ae3bb57070a0541505a7523523478 Mon Sep 17 00:00:00 2001 From: "Lippmann, Erik" Date: Wed, 13 Mar 2024 21:04:12 +0100 Subject: [PATCH 2/4] Adds missing `Gemfile.lock`. --- Gemfile.lock | 409 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 409 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000000..97a6dcb5dbb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,409 @@ +PATH + remote: . + specs: + fastlane (2.219.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.17) + ast (2.4.2) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.896.0) + aws-sdk-core (3.191.3) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.144.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + bigdecimal (3.1.6) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) + byebug (11.1.3) + claide (1.1.0) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) + climate_control (0.2.0) + coderay (1.1.3) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + cork (0.3.0) + colored2 (~> 3.1) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crack (1.0.0) + bigdecimal + rexml + danger (8.6.1) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (>= 0.9.0, < 2.0) + faraday-http-cache (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 4.7) + terminal-table (>= 1, < 4) + danger-junit (1.0.2) + danger (> 2.0) + ox (~> 2.0) + debug_inspector (1.2.0) + declarative (0.0.20) + diff-lcs (1.5.1) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + docile (1.4.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.110.0) + fakefs (1.8.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.5.1) + faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.3.0) + fastlane-plugin-clubmate (0.1.0) + fastlane-plugin-ruby (0.1.3) + fastlane-plugin-slack_train (0.2.0) + gh_inspector (1.1.3) + git (1.19.1) + addressable (~> 2.8) + rchardet (~> 1.8) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + hashdiff (1.1.0) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + interception (0.5) + jmespath (1.6.2) + json (2.7.1) + jwt (2.8.1) + base64 + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + method_source (1.0.0) + mime-types (3.5.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2024.0305) + mini_magick (4.12.0) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.0) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + nanaimo (0.3.0) + nap (1.1.0) + naturally (2.2.1) + nkf (0.2.0) + no_proxy_fix (0.1.2) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + open4 (1.3.4) + optparse (0.4.0) + os (1.1.4) + ox (2.13.2) + parallel (1.24.0) + parser (3.3.0.5) + ast (~> 2.4.1) + racc + plist (3.7.1) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) + byebug (~> 11.0) + pry (>= 0.13, < 0.15) + pry-rescue (1.6.0) + interception (>= 0.5) + pry (>= 0.12.0) + pry-stack_explorer (0.6.1) + binding_of_caller (~> 1.0) + pry (~> 0.13) + public_suffix (5.0.4) + racc (1.7.3) + rack (2.2.8.1) + rack-protection (2.2.4) + rack + rainbow (3.1.1) + rake (13.1.0) + rb-readline (0.5.5) + rchardet (1.8.0) + regexp_parser (2.9.0) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.6) + rouge (2.0.7) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.50.2) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-require_tools (0.1.2) + rubocop (>= 0.49.1) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sinatra (2.2.4) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.4) + tilt (~> 2.0) + slack-notifier (2.4.0) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.3.1) + tilt (2.3.0) + tins (1.32.1) + sync + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.5.0) + webmock (3.23.0) + addressable (>= 2.8.0) + crack (>= 0.3.2) + hashdiff (>= 0.4.0, < 2.0.0) + word_wrap (1.0.0) + xcode-install (2.8.1) + claide (>= 0.9.1) + fastlane (>= 2.1.0, < 3.0.0) + xcodeproj (1.24.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcov (1.4.3) + fastlane (>= 2.82.0, < 3.0.0) + multipart-post + slack-notifier + terminal-table + xcodeproj + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + yard (0.9.36) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + climate_control (~> 0.2.0) + coveralls (~> 0.8.13) + danger (~> 8.0) + danger-junit (~> 1.0) + fakefs (= 1.8) + fastlane! + fastlane-plugin-clubmate + fastlane-plugin-ruby + fastlane-plugin-slack_train (>= 0.2.0) + mime-types (>= 1.16, < 4.0) + ox (= 2.13.2) + pry + pry-byebug + pry-rescue + pry-stack_explorer + rake + rb-readline + rspec (~> 3.10) + rspec_junit_formatter (~> 0.4.1) + rubocop (= 1.50.2) + rubocop-performance + rubocop-require_tools + sinatra (>= 2.2.3, < 3.0) + webmock (~> 3.18) + xcode-install (>= 2.6.7) + xcov (~> 1.4.1) + yard (~> 0.9.11) + +BUNDLED WITH + 2.5.6 From e56cde21d9e95d6da5610f1603522d4f1fb770e3 Mon Sep 17 00:00:00 2001 From: "Lippmann, Erik" Date: Wed, 13 Mar 2024 21:17:04 +0100 Subject: [PATCH 3/4] Back to original `Gemfile.lock`. --- Gemfile.lock | 176 +++++++++++++++++++++++---------------------------- 1 file changed, 80 insertions(+), 96 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 97a6dcb5dbb..744377ec302 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,38 +46,34 @@ PATH GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.7) - base64 - nkf + CFPropertyList (3.0.6) rexml - addressable (2.8.6) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.17) + artifactory (3.0.15) ast (2.4.2) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.896.0) - aws-sdk-core (3.191.3) + aws-partitions (1.876.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.144.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - base64 (0.2.0) - bigdecimal (3.1.6) - binding_of_caller (1.0.1) - debug_inspector (>= 1.2.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) byebug (11.1.3) - claide (1.1.0) + claide (1.0.3) claide-plugins (0.9.2) cork nap @@ -96,8 +92,7 @@ GEM term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crack (1.0.0) - bigdecimal + crack (0.4.5) rexml danger (8.6.1) claide (~> 1.0) @@ -115,45 +110,32 @@ GEM danger-junit (1.0.2) danger (> 2.0) ox (~> 2.0) - debug_inspector (1.2.0) + debug_inspector (1.0.0) declarative (0.0.20) - diff-lcs (1.5.1) + diff-lcs (1.5.0) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - docile (1.4.0) - domain_name (0.6.20240107) + docile (1.3.5) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.110.0) + excon (0.108.0) fakefs (1.8.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) + faraday (1.4.1) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday-net_http_persistent (~> 1.1) + multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.5.1) + faraday-http-cache (2.5.0) faraday (>= 0.8) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http_persistent (1.1.0) faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.3.0) @@ -161,12 +143,12 @@ GEM fastlane-plugin-ruby (0.1.3) fastlane-plugin-slack_train (0.2.0) gh_inspector (1.1.3) - git (1.19.1) + git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.3) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -174,23 +156,24 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml + webrick google-apis-iamcredentials_v1 (0.17.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.31.0) + google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.6.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) - google-cloud-storage (1.47.0) + google-cloud-errors (1.3.1) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.31.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -200,16 +183,15 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - hashdiff (1.1.0) + hashdiff (1.0.1) highline (2.0.3) http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) interception (0.5) jmespath (1.6.2) - json (2.7.1) - jwt (2.8.1) - base64 + json (2.5.1) + jwt (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -217,17 +199,16 @@ GEM method_source (1.0.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) + mime-types-data (3.2024.0206) mini_magick (4.12.0) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.0.0) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) - nkf (0.2.0) no_proxy_fix (0.1.2) octokit (4.25.1) faraday (>= 1, < 3) @@ -236,33 +217,33 @@ GEM optparse (0.4.0) os (1.1.4) ox (2.13.2) - parallel (1.24.0) - parser (3.3.0.5) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) racc plist (3.7.1) - pry (0.14.2) + pry (0.14.0) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.10.1) + pry-byebug (3.8.0) byebug (~> 11.0) - pry (>= 0.13, < 0.15) - pry-rescue (1.6.0) + pry (~> 0.10) + pry-rescue (1.5.2) interception (>= 0.5) pry (>= 0.12.0) - pry-stack_explorer (0.6.1) - binding_of_caller (~> 1.0) + pry-stack_explorer (0.4.12) + binding_of_caller (~> 0.7) pry (~> 0.13) public_suffix (5.0.4) - racc (1.7.3) - rack (2.2.8.1) + racc (1.7.1) + rack (2.2.8) rack-protection (2.2.4) rack rainbow (3.1.1) - rake (13.1.0) + rake (13.0.3) rb-readline (0.5.5) rchardet (1.8.0) - regexp_parser (2.9.0) + regexp_parser (2.8.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -270,19 +251,19 @@ GEM retriable (3.1.2) rexml (3.2.6) rouge (2.0.7) - rspec (3.13.0) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) @@ -295,11 +276,11 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) - rubocop-performance (1.20.2) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-performance (1.10.2) + rubocop (>= 0.90.0, < 2.0) + rubocop-ast (>= 0.4.0) rubocop-require_tools (0.1.2) rubocop (>= 0.49.1) ruby-progressbar (1.13.0) @@ -309,7 +290,7 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) security (0.1.5) - signet (0.19.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -327,16 +308,16 @@ GEM rack (~> 2.2) rack-protection (= 2.2.4) tilt (~> 2.0) - slack-notifier (2.4.0) + slack-notifier (2.3.2) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.1) + thor (1.1.0) tilt (2.3.0) - tins (1.32.1) + tins (1.28.0) sync trailblazer-option (0.1.2) tty-cursor (0.7.1) @@ -344,16 +325,20 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unicode-display_width (2.5.0) - webmock (3.23.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) word_wrap (1.0.0) - xcode-install (2.8.1) - claide (>= 0.9.1) + xcode-install (2.6.8) + claide (>= 0.9.1, < 1.1.0) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.24.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -370,10 +355,9 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - yard (0.9.36) + yard (0.9.26) PLATFORMS - arm64-darwin-23 ruby DEPENDENCIES @@ -406,4 +390,4 @@ DEPENDENCIES yard (~> 0.9.11) BUNDLED WITH - 2.5.6 + 2.3.21 From a84316c0e7552950736669e0a05931db4dec16c7 Mon Sep 17 00:00:00 2001 From: "Lippmann, Erik" Date: Wed, 13 Mar 2024 21:21:41 +0100 Subject: [PATCH 4/4] Reverted unintended changes to the FastlaneSwiftRunner project. --- .../project.pbxproj | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj b/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj index 2a6a9ab2302..0d624db4403 100644 --- a/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj +++ b/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj @@ -28,7 +28,6 @@ B3BA65AD1F5A269100B34850 /* SocketResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65A41F5A269100B34850 /* SocketResponse.swift */; }; B3BA65AF1F5A2D5C00B34850 /* RunnerArgument.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA65AE1F5A2D5C00B34850 /* RunnerArgument.swift */; }; C0459CAC27261897002CDFB9 /* FastlaneRunner in CopyFiles */ = {isa = PBXBuildFile; fileRef = D556D6A91F6A08F5003108E3 /* FastlaneRunner */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - D05E6975E2038C05962DFCD0 /* FastlaneRunner in FastlaneRunnerCopySigned */ = {isa = PBXBuildFile; fileRef = D556D6A91F6A08F5003108E3 /* FastlaneRunner */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D55B28C31F6C588300DC42C5 /* Deliverfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BC1F6C588300DC42C5 /* Deliverfile.swift */; }; D55B28C41F6C588300DC42C5 /* Gymfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BD1F6C588300DC42C5 /* Gymfile.swift */; }; D55B28C51F6C588300DC42C5 /* Matchfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55B28BE1F6C588300DC42C5 /* Matchfile.swift */; }; @@ -47,24 +46,13 @@ C0459CAB27261886002CDFB9 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = "$SRCROOT/../.."; + dstPath = $SRCROOT/../..; dstSubfolderSpec = 0; files = ( C0459CAC27261897002CDFB9 /* FastlaneRunner in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; - CD506EA15202229DCA770DC6 /* FastlaneRunnerCopySigned */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "$SRCROOT/../.."; - dstSubfolderSpec = 0; - files = ( - D05E6975E2038C05962DFCD0 /* FastlaneRunner in FastlaneRunnerCopySigned */, - ); - name = FastlaneRunnerCopySigned; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -211,7 +199,6 @@ B33BAF531F51F8D90001A751 /* Sources */, B33BAF541F51F8D90001A751 /* Frameworks */, C0459CAB27261886002CDFB9 /* CopyFiles */, - CD506EA15202229DCA770DC6 /* FastlaneRunnerCopySigned */, ); buildRules = ( ); @@ -417,7 +404,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.0; @@ -430,7 +416,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "-"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 4.0; };