Skip to content
This repository was archived by the owner on Jan 16, 2022. It is now read-only.

Commit fc5e4eb

Browse files
committed
Ruby 3 fixes
* Added webrick dependency since it no longer comes with Ruby * Removed anchorman dev dependency since it now indirectly depends on an incompatible JSON parser
1 parent 6eb5096 commit fc5e4eb

4 files changed

Lines changed: 11 additions & 2 deletions

File tree

.circleci/config.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ orbs:
33
ruby: circleci/[email protected]
44

55
executors:
6+
ruby_3_0:
7+
docker:
8+
- image: circleci/ruby:3.0-browsers-legacy
69
ruby_2_7:
710
docker:
811
- image: circleci/ruby:2.7-browsers-legacy
@@ -53,7 +56,7 @@ workflows:
5356
matrix:
5457
parameters:
5558
rails_version: ["pojs", "rails6", "rails5", "rails4"]
56-
executor: ["ruby_2_7", "ruby_2_6", "ruby_2_5", "ruby_2_3"]
59+
executor: ["ruby_3_0", "ruby_2_7", "ruby_2_6", "ruby_2_5", "ruby_2_3"]
5760
exclude:
5861
# Don't run Rails 4 on newer Rubies that lack an old enough
5962
# bundler.
@@ -64,6 +67,11 @@ workflows:
6467
# Rails 6 requires at least Ruby 2.5.
6568
- rails_version: "rails6"
6669
executor: "ruby_2_3"
70+
# Rails 5 requires Ruby < 2.7
71+
- rails_version: "rails5"
72+
executor: "ruby_3_0"
73+
- rails_version: "rails5"
74+
executor: "ruby_2_7"
6775
cron:
6876
<<: *push_workflow
6977
triggers:

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
22

33
gemspec
44

5-
gem 'anchorman', :platform => :mri
65

76
# during development, do not release
87
if ENV['CIRCLECI']

jasmine.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
3939

4040
s.add_dependency 'jasmine-core', '~> 3.7.0'
4141
s.add_dependency 'rack', '>= 1.2.1'
42+
s.add_dependency 'webrick'
4243
s.add_dependency 'rake'
4344
s.add_dependency 'phantomjs'
4445
end

lib/jasmine/runners/phantom_js.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require 'phantomjs'
2+
require 'json'
23

34
module Jasmine
45
module Runners

0 commit comments

Comments
 (0)