diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27aac96c..897194b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [3.1, 3.2, 3.3, 3.4] + ruby: [3.2, 3.3, 3.4, 4.0] platform: - { os: ubuntu, target: linux-x64, extension: so } - { os: macos, target: macos-arm64, extension: bundle } @@ -75,7 +75,7 @@ jobs: - name: setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.4 + ruby-version: 4.0 bundler-cache: true - name: Lint run: just lint @@ -88,7 +88,7 @@ jobs: - name: setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.4 + ruby-version: 4.0 bundler-cache: true - name: Typecheck run: just tc diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index b4efda5b..1a8bfda4 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -36,7 +36,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.4 + ruby-version: 4.0 bundler-cache: true - name: Generate docs diff --git a/.rubocop.yml b/.rubocop.yml index fce491ca..95c20f1b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: NewCops: enable - TargetRubyVersion: 3.1 + TargetRubyVersion: 3.2 SuggestExtensions: false Exclude: - tree-sitter-parsers/**/* diff --git a/lib/tree_sitter.rb b/lib/tree_sitter.rb index 0e88e6dc..b1af1a5e 100644 --- a/lib/tree_sitter.rb +++ b/lib/tree_sitter.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'set' - begin RUBY_VERSION =~ /(\d+\.\d+)/ require "tree_sitter/#{Regexp.last_match(1)}/tree_sitter" diff --git a/sorbet/tapioca/require.rb b/sorbet/tapioca/require.rb index 5749bdf2..f3b7073b 100644 --- a/sorbet/tapioca/require.rb +++ b/sorbet/tapioca/require.rb @@ -5,7 +5,6 @@ require 'forwardable' require 'mkmf' require 'pathname' -require 'set' require 'sorbet-runtime' require 'stringio' require 'tree_sitter/node' diff --git a/tree_sitter.gemspec b/tree_sitter.gemspec index f4a5fa9a..fb8d9f1d 100644 --- a/tree_sitter.gemspec +++ b/tree_sitter.gemspec @@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib) require 'tree_sitter/version' Gem::Specification.new do |spec| - spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0') spec.authors = ['Firas al-Khalil', 'Derek Stride'] spec.email = ['firasalkhalil@gmail.com', 'derek@stride.host']