From 105f61d4e47b18272faa8cd421ad22c03e71d73a Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:14:22 -0300 Subject: [PATCH 01/12] Update Ruby version. --- .github/workflows/run-tests.yml | 2 +- .ruby-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3ce7655..23c2bf8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,7 +11,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' - ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', head] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/.ruby-version b/.ruby-version index 619b537..47b322c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.4.1 From 2ae7531a93bcfe63ac12fad3745700a0e4103b7a Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:14:47 -0300 Subject: [PATCH 02/12] Update Ruby dependencies. --- .rubocop.yml | 2 +- Gemfile.lock | 66 ++++++++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9fcc3ba..5b10749 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml # Last reviewed on Aug 31st 2023, using RuboCop v1.56.1 -require: +plugins: - rubocop-rake - rubocop-rspec diff --git a/Gemfile.lock b/Gemfile.lock index f8b2c64..2523713 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,62 +9,64 @@ PATH GEM remote: https://rubygems.org/ specs: - ast (2.4.2) - diff-lcs (1.5.1) - docile (1.4.0) + ast (2.4.3) + diff-lcs (1.6.1) + docile (1.4.1) dotenv (2.8.1) - json (2.7.2) - language_server-protocol (3.17.0.3) - parallel (1.25.1) - parser (3.3.3.0) + json (2.11.3) + language_server-protocol (3.17.0.4) + lint_roller (1.1.0) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc pastel (0.8.0) tty-color (~> 0.5) - racc (1.8.0) + prism (1.4.0) + racc (1.8.1) rainbow (3.1.1) rake (13.2.1) - regexp_parser (2.9.2) - rexml (3.3.0) - strscan + regexp_parser (2.10.0) 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-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) - rubocop (1.64.1) + rspec-support (3.13.3) + rubocop (1.75.5) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) - parser (>= 3.3.1.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (3.0.1) - rubocop (~> 1.61) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-rake (0.7.1) + lint_roller (~> 1.1) + rubocop (>= 1.72.1) + rubocop-rspec (3.6.0) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) ruby-progressbar (1.13.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - strscan (3.1.0) tty-color (0.6.0) tty-cursor (0.7.1) tty-prompt (0.23.1) @@ -75,9 +77,11 @@ GEM tty-screen (~> 0.8) wisper (~> 2.0) tty-screen (0.8.2) - unicode-display_width (2.5.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) wisper (2.0.1) - yaml (0.3.0) + yaml (0.4.0) PLATFORMS arm64-darwin-23 From 2b650534ee6d06bc5af94b8f852aec503373596d Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:14:56 -0300 Subject: [PATCH 03/12] Update GHA actions. --- .github/workflows/kotlin-tests.yml | 8 +++++--- .github/workflows/swift-tests.yml | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kotlin-tests.yml b/.github/workflows/kotlin-tests.yml index e5b1eed..6b3c10f 100644 --- a/.github/workflows/kotlin-tests.yml +++ b/.github/workflows/kotlin-tests.yml @@ -1,21 +1,23 @@ name: Kotlin Tests + on: push: branches: - main pull_request: + jobs: test: runs-on: ubuntu-latest # Assuming Kotlin projects can be built on Linux steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' - name: Cache Gradle packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/swift-tests.yml b/.github/workflows/swift-tests.yml index 96235bc..fb75489 100644 --- a/.github/workflows/swift-tests.yml +++ b/.github/workflows/swift-tests.yml @@ -1,15 +1,17 @@ name: Swift Tests + on: push: branches: - main pull_request: + jobs: test: runs-on: macos-latest steps: - - uses: fwal/setup-swift@v1 - - uses: actions/checkout@v2 + - uses: swift-actions/setup-swift@v2 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: bundler-cache: true # Runs 'bundle install' and caches installed gems automatically From eb5e85d4ee049ddce77cf9c94d09127e2a167f30 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:25:20 -0300 Subject: [PATCH 04/12] Test fix. --- .github/workflows/swift-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/swift-tests.yml b/.github/workflows/swift-tests.yml index fb75489..2dd7672 100644 --- a/.github/workflows/swift-tests.yml +++ b/.github/workflows/swift-tests.yml @@ -12,6 +12,10 @@ jobs: steps: - uses: swift-actions/setup-swift@v2 - uses: actions/checkout@v4 + - name: Install System Dependencies + run: | + brew install gcc # Install C compiler + xcode-select --install || echo "Command line tools already installed" # Ensure Xcode command line tools are present - uses: ruby/setup-ruby@v1 with: bundler-cache: true # Runs 'bundle install' and caches installed gems automatically From bf0279bb8b510e66db8e5fdc967197ac9e655732 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:27:48 -0300 Subject: [PATCH 05/12] Update code coverage actions. --- .github/workflows/code-coverage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index a89aade..778a3ac 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -9,12 +9,12 @@ jobs: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: ruby-version: head bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - uses: paambaati/codeclimate-action@v6.0.0 + - uses: paambaati/codeclimate-action@v9 with: coverageCommand: bundle exec rake debug: true From 6fcfe6afe6b163aa0cb0706a768c74ced4dcb2b9 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:29:50 -0300 Subject: [PATCH 06/12] Remove HEAD Ruby versions. --- .github/workflows/code-coverage.yml | 1 - .github/workflows/run-tests.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 778a3ac..d8391e4 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -12,7 +12,6 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: head bundler-cache: true # runs 'bundle install' and caches installed gems automatically - uses: paambaati/codeclimate-action@v9 with: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 23c2bf8..cf81738 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,7 +11,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0' - ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head'] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 From e11d65db306eb7eb2897d14e38d68c31bdf26a70 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:37:14 -0300 Subject: [PATCH 07/12] Remove redundant system dependencies. --- .github/workflows/swift-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/swift-tests.yml b/.github/workflows/swift-tests.yml index 2dd7672..fb75489 100644 --- a/.github/workflows/swift-tests.yml +++ b/.github/workflows/swift-tests.yml @@ -12,10 +12,6 @@ jobs: steps: - uses: swift-actions/setup-swift@v2 - uses: actions/checkout@v4 - - name: Install System Dependencies - run: | - brew install gcc # Install C compiler - xcode-select --install || echo "Command line tools already installed" # Ensure Xcode command line tools are present - uses: ruby/setup-ruby@v1 with: bundler-cache: true # Runs 'bundle install' and caches installed gems automatically From 017dfe227c870661667881225f85fcada7060336 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:37:24 -0300 Subject: [PATCH 08/12] Add arm64-darwin-24 to list of platforms. --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 2523713..4dcfc4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,6 +88,7 @@ PLATFORMS ruby x86_64-darwin-19 x86_64-linux + arm64-darwin-24 DEPENDENCIES arkana! From 1d7f2f19fd3d9d5d3709e96c34b4646d134112ee Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:39:39 -0300 Subject: [PATCH 09/12] Declare explicit gem dependencies. --- Gemfile | 2 ++ Gemfile.lock | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 4604377..8138d3e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ source "https://rubygems.org" gemspec gem "bundler", "< 2.5" # 2.4.x is the latest that supports Ruby 2.7, which is the minimum required by Arkana +gem "json" +gem "prism" gem "rake" gem "rspec" gem "rubocop" diff --git a/Gemfile.lock b/Gemfile.lock index 4dcfc4b..d503478 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,14 +85,16 @@ GEM PLATFORMS arm64-darwin-23 + arm64-darwin-24 ruby x86_64-darwin-19 x86_64-linux - arm64-darwin-24 DEPENDENCIES arkana! bundler (< 2.5) + json + prism rake rspec rubocop From a93ef9ff1e62fbfec093fdbe4c51cc52e0dd2970 Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:44:39 -0300 Subject: [PATCH 10/12] Specify oldeer Ruby version to test. --- .github/workflows/swift-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/swift-tests.yml b/.github/workflows/swift-tests.yml index fb75489..e33853f 100644 --- a/.github/workflows/swift-tests.yml +++ b/.github/workflows/swift-tests.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: + ruby-version: 3.1 bundler-cache: true # Runs 'bundle install' and caches installed gems automatically - name: Generate Swift Code & Run Tests run: bundle exec rake test_swift From f2fb4df63103ebbf037105cd3949ee702fbb1cda Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 10:56:18 -0300 Subject: [PATCH 11/12] Bump Ruby version to 3.4.3. --- .github/workflows/swift-tests.yml | 1 - .ruby-version | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/swift-tests.yml b/.github/workflows/swift-tests.yml index e33853f..fb75489 100644 --- a/.github/workflows/swift-tests.yml +++ b/.github/workflows/swift-tests.yml @@ -14,7 +14,6 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 bundler-cache: true # Runs 'bundle install' and caches installed gems automatically - name: Generate Swift Code & Run Tests run: bundle exec rake test_swift diff --git a/.ruby-version b/.ruby-version index 47b322c..6cb9d3d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.1 +3.4.3 From dcb128afa8fc1845f5553bfb420baf6adfb34c3e Mon Sep 17 00:00:00 2001 From: Roger Oba Date: Mon, 5 May 2025 11:11:24 -0300 Subject: [PATCH 12/12] Remove redundant dependency declarations. --- Gemfile | 2 -- Gemfile.lock | 2 -- 2 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8138d3e..4604377 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,6 @@ source "https://rubygems.org" gemspec gem "bundler", "< 2.5" # 2.4.x is the latest that supports Ruby 2.7, which is the minimum required by Arkana -gem "json" -gem "prism" gem "rake" gem "rspec" gem "rubocop" diff --git a/Gemfile.lock b/Gemfile.lock index d503478..9408262 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,8 +93,6 @@ PLATFORMS DEPENDENCIES arkana! bundler (< 2.5) - json - prism rake rspec rubocop