diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1b499e783c..6e302f18de 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,8 +26,6 @@ updates: - '/gemfiles/3.4' - '/gemfiles/4.0' - '/gemfiles/4.1' - - '/gemfiles/jruby' - - '/gemfiles/truffleruby' - '/gemfiles/typecheck' schedule: interval: 'weekly' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c257cf0d15..7b7f43650e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,8 +105,8 @@ jobs: matrix: target: - { ruby: "head", gemfile: "4.1" } - - { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - - { ruby: "truffleruby", gemfile: "truffleruby" } + - { ruby: "jruby-10.0.0.0", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923 + - { ruby: "truffleruby", gemfile: ".." } runs-on: ubuntu-latest env: PRISM_FFI_BACKEND: "true" @@ -277,8 +277,8 @@ jobs: - { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" } - { ruby: "4.0", os: "ubuntu-latest", gemfile: "4.0" } - { ruby: "head", os: "ubuntu-latest", gemfile: "4.1" } - - { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - - { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" } + - { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923 + - { ruby: "truffleruby", os: "ubuntu-latest", gemfile: ".." } - { ruby: "2.7", os: "macos-latest", gemfile: "2.7" } - { ruby: "3.0", os: "macos-latest", gemfile: "3.0" } @@ -288,8 +288,8 @@ jobs: - { ruby: "3.4", os: "macos-latest", gemfile: "3.4" } - { ruby: "4.0", os: "macos-latest", gemfile: "4.0" } - { ruby: "head", os: "macos-latest", gemfile: "4.1" } - - { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - - { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" } + - { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923 + - { ruby: "truffleruby", os: "macos-latest", gemfile: ".." } - { ruby: "2.7", os: "windows-latest", gemfile: "2.7" } - { ruby: "3.0", os: "windows-latest", gemfile: "3.0" } @@ -299,7 +299,7 @@ jobs: - { ruby: "3.4", os: "windows-latest", gemfile: "3.4" } - { ruby: "4.0", os: "windows-latest", gemfile: "4.0" } # - { ruby: "head", os: "windows-latest", gemfile: "4.1" } TODO: No windows build yet - - { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 + - { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923 env: BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile runs-on: ${{ matrix.target.os }} diff --git a/Gemfile b/Gemfile index 7a9ee85d52..1a1ed1b269 100644 --- a/Gemfile +++ b/Gemfile @@ -5,16 +5,16 @@ source "https://rubygems.org" gemspec gem "benchmark-ips" +gem "parser" gem "rake" gem "rake-compiler" +gem "ruby_parser" gem "test-unit" platforms :mri, :mswin, :mingw, :x64_mingw do gem "ffi" gem "irb" - gem "parser" gem "ruby_memcheck" - gem "ruby_parser" gem "rdoc" end diff --git a/Gemfile.lock b/Gemfile.lock index 62a388d0ca..0a320f9204 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,17 +9,23 @@ GEM ast (2.4.3) benchmark-ips (2.14.0) date (3.5.1) + date (3.5.1-java) erb (6.0.1) + erb (6.0.1-java) ffi (1.17.3) io-console (0.8.2) + io-console (0.8.2-java) irb (1.16.0) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) + jar-dependencies (0.5.5) mini_portile2 (2.8.9) nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.19.0-java) + racc (~> 1.4) onigmo (0.1.0) parser (3.3.10.0) ast (~> 2.4.1) @@ -31,7 +37,11 @@ GEM psych (5.3.1) date stringio + psych (5.3.1-java) + date + jar-dependencies (>= 0.1.7) racc (1.8.1) + racc (1.8.1-java) rake (13.3.1) rake-compiler (1.3.1) rake @@ -53,6 +63,7 @@ GEM tsort (0.2.0) PLATFORMS + java ruby DEPENDENCIES diff --git a/bin/prism b/bin/prism index 7d8e97fb46..d91d9990bf 100755 --- a/bin/prism +++ b/bin/prism @@ -101,8 +101,6 @@ module Prism ["3.4", ["3.4", "typecheck"]], ["4.0", ["4.0"]], ["4.1", ["4.1"]], - ["jruby", ["jruby"]], - ["truffleruby", ["truffleruby"]] ].each do |ruby_version, gemfiles| gemfiles.each do |gemfile| system( diff --git a/docs/releasing.md b/docs/releasing.md index 0853c2f853..a7d3cf5eb3 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -49,8 +49,6 @@ bundle install ```sh for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4" "4.0"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done chruby ruby-4.1.0-dev && BUNDLE_GEMFILE=gemfiles/4.1/Gemfile bundle install -docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update -BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update ``` * Update the cargo lockfiles: diff --git a/gemfiles/jruby/Gemfile b/gemfiles/jruby/Gemfile deleted file mode 100644 index 957c4c01d9..0000000000 --- a/gemfiles/jruby/Gemfile +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -ruby "~> 3.4.2", engine: "jruby", engine_version: "~> 10.0.0" - -gemspec path: "../.." - -gem "parser" -gem "rake" -gem "rake-compiler" -gem "ruby_parser" -gem "test-unit" diff --git a/gemfiles/jruby/Gemfile.lock b/gemfiles/jruby/Gemfile.lock deleted file mode 100644 index e551b2e707..0000000000 --- a/gemfiles/jruby/Gemfile.lock +++ /dev/null @@ -1,47 +0,0 @@ -PATH - remote: ../.. - specs: - prism (1.7.0) - -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.3) - parser (3.3.10.0) - ast (~> 2.4.1) - racc - power_assert (3.0.1) - racc (1.8.1) - racc (1.8.1-java) - rake (13.3.1) - rake-compiler (1.3.1) - rake - ruby_parser (3.22.0) - racc (~> 1.5) - sexp_processor (~> 4.16) - sexp_processor (4.17.4) - test-unit (3.7.7) - power_assert - -PLATFORMS - universal-java-11 - universal-java-17 - universal-java-20 - universal-java-21 - universal-java-22 - universal-java-23 - x86_64-linux - -DEPENDENCIES - parser - prism! - rake - rake-compiler - ruby_parser - test-unit - -RUBY VERSION - ruby 3.4.2p0 (jruby 10.0.0.0) - -BUNDLED WITH - 2.7.2 diff --git a/gemfiles/truffleruby/Gemfile b/gemfiles/truffleruby/Gemfile deleted file mode 100644 index ce1282eacb..0000000000 --- a/gemfiles/truffleruby/Gemfile +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -ruby "~> 3.3.7", engine: "truffleruby", engine_version: "~> 25.0.0" - -gemspec path: "../.." - -gem "parser" -gem "rake" -gem "rake-compiler" -gem "ruby_parser" -gem "test-unit" diff --git a/gemfiles/truffleruby/Gemfile.lock b/gemfiles/truffleruby/Gemfile.lock deleted file mode 100644 index c3333766a5..0000000000 --- a/gemfiles/truffleruby/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -PATH - remote: ../.. - specs: - prism (1.7.0) - -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.3) - parser (3.3.10.0) - ast (~> 2.4.1) - racc - power_assert (3.0.1) - racc (1.8.1) - rake (13.3.1) - rake-compiler (1.3.1) - rake - ruby_parser (3.22.0) - racc (~> 1.5) - sexp_processor (~> 4.16) - sexp_processor (4.17.4) - test-unit (3.7.7) - power_assert - -PLATFORMS - ruby - -DEPENDENCIES - parser - prism! - rake - rake-compiler - ruby_parser - test-unit - -RUBY VERSION - ruby 3.3.7p0 (truffleruby 25.0.0) - -BUNDLED WITH - 2.5.22 diff --git a/test/prism/snapshots_test.rb b/test/prism/snapshots_test.rb index 23e5c9c087..b63dfaa4eb 100644 --- a/test/prism/snapshots_test.rb +++ b/test/prism/snapshots_test.rb @@ -31,8 +31,6 @@ def teardown if RUBY_ENGINE == "truffleruby" except.push( "emoji_method_calls.txt", - "seattlerb/bug202.txt", - "seattlerb/magic_encoding_comment.txt" ) end