From 15eb1e50cf4d27952ab74fe9b6c3edb564d79062 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 13:14:15 -0700 Subject: [PATCH 01/16] Try CocoaPods Info.plist fix --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 81 ++++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index df73d9d050ec3d..8bf114fefd2b32 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :ref => '2bba585' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 07591afd97aa84..22a4a99a6460cd 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,23 +1,12 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/CocoaPods/CocoaPods.git + revision: 2bba5852f7d64d416d61ba566641bdc104bb0c1a + ref: 2bba585 specs: - CFPropertyList (3.0.3) - activesupport (5.2.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.0.3) - cocoapods (1.10.2) - addressable (~> 2.6) + cocoapods (1.11.0) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.2) + cocoapods-core (= 1.11.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,26 +17,44 @@ GEM escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.2) - activesupport (> 5.0, < 6) - addressable (~> 2.6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) + cocoapods-core (1.11.0) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) - public_suffix + public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) @@ -56,7 +63,7 @@ GEM escape (0.0.4) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.3) + ffi (1.15.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -65,31 +72,31 @@ GEM concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.6.6) + molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) rexml (3.2.5) - ruby-macho (1.4.0) - thread_safe (0.3.6) + ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - xcodeproj (1.20.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + xcodeproj (1.21.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) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - cocoapods + cocoapods! BUNDLED WITH 2.1.4 From a30e3a5c2de7336911db43b8912606e7d8e16367 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 13:32:50 -0700 Subject: [PATCH 02/16] trigger tests From d6b648df253f55a17e4eea74996dd992234c46d6 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 15:24:43 -0700 Subject: [PATCH 03/16] Update ref --- dev/ci/mac/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 8bf114fefd2b32..9efb0c379cbb68 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :ref => '2bba585' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :ref => '48973f' From 3673d71f4e6ce8118ca2c7f140259604335ab745 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 15:25:49 -0700 Subject: [PATCH 04/16] Updte --- dev/ci/mac/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 22a4a99a6460cd..17390b936aa600 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/CocoaPods/CocoaPods.git - revision: 2bba5852f7d64d416d61ba566641bdc104bb0c1a - ref: 2bba585 + revision: 48973fbb6b8d0e600bc9e43c798fd25af86e92a1 + ref: 48973f specs: cocoapods (1.11.0) addressable (~> 2.8) From 4d1ac14e60ce01856d68dae8e3f422d4d1736a11 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 15:48:49 -0700 Subject: [PATCH 05/16] branch --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 9efb0c379cbb68..04d50756d9bdd6 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :ref => '48973f' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'info_plist_fix' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 17390b936aa600..17aba2980a5507 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/CocoaPods/CocoaPods.git revision: 48973fbb6b8d0e600bc9e43c798fd25af86e92a1 - ref: 48973f + branch: info_plist_fix specs: cocoapods (1.11.0) addressable (~> 2.8) From b883baa2b2c4cc21cba7d6e46639b64e366fd83e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 18:12:36 -0700 Subject: [PATCH 06/16] More master branches --- dev/ci/mac/Gemfile | 11 ++++ dev/ci/mac/Gemfile.lock | 120 +++++++++++++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 25 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 04d50756d9bdd6..dea3eb5a161963 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -4,3 +4,14 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'info_plist_fix' + +gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git', :branch => 'master' +gem 'cocoapods-deintegrate', :git => 'https://github.com/CocoaPods/cocoapods-deintegrate.git', :branch => 'master' +gem 'cocoapods-downloader', :git => 'https://github.com/CocoaPods/cocoapods-downloader.git', :branch => 'master' +gem 'cocoapods-plugins', :git => 'https://github.com/CocoaPods/cocoapods-plugins.git', :branch => 'master' +gem 'cocoapods-search', :git => 'https://github.com/CocoaPods/cocoapods-search.git', :branch => 'master' +gem 'cocoapods-trunk', :git => 'https://github.com/CocoaPods/cocoapods-trunk.git', :branch => 'master' +gem 'cocoapods-try', :git => 'https://github.com/CocoaPods/cocoapods-try.git', :branch => 'master' +gem 'molinillo', :git => 'https://github.com/CocoaPods/Molinillo.git', :branch => 'master' +gem 'nanaimo', :git => 'https://github.com/CocoaPods/Nanaimo.git', :branch => 'master' +gem 'xcodeproj', :git => 'https://github.com/CocoaPods/Xcodeproj.git', :branch => 'master' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 17aba2980a5507..9515692854d2ae 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -22,23 +22,11 @@ GIT ruby-macho (>= 1.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/CocoaPods/Core.git + revision: e6451e172c33f3aa77a3f8baa7b6b5b8c3b5da14 + branch: master specs: - CFPropertyList (3.0.3) - activesupport (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.0.3) cocoapods-core (1.11.0) activesupport (>= 5.0, < 7) addressable (~> 2.8) @@ -49,15 +37,96 @@ GEM netrc (~> 0.11) public_suffix (~> 4.0) typhoeus (~> 1.0) + +GIT + remote: https://github.com/CocoaPods/Molinillo.git + revision: 8053207d1184703a45f48d7bc00ad73aa03012b5 + branch: master + specs: + molinillo (0.8.0) + +GIT + remote: https://github.com/CocoaPods/Nanaimo.git + revision: 1bf2e6e8781045fed99ca7020d5007234e715dc8 + branch: master + specs: + nanaimo (0.3.0) + +GIT + remote: https://github.com/CocoaPods/Xcodeproj.git + revision: 2a1f19ad039556a153dd888cc293b9330bdc0f7a + branch: master + specs: + xcodeproj (1.21.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) + +GIT + remote: https://github.com/CocoaPods/cocoapods-deintegrate.git + revision: 2e378b88c65a21a4b89fad989a81a23caec48cdf + branch: master + specs: cocoapods-deintegrate (1.0.5) + +GIT + remote: https://github.com/CocoaPods/cocoapods-downloader.git + revision: eed7e8f6c42c2e2f582f5c6c34bf44dcf0a08120 + branch: master + specs: cocoapods-downloader (1.5.1) + +GIT + remote: https://github.com/CocoaPods/cocoapods-plugins.git + revision: 5fe129c3a803dd91fac58ddc5996eecb0ddb4703 + branch: master + specs: cocoapods-plugins (1.0.0) nap + +GIT + remote: https://github.com/CocoaPods/cocoapods-search.git + revision: 1d10b7a71e1b7de865560d4af5ab1d9dcce5ea1d + branch: master + specs: cocoapods-search (1.0.1) + +GIT + remote: https://github.com/CocoaPods/cocoapods-trunk.git + revision: 52932934618b7012f4b0c7469768b2d26b3792fe + branch: master + specs: cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) + +GIT + remote: https://github.com/CocoaPods/cocoapods-try.git + revision: 607f9c85b4aea8a5662b68ab41cdd402f94d84c3 + branch: master + specs: cocoapods-try (1.2.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) colored2 (3.1.2) concurrent-ruby (1.1.9) escape (0.0.4) @@ -72,8 +141,6 @@ GEM concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) - molinillo (0.8.0) - nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) @@ -83,13 +150,6 @@ GEM ethon (>= 0.9.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - xcodeproj (1.21.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) zeitwerk (2.4.2) PLATFORMS @@ -97,6 +157,16 @@ PLATFORMS DEPENDENCIES cocoapods! + cocoapods-core! + cocoapods-deintegrate! + cocoapods-downloader! + cocoapods-plugins! + cocoapods-search! + cocoapods-trunk! + cocoapods-try! + molinillo! + nanaimo! + xcodeproj! BUNDLED WITH 2.1.4 From 89c8b0fd2a0c246c252c97746eaace45aef0f37a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 18:46:30 -0700 Subject: [PATCH 07/16] bundler --- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index 37aadafc437904..bff23dfa79b4ac 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -22,12 +22,16 @@ Future main() async { // Relative to this script. final String flutterRoot = path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(path.fromUri(Platform.script)))))); print('Flutter root at $flutterRoot'); + final String gemDirectory = path.join(flutterRoot, 'dev', 'ci', 'mac'); + print(gemDirectory); final String integrationTestPackage = path.join(flutterRoot, 'packages', 'integration_test'); final String iosintegrationTestPodspec = path.join(integrationTestPackage, 'ios', 'integration_test.podspec'); await exec( - 'pod', + 'bundle', [ + 'exec', + 'pod', 'lib', 'lint', iosintegrationTestPodspec, @@ -38,12 +42,15 @@ Future main() async { environment: { 'LANG': 'en_US.UTF-8', }, + workingDirectory: gemDirectory, ); final String macosintegrationTestPodspec = path.join(integrationTestPackage, 'integration_test_macos', 'macos', 'integration_test_macos.podspec'); await exec( - 'pod', + 'bundle', [ + 'exec', + 'pod', 'lib', 'lint', macosintegrationTestPodspec, @@ -53,6 +60,7 @@ Future main() async { environment: { 'LANG': 'en_US.UTF-8', }, + workingDirectory: gemDirectory, ); }); From f38cf3071176ccce51273a4d29daea0822b11e9e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 19:12:22 -0700 Subject: [PATCH 08/16] bundler version --- dev/ci/mac/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 9515692854d2ae..8281c10ca6d559 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -153,7 +153,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - ruby + universal-darwin-20 DEPENDENCIES cocoapods! @@ -169,4 +169,4 @@ DEPENDENCIES xcodeproj! BUNDLED WITH - 2.1.4 + 2.2.27 From 18f2e38739c020d64e5237491e835ed1e8f531a5 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 19:18:59 -0700 Subject: [PATCH 09/16] Hard code bundle --- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index bff23dfa79b4ac..a7769362bd5b8e 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -28,7 +28,7 @@ Future main() async { final String iosintegrationTestPodspec = path.join(integrationTestPackage, 'ios', 'integration_test.podspec'); await exec( - 'bundle', + '/opt/s/w/ir/x/w/gems/bin/bundle', [ 'exec', 'pod', @@ -47,7 +47,7 @@ Future main() async { final String macosintegrationTestPodspec = path.join(integrationTestPackage, 'integration_test_macos', 'macos', 'integration_test_macos.podspec'); await exec( - 'bundle', + '/opt/s/w/ir/x/w/gems/bin/bundle', [ 'exec', 'pod', From 673158d91d609f8f8adecfdb84d241bd9d6ed80b Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 19:25:51 -0700 Subject: [PATCH 10/16] print version --- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index a7769362bd5b8e..c9c64efe1f29e2 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -26,7 +26,12 @@ Future main() async { print(gemDirectory); final String integrationTestPackage = path.join(flutterRoot, 'packages', 'integration_test'); final String iosintegrationTestPodspec = path.join(integrationTestPackage, 'ios', 'integration_test.podspec'); - + await exec( + '/opt/s/w/ir/x/w/gems/bin/bundle', + [ + '--version', + ], + ); await exec( '/opt/s/w/ir/x/w/gems/bin/bundle', [ From d6fa3ee0e16b5428b039ebe84777a78d09b8a014 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Sep 2021 19:34:59 -0700 Subject: [PATCH 11/16] bundler --- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index c9c64efe1f29e2..c15e48df043777 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -27,13 +27,13 @@ Future main() async { final String integrationTestPackage = path.join(flutterRoot, 'packages', 'integration_test'); final String iosintegrationTestPodspec = path.join(integrationTestPackage, 'ios', 'integration_test.podspec'); await exec( - '/opt/s/w/ir/x/w/gems/bin/bundle', + '/opt/s/w/ir/x/w/gems/bin/bundler', [ '--version', ], ); await exec( - '/opt/s/w/ir/x/w/gems/bin/bundle', + '/opt/s/w/ir/x/w/gems/bin/bundler', [ 'exec', 'pod', @@ -52,7 +52,7 @@ Future main() async { final String macosintegrationTestPodspec = path.join(integrationTestPackage, 'integration_test_macos', 'macos', 'integration_test_macos.podspec'); await exec( - '/opt/s/w/ir/x/w/gems/bin/bundle', + '/opt/s/w/ir/x/w/gems/bin/bundler', [ 'exec', 'pod', From 9eb3ec0f4ccc342aa5072894aea6584ae626867e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 10 Sep 2021 10:36:41 -0700 Subject: [PATCH 12/16] master --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 6 +++--- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 19 +++---------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index dea3eb5a161963..0bc28b7accfd76 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'info_plist_fix' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'master' gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git', :branch => 'master' gem 'cocoapods-deintegrate', :git => 'https://github.com/CocoaPods/cocoapods-deintegrate.git', :branch => 'master' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 8281c10ca6d559..a089a981cedf4c 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/CocoaPods/CocoaPods.git - revision: 48973fbb6b8d0e600bc9e43c798fd25af86e92a1 - branch: info_plist_fix + revision: e83d3264d4960d53dcb0cc921b0468f768dd3ed4 + branch: master specs: cocoapods (1.11.0) addressable (~> 2.8) @@ -153,7 +153,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - universal-darwin-20 + ruby DEPENDENCIES cocoapods! diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index c15e48df043777..37aadafc437904 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -22,21 +22,12 @@ Future main() async { // Relative to this script. final String flutterRoot = path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(path.fromUri(Platform.script)))))); print('Flutter root at $flutterRoot'); - final String gemDirectory = path.join(flutterRoot, 'dev', 'ci', 'mac'); - print(gemDirectory); final String integrationTestPackage = path.join(flutterRoot, 'packages', 'integration_test'); final String iosintegrationTestPodspec = path.join(integrationTestPackage, 'ios', 'integration_test.podspec'); + await exec( - '/opt/s/w/ir/x/w/gems/bin/bundler', - [ - '--version', - ], - ); - await exec( - '/opt/s/w/ir/x/w/gems/bin/bundler', + 'pod', [ - 'exec', - 'pod', 'lib', 'lint', iosintegrationTestPodspec, @@ -47,15 +38,12 @@ Future main() async { environment: { 'LANG': 'en_US.UTF-8', }, - workingDirectory: gemDirectory, ); final String macosintegrationTestPodspec = path.join(integrationTestPackage, 'integration_test_macos', 'macos', 'integration_test_macos.podspec'); await exec( - '/opt/s/w/ir/x/w/gems/bin/bundler', + 'pod', [ - 'exec', - 'pod', 'lib', 'lint', macosintegrationTestPodspec, @@ -65,7 +53,6 @@ Future main() async { environment: { 'LANG': 'en_US.UTF-8', }, - workingDirectory: gemDirectory, ); }); From c401b4a8d43d0c763692e087c6bba2d1eb1e1af5 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 10 Sep 2021 10:56:34 -0700 Subject: [PATCH 13/16] just cocoapods --- dev/ci/mac/Gemfile | 11 ---- dev/ci/mac/Gemfile.lock | 120 +++++++++------------------------------- 2 files changed, 25 insertions(+), 106 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 0bc28b7accfd76..1114a07d75d036 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -4,14 +4,3 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'master' - -gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git', :branch => 'master' -gem 'cocoapods-deintegrate', :git => 'https://github.com/CocoaPods/cocoapods-deintegrate.git', :branch => 'master' -gem 'cocoapods-downloader', :git => 'https://github.com/CocoaPods/cocoapods-downloader.git', :branch => 'master' -gem 'cocoapods-plugins', :git => 'https://github.com/CocoaPods/cocoapods-plugins.git', :branch => 'master' -gem 'cocoapods-search', :git => 'https://github.com/CocoaPods/cocoapods-search.git', :branch => 'master' -gem 'cocoapods-trunk', :git => 'https://github.com/CocoaPods/cocoapods-trunk.git', :branch => 'master' -gem 'cocoapods-try', :git => 'https://github.com/CocoaPods/cocoapods-try.git', :branch => 'master' -gem 'molinillo', :git => 'https://github.com/CocoaPods/Molinillo.git', :branch => 'master' -gem 'nanaimo', :git => 'https://github.com/CocoaPods/Nanaimo.git', :branch => 'master' -gem 'xcodeproj', :git => 'https://github.com/CocoaPods/Xcodeproj.git', :branch => 'master' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index a089a981cedf4c..9ad85fad756ecc 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -22,11 +22,23 @@ GIT ruby-macho (>= 1.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) -GIT - remote: https://github.com/CocoaPods/Core.git - revision: e6451e172c33f3aa77a3f8baa7b6b5b8c3b5da14 - branch: master +GEM + remote: https://rubygems.org/ specs: + CFPropertyList (3.0.3) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) cocoapods-core (1.11.0) activesupport (>= 5.0, < 7) addressable (~> 2.8) @@ -37,96 +49,15 @@ GIT netrc (~> 0.11) public_suffix (~> 4.0) typhoeus (~> 1.0) - -GIT - remote: https://github.com/CocoaPods/Molinillo.git - revision: 8053207d1184703a45f48d7bc00ad73aa03012b5 - branch: master - specs: - molinillo (0.8.0) - -GIT - remote: https://github.com/CocoaPods/Nanaimo.git - revision: 1bf2e6e8781045fed99ca7020d5007234e715dc8 - branch: master - specs: - nanaimo (0.3.0) - -GIT - remote: https://github.com/CocoaPods/Xcodeproj.git - revision: 2a1f19ad039556a153dd888cc293b9330bdc0f7a - branch: master - specs: - xcodeproj (1.21.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) - -GIT - remote: https://github.com/CocoaPods/cocoapods-deintegrate.git - revision: 2e378b88c65a21a4b89fad989a81a23caec48cdf - branch: master - specs: cocoapods-deintegrate (1.0.5) - -GIT - remote: https://github.com/CocoaPods/cocoapods-downloader.git - revision: eed7e8f6c42c2e2f582f5c6c34bf44dcf0a08120 - branch: master - specs: cocoapods-downloader (1.5.1) - -GIT - remote: https://github.com/CocoaPods/cocoapods-plugins.git - revision: 5fe129c3a803dd91fac58ddc5996eecb0ddb4703 - branch: master - specs: cocoapods-plugins (1.0.0) nap - -GIT - remote: https://github.com/CocoaPods/cocoapods-search.git - revision: 1d10b7a71e1b7de865560d4af5ab1d9dcce5ea1d - branch: master - specs: cocoapods-search (1.0.1) - -GIT - remote: https://github.com/CocoaPods/cocoapods-trunk.git - revision: 52932934618b7012f4b0c7469768b2d26b3792fe - branch: master - specs: cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - -GIT - remote: https://github.com/CocoaPods/cocoapods-try.git - revision: 607f9c85b4aea8a5662b68ab41cdd402f94d84c3 - branch: master - specs: cocoapods-try (1.2.0) - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.3) - activesupport (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.0.3) colored2 (3.1.2) concurrent-ruby (1.1.9) escape (0.0.4) @@ -141,6 +72,8 @@ GEM concurrent-ruby (~> 1.0) json (2.5.1) minitest (5.14.4) + molinillo (0.8.0) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.6) @@ -150,6 +83,13 @@ GEM ethon (>= 0.9.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) + xcodeproj (1.21.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) zeitwerk (2.4.2) PLATFORMS @@ -157,16 +97,6 @@ PLATFORMS DEPENDENCIES cocoapods! - cocoapods-core! - cocoapods-deintegrate! - cocoapods-downloader! - cocoapods-plugins! - cocoapods-search! - cocoapods-trunk! - cocoapods-try! - molinillo! - nanaimo! - xcodeproj! BUNDLED WITH 2.2.27 From 477a990d4daef18a7fa62955c6252d5a8ff9bd5e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 10 Sep 2021 11:01:40 -0700 Subject: [PATCH 14/16] does any version work --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 42 ++++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 1114a07d75d036..471ba26cd1542f 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'master' +gem 'cocoapods', '1.11.0' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 9ad85fad756ecc..b01018e893e16c 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,8 +1,20 @@ -GIT - remote: https://github.com/CocoaPods/CocoaPods.git - revision: e83d3264d4960d53dcb0cc921b0468f768dd3ed4 - branch: master +GEM + remote: https://rubygems.org/ specs: + CFPropertyList (3.0.3) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) cocoapods (1.11.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) @@ -21,24 +33,6 @@ GIT nap (~> 1.0) ruby-macho (>= 1.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.3) - activesupport (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.0.3) cocoapods-core (1.11.0) activesupport (>= 5.0, < 7) addressable (~> 2.8) @@ -96,7 +90,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods! + cocoapods (= 1.11.0) BUNDLED WITH - 2.2.27 + 2.1.4 From ee46b3ebb69141d596a900420e6cf2317562df0f Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 10 Sep 2021 14:26:22 -0700 Subject: [PATCH 15/16] git only --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 39 ++++++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index 471ba26cd1542f..a674694da7315c 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', '1.11.0' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git' diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index b01018e893e16c..fa14dd38fd6b1f 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,20 +1,7 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/CocoaPods/CocoaPods.git + revision: e83d3264d4960d53dcb0cc921b0468f768dd3ed4 specs: - CFPropertyList (3.0.3) - activesupport (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - claide (1.0.3) cocoapods (1.11.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) @@ -33,6 +20,24 @@ GEM nap (~> 1.0) ruby-macho (>= 1.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + activesupport (6.1.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) cocoapods-core (1.11.0) activesupport (>= 5.0, < 7) addressable (~> 2.8) @@ -90,7 +95,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.11.0) + cocoapods! BUNDLED WITH 2.1.4 From db8a65b711ed46a5b53aa57caee5caf6c0ab45de Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 10 Sep 2021 17:23:17 -0700 Subject: [PATCH 16/16] M --- dev/ci/mac/Gemfile | 2 +- dev/ci/mac/Gemfile.lock | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/ci/mac/Gemfile b/dev/ci/mac/Gemfile index a674694da7315c..d5791d5fd82fd3 100644 --- a/dev/ci/mac/Gemfile +++ b/dev/ci/mac/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' # Don't pin cocoapods so we can catch breakages from upstream changes, e.g. # https://github.com/flutter/flutter/issues/41144 -gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git' +gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => '1-11-stable' \ No newline at end of file diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index fa14dd38fd6b1f..2244ed77ba712a 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -1,6 +1,7 @@ GIT remote: https://github.com/CocoaPods/CocoaPods.git - revision: e83d3264d4960d53dcb0cc921b0468f768dd3ed4 + revision: 4855e1d255421756209c6cdeb116e7ff5073ef18 + branch: 1-11-stable specs: cocoapods (1.11.0) addressable (~> 2.8)