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.
jruby · Feb 23, 2018 · 7924a80 · 7924a80
1 parent a35d850
commit 7924a80
Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1741,6 +1741,7 @@ private void initBuiltins() {
         addLazyBuiltin("fcntl.rb", "fcntl", "org.jruby.ext.fcntl.FcntlLibrary");
         addLazyBuiltin("pathname.jar", "pathname", "org.jruby.ext.pathname.PathnameLibrary");
         addLazyBuiltin("set.rb", "set", "org.jruby.ext.set.SetLibrary");
+        addLazyBuiltin("date.jar", "date", "org.jruby.ext.date.DateLibrary");
 
         addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
         addLazyBuiltin("mathn/rational.jar", "mathn/rational", "org.jruby.ext.mathn.Rational");

diff --git a/lib/ruby/stdlib/date.rb b/lib/ruby/stdlib/date.rb
@@ -194,6 +194,7 @@
 #     puts secs_to_new_year()
 
 require 'date/format'
+require 'date.jar'
 
 # Class representing a date.
 #
@@ -1948,7 +1949,4 @@ def to_datetime
 
   private_class_method :today
   public_class_method  :now
-
-  # Adds native implemented methods...
-  org.jruby.ext.date.DateLibrary.new.load JRuby.runtime, false
 end