From ff13f959c082a68e6aaec5a2c14a1db5725fc33d Mon Sep 17 00:00:00 2001 From: Andrew Montgomery Date: Thu, 7 Apr 2022 10:37:50 -0500 Subject: [PATCH 1/5] Refactor Gemfile to explicitly list the global source --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a3fa53102..014816689 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ -source 'https://rubygems.org' do - gem 'cocoapods', '1.9.1' -end +source 'https://rubygems.org' + +gem 'cocoapods', '1.9.1' From 501d20faff4775b6a1b21c6ea8609cbe24d63a95 Mon Sep 17 00:00:00 2001 From: Andrew Montgomery Date: Thu, 7 Apr 2022 10:38:39 -0500 Subject: [PATCH 2/5] Update Ruby to 2.7.5, update gems to support 2.7.5 --- .ruby-version | 2 +- Gemfile.lock | 35 +++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.ruby-version b/.ruby-version index 57cf282eb..a603bb50a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.7.5 diff --git a/Gemfile.lock b/Gemfile.lock index 21c15d413..96cfbf528 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,18 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) + CFPropertyList (3.0.5) + rexml activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.4) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - claide (1.0.3) + claide (1.1.0) cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) @@ -39,52 +40,54 @@ GEM nap (~> 1.0) netrc (~> 0.11) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-stats (1.1.0) - cocoapods-trunk (1.5.0) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.10) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.13.1) + ethon (0.15.0) + ffi (>= 1.15.0) + ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.3.1) - minitest (5.14.2) + json (2.6.1) + minitest (5.15.0) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + rexml (3.2.5) ruby-macho (1.4.0) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) - xcodeproj (1.19.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) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.9.1)! + cocoapods (= 1.9.1) BUNDLED WITH 2.1.4 From 022c75e56a78cc522bbdf95203331ebb3e434eb0 Mon Sep 17 00:00:00 2001 From: Andrew Montgomery Date: Thu, 7 Apr 2022 10:39:15 -0500 Subject: [PATCH 3/5] Add bundler paths to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 5d3596921..f8897272e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ .idea/ *.orig +# Ignore Bundler +/.bundle/ +/vendor/bundle + # Ignore Xcode debris build *.pbxuser From 16ab3134bcc86df2f11fe7592f1004eb14c07885 Mon Sep 17 00:00:00 2001 From: Andrew Montgomery Date: Thu, 7 Apr 2022 10:39:56 -0500 Subject: [PATCH 4/5] Update CocoaPods to 1.11.3 --- Gemfile | 2 +- Gemfile.lock | 50 ++++++++++++++++++++------------------ KanvasExample/Podfile.lock | 2 +- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/Gemfile b/Gemfile index 014816689..4e9ba5251 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'cocoapods', '1.9.1' +gem 'cocoapods', '1.11.3' diff --git a/Gemfile.lock b/Gemfile.lock index 96cfbf528..bbdecf78e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,49 +3,52 @@ GEM specs: CFPropertyList (3.0.5) rexml - activesupport (4.2.11.3) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) + activesupport (6.1.5) + 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.1.0) - cocoapods (1.9.1) - activesupport (>= 4.0.2, < 5) + cocoapods (1.11.3) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.1) + cocoapods-core (= 1.11.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) 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.14.0, < 2.0) - cocoapods-core (1.9.1) - activesupport (>= 4.0.2, < 6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.3) + 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 (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) - cocoapods-stats (1.1.0) cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) @@ -60,21 +63,21 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.10.0) concurrent-ruby (~> 1.0) json (2.6.1) minitest (5.15.0) - 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) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) @@ -82,12 +85,13 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.9.1) + cocoapods (= 1.11.3) BUNDLED WITH 2.1.4 diff --git a/KanvasExample/Podfile.lock b/KanvasExample/Podfile.lock index 16d0f84ee..0ce22519c 100644 --- a/KanvasExample/Podfile.lock +++ b/KanvasExample/Podfile.lock @@ -24,4 +24,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 14b28dd726149c0d01dba9154d5bb095d9ba6a18 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 From 9f72f130656dd9a427e9f3f32621690e15fb3648 Mon Sep 17 00:00:00 2001 From: Andrew Montgomery Date: Thu, 7 Apr 2022 10:45:41 -0500 Subject: [PATCH 5/5] Remove the redundant (and confusing) Ruby files from the KanvasExample directory --- KanvasExample/.ruby-version | 1 - KanvasExample/Gemfile | 3 -- KanvasExample/Gemfile.lock | 100 ------------------------------------ 3 files changed, 104 deletions(-) delete mode 100644 KanvasExample/.ruby-version delete mode 100644 KanvasExample/Gemfile delete mode 100644 KanvasExample/Gemfile.lock diff --git a/KanvasExample/.ruby-version b/KanvasExample/.ruby-version deleted file mode 100644 index e46a05b19..000000000 --- a/KanvasExample/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.6.4 \ No newline at end of file diff --git a/KanvasExample/Gemfile b/KanvasExample/Gemfile deleted file mode 100644 index c6cd4c006..000000000 --- a/KanvasExample/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source 'https://rubygems.org' do - gem 'cocoapods', '1.11.2' -end diff --git a/KanvasExample/Gemfile.lock b/KanvasExample/Gemfile.lock deleted file mode 100644 index 05b31ff44..000000000 --- a/KanvasExample/Gemfile.lock +++ /dev/null @@ -1,100 +0,0 @@ -GEM - specs: - -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.5) - rexml - activesupport (6.1.4.4) - 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.2) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.2) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.2) - 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 (~> 4.0) - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.5.1) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) - colored2 (3.1.2) - concurrent-ruby (1.1.9) - escape (0.0.4) - ethon (0.15.0) - ffi (>= 1.15.0) - ffi (1.15.4) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.8.11) - concurrent-ruby (~> 1.0) - json (2.6.1) - minitest (5.15.0) - 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 (2.5.1) - typhoeus (1.4.0) - 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.5.2) - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods (= 1.11.2)! - -BUNDLED WITH - 2.2.24