Skip to content

Commit

Permalink
remove EOL'd jruby 9.2 (#612)
Browse files Browse the repository at this point in the history
The version is not published on the downloads page anymore
(https://www.jruby.org/download)

See comment from Jruby team member:
jruby/jruby#7496 (comment)
  • Loading branch information
arjun024 authored Dec 9, 2022
1 parent d8a7697 commit 386b34c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 47 deletions.
8 changes: 0 additions & 8 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ dependencies:
- cflinuxfs3
source: https://github.com/rubygems/rubygems/tree/master/bundlertree/v2.3.26
source_sha256: 1ee53cdf61e728ad82c6dbff06cfcd8551d5422e88e86203f0e2dbe9ae999e09
- name: jruby
version: 9.2.21.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.2.21.0-ruby-2.5_linux_x64_cflinuxfs3_612b3fbf.tgz
sha256: 612b3fbf9473f790574466db48f0609570d57f7536900e613c43e2b2163ed99c
cf_stacks:
- cflinuxfs3
source: https://s3.amazonaws.com/jruby.org/downloads/9.2.21.0/jruby-src-9.2.21.0.tar.gz
source_sha256: 11549eec6447ff82d28839645a9b73d3ec4bba2a9c88bfb4407282dea86ed81f
- name: jruby
version: 9.3.9.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.3.9.0-ruby-2.6_linux_x64_cflinuxfs3_cbf4a951.tgz
Expand Down
39 changes: 0 additions & 39 deletions src/ruby/brats/brats_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ func CopyBrats(rubyVersion string) *cutlass.App {

// jruby 9.4.X.X = ruby 3.1.X
// jruby 9.3.X.X = ruby 2.6.X
// jruby 9.2.X.X = ruby 2.5.X
func rubyVersionFromJRubyVersion(jrubyVersion string) (string, error) {
jrubyVersionRegex := regexp.MustCompile(`^(9.\d+).\d+.\d+$`)
version := jrubyVersionRegex.FindStringSubmatch(jrubyVersion)
Expand All @@ -96,8 +95,6 @@ func rubyVersionFromJRubyVersion(jrubyVersion string) (string, error) {
return "~>3.1", nil
case "9.3":
return "~>2.6", nil
case "9.2":
return "~>2.5", nil
default:
return "", fmt.Errorf("Unknown JRuby -> Ruby version mapping for JRuby version %s", jrubyVersion)
}
Expand Down Expand Up @@ -131,42 +128,6 @@ func createGemfileLockFile(jrubyVersion string, fixtureDir string) error {

var buffer []byte
switch version[1] {
case "9.2":
buffer = []byte(`GEM
remote: https://rubygems.org/
specs:
bcrypt (3.1.18-java)
eventmachine (1.2.7-java)
jdbc-mysql (8.0.27)
jdbc-postgres (42.2.25)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
nokogiri (1.12.5-java)
racc (~> 1.4)
racc (1.6.0-java)
rack (2.2.4)
rack-protection (2.2.3)
rack
ruby2_keywords (0.0.5)
sinatra (2.2.3)
mustermann (~> 2.0)
rack (~> 2.2)
rack-protection (= 2.2.3)
tilt (~> 2.0)
tilt (2.0.11)
webrick (1.7.0)
PLATFORMS
universal-java-1.8
DEPENDENCIES
bcrypt
eventmachine
jdbc-mysql
jdbc-postgres
nokogiri
sinatra
webrick`)
case "9.3", "9.4":
buffer = []byte(`GEM
remote: https://rubygems.org/
Expand Down

0 comments on commit 386b34c

Please sign in to comment.