Skip to content

Commit 1dabdc3

Browse files
authored
Merge pull request #631 from ruby/use-test-unit-ruby-core
Use test-unit-ruby-core
2 parents 2cad18c + 6ec316b commit 1dabdc3

9 files changed

Lines changed: 6 additions & 1210 deletions

File tree

.github/workflows/libyaml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
88
with:
99
engine: cruby
10-
min_version: 2.4
10+
min_version: 2.5
1111

1212
build:
1313
needs: ruby-versions

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
88
with:
99
engine: cruby-jruby
10-
min_version: 2.4
10+
min_version: 2.5
1111

1212
test:
1313
needs: ruby-versions

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ gemspec
44

55
group :development do
66
gem 'rake-compiler', ">= 0.4.1"
7-
gem 'test-unit'
87
gem 'ruby-maven', :platforms => :jruby
8+
gem 'test-unit'
9+
gem 'test-unit-ruby-core'
910
end

Rakefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,4 @@ else
3131
Rake::ExtensionTask.new("psych")
3232
end
3333

34-
task :sync_tool do
35-
require 'fileutils'
36-
FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
37-
FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
38-
FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
39-
end
40-
4134
task :default => [:compile, :test]

psych.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DESCRIPTION
4242
s.rdoc_options = ["--main", "README.md"]
4343
s.extra_rdoc_files = ["README.md"]
4444

45-
s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
45+
s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
4646
s.required_rubygems_version = Gem::Requirement.new(">= 0")
4747

4848
if RUBY_ENGINE == 'jruby'

0 commit comments

Comments
 (0)