Skip to content

Commit 7924a80

Browse files
committedFeb 23, 2018
Backport 2.5 date.jar change for synergy.
Cherry picked from: f9a47c6 Load DateLibrary from date.rb. I'm not sure how this was lost before. It may have been booted elsewhere and that code disappeared.
1 parent a35d850 commit 7924a80

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed
 

Diff for: ‎core/src/main/java/org/jruby/Ruby.java

+1
Original file line numberDiff line numberDiff line change
@@ -1741,6 +1741,7 @@ private void initBuiltins() {
17411741
addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.ext.fcntl.FcntlLibrary");
17421742
addLazyBuiltin("pathname.jar", "pathname", "org.jruby.ext.pathname.PathnameLibrary");
17431743
addLazyBuiltin("set.rb", "set", "org.jruby.ext.set.SetLibrary");
1744+
addLazyBuiltin("date.jar", "date", "org.jruby.ext.date.DateLibrary");
17441745

17451746
addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
17461747
addLazyBuiltin("mathn/rational.jar", "mathn/rational", "org.jruby.ext.mathn.Rational");

Diff for: ‎lib/ruby/stdlib/date.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
# puts secs_to_new_year()
195195

196196
require 'date/format'
197+
require 'date.jar'
197198

198199
# Class representing a date.
199200
#
@@ -1948,7 +1949,4 @@ def to_datetime
19481949

19491950
private_class_method :today
19501951
public_class_method :now
1951-
1952-
# Adds native implemented methods...
1953-
org.jruby.ext.date.DateLibrary.new.load JRuby.runtime, false
19541952
end

0 commit comments

Comments
 (0)
Please sign in to comment.