[Git][java-team/scala][master] 4 commits: Preserve the compatibility with Java 8 when compiling with Java 11

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / scala


Commits:
fb64df85 by Emmanuel Bourg at 2018-11-15T23:43:32Z
Preserve the compatibility with Java 8 when compiling with Java 11

- - - - -
ccae5ab3 by Emmanuel Bourg at 2018-11-15T23:44:10Z
Removed the get-orig-source target in debian/rules

- - - - -
68ed8dbe by Emmanuel Bourg at 2018-11-15T23:44:21Z
Use salsa.debian.org Vcs-* URLs

- - - - -
537cc2a7 by Emmanuel Bourg at 2018-11-15T23:45:14Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0018-bytebuffer-backward-compatibility.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+scala (2.11.12-4) unstable; urgency=medium
+
+  * Team upload.
+  * Preserve the compatibility with Java 8 when compiling with Java 11
+  * Removed the get-orig-source target in debian/rules
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 16 Nov 2018 00:45:01 +0100
+
 scala (2.11.12-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -22,8 +22,8 @@ Build-Depends:
  scala-parser-combinators,
  scala-xml
 Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/scala.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/scala.git
+Vcs-Git: https://salsa.debian.org/java-team/scala.git
+Vcs-Browser: https://salsa.debian.org/java-team/scala
 Homepage: http://www.scala-lang.org/
 
 Package: scala


=====================================
debian/patches/0018-bytebuffer-backward-compatibility.patch
=====================================
@@ -0,0 +1,58 @@
+Description: Preserves the compatibility with Java 8 when compiling with Java 11
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/compiler/scala/tools/nsc/io/SourceReader.scala
++++ b/src/compiler/scala/tools/nsc/io/SourceReader.scala
+@@ -8,7 +8,7 @@
+ package io
+ 
+ import java.io.{ FileInputStream, InputStream, IOException }
+-import java.nio.{ByteBuffer, CharBuffer}
++import java.nio.{Buffer, ByteBuffer, CharBuffer}
+ import java.nio.channels.{ ReadableByteChannel, Channels }
+ import java.nio.charset.{CharsetDecoder, CoderResult}
+ import scala.tools.nsc.reporters._
+@@ -58,13 +58,13 @@
+   /** Reads the specified byte channel. */
+   protected def read(input: ReadableByteChannel): Array[Char] = {
+     val decoder: CharsetDecoder = this.decoder.reset()
+-    val bytes: ByteBuffer       = this.bytes; bytes.clear()
+-    var chars: CharBuffer       = this.chars; chars.clear()
++    val bytes: ByteBuffer       = this.bytes; bytes.asInstanceOf[Buffer].clear().asInstanceOf[ByteBuffer]
++    var chars: CharBuffer       = this.chars; chars.asInstanceOf[Buffer].clear().asInstanceOf[CharBuffer]
+     var endOfInput              = false
+ 
+     while (!endOfInput ) {
+       endOfInput = input.read(bytes) < 0
+-      bytes.flip()
++      bytes.asInstanceOf[Buffer].flip()
+       chars = decode(decoder, bytes, chars, endOfInput)
+     }
+     terminate(flush(decoder, chars))
+@@ -73,7 +73,7 @@
+   /** Reads the specified byte buffer. */
+   protected def read(bytes: ByteBuffer): Array[Char] = {
+     val decoder: CharsetDecoder = this.decoder.reset()
+-    val chars: CharBuffer = this.chars; chars.clear()
++    val chars: CharBuffer = this.chars; chars.asInstanceOf[Buffer].clear().asInstanceOf[CharBuffer]
+     terminate(flush(decoder, decode(decoder, bytes, chars, endOfInput = true)))
+   }
+ 
+@@ -125,7 +125,7 @@
+   def flush(decoder: CharsetDecoder, chars: CharBuffer): CharBuffer = {
+     val result: CoderResult = decoder.flush(chars)
+     if (result.isUnderflow()) {
+-      chars.flip()
++      chars.asInstanceOf[Buffer].flip()
+       chars
+     } else {
+       if (result.isError()) throw new IOException(result.toString())
+@@ -139,7 +139,7 @@
+    * content but with an increased capacity.
+    */
+   private def increaseCapacity(buffer: CharBuffer): CharBuffer = {
+-    buffer.flip()
++    buffer.asInstanceOf[Buffer].flip()
+     val capacity = 2 * buffer.capacity()
+     CharBuffer.allocate(capacity).put(buffer)
+   }


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
 0015-java9-compatibility.patch
 0016-nobootcp-by-default.patch
 0017-bug912393.patch
+0018-bytebuffer-backward-compatibility.patch


=====================================
debian/rules
=====================================
@@ -50,6 +50,3 @@ override_dh_compress:
 
 	dh_compress -X.js -X.scala
 	gzip --best -n debian/scala/usr/share/scala-2.11/man/man1/*.1
-
-get-orig-source:
-	uscan --download-current-version --rename



View it on GitLab: https://salsa.debian.org/java-team/scala/compare/46da5d4c94c5aed0c158bf066365ce73add1db37...537cc2a77df5e081d47b09c27752784e92586af8

-- 
View it on GitLab: https://salsa.debian.org/java-team/scala/compare/46da5d4c94c5aed0c158bf066365ce73add1db37...537cc2a77df5e081d47b09c27752784e92586af8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181115/e380ee4d/attachment.html>