Move ISO-8859-16 charset impl into jcodings.

jruby · Aug 25, 2017 · a75c710 · a75c710
1 parent 38e16f8
commit a75c710
Showing 4 changed files with 3 additions and 199 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -54,7 +54,7 @@
 
   jar 'org.jruby.joni:joni:2.1.12'
   jar 'org.jruby.extras:bytelist:1.0.15'
-  jar 'org.jruby.jcodings:jcodings:1.0.25'
+  jar 'org.jruby.jcodings:jcodings:1.0.26'
   jar 'org.jruby:dirgra:0.3'
 
   jar 'com.headius:invokebinder:1.9'

diff --git a/core/pom.xml b/core/pom.xml
@@ -183,7 +183,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.25</version>
+      <version>1.0.26-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>

diff --git a/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java b/core/src/main/java/org/jruby/runtime/encoding/EncodingService.java
@@ -5,6 +5,7 @@
 import org.jcodings.EncodingDB.Entry;
 import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.ISO8859_16Encoding;
+import org.jcodings.spi.ISO_8859_16;
 import org.jcodings.util.CaseInsensitiveBytesHash;
 import org.jcodings.util.Hash.HashEntryIterator;
 import org.jruby.Ruby;
@@ -24,7 +25,6 @@
 import org.jruby.RubyString;
 import org.jruby.ext.nkf.RubyNKF;
 import org.jruby.util.SafePropertyAccessor;
-import org.jruby.util.encoding.ISO_8859_16;
 import org.jruby.util.io.EncodingUtils;
 
 public final class EncodingService {

diff --git a/core/src/main/java/org/jruby/util/encoding/ISO_8859_16.java b/core/src/main/java/org/jruby/util/encoding/ISO_8859_16.java