unicode 15.0

Author: ahorek

core/pom.rb

@@ -52,7 +52,7 @@
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
   jar 'org.jruby.joni:joni:2.2.3'
-  jar 'org.jruby.jcodings:jcodings:1.0.61'
+  jar 'org.jruby.jcodings:jcodings:1.0.62'
   jar 'org.jruby:dirgra:0.5'
 
   jar 'com.headius:invokebinder:1.14'

core/pom.xml

@@ -154,7 +154,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.61</version>
+      <version>1.0.62</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>

core/src/main/java/org/jruby/RubyConverter.java

@@ -89,6 +89,8 @@ public class RubyConverter extends RubyObject {
     @JRubyConstant
     public static final int CR_NEWLINE_DECORATOR = EConvFlags.CR_NEWLINE_DECORATOR;
     @JRubyConstant
+    public static final int LF_NEWLINE_DECORATOR = EConvFlags.LF_NEWLINE_DECORATOR;
+    @JRubyConstant
     public static final int XML_TEXT_DECORATOR = EConvFlags.XML_TEXT_DECORATOR;
     @JRubyConstant
     public static final int XML_ATTR_CONTENT_DECORATOR = EConvFlags.XML_ATTR_CONTENT_DECORATOR;

core/src/main/java/org/jruby/util/io/EncodingUtils.java

@@ -735,7 +735,7 @@ public static int econvOpts(ThreadContext context, IRubyObject opt, int ecflags)
             } else if (v.toString().equals("cr")) {
                 ecflags |= EConvFlags.CR_NEWLINE_DECORATOR;
             } else if (v.toString().equals("lf")) {
-//                ecflags |= ECONV_LF_NEWLINE_DECORATOR;
+                ecflags |= EConvFlags.LF_NEWLINE_DECORATOR;
             } else if (v instanceof RubySymbol sym) {
                 throw argumentError(context, "unexpected value for newline option: " + sym.to_s(context).toString());
             } else {
@@ -764,6 +764,12 @@ public static int econvOpts(ThreadContext context, IRubyObject opt, int ecflags)
         }
         newlineflag |= !v.isNil();
 
+        v = ((RubyHash)opt).op_aref(context, Convert.asSymbol(context, "lf_newline"));
+        if (v.isTrue()) {
+            setflags |= EConvFlags.LF_NEWLINE_DECORATOR;
+        }
+        newlineflag |= !v.isNil();        
+
         if (newlineflag) {
             ecflags &= ~EConvFlags.NEWLINE_DECORATOR_MASK;
             ecflags |= setflags;