Merge pull request #33 from SethTisue/jdk11

add OpenJDK 11 to CI matrix

.travis.yml

@@ -5,10 +5,16 @@ cache:
   - $HOME/.sbt/boot
   - $HOME/.sbt/launchers
   - $HOME/.coursier
-jdk: oraclejdk8
+jdk:
+  - oraclejdk8
+  - openjdk11
 language: scala
+scala:
+  - 2.11.12
+  - 2.12.7
+  - 2.13.0-M5
 script:
-  - sbt +test +package
+  - sbt ++$TRAVIS_SCALA_VERSION test package
   - git diff --exit-code # check scalariform
 before_cache:
   - find $HOME/.sbt -name "*.lock" | xargs rm

build.sbt

@@ -4,7 +4,7 @@ organization := "com.lightbend"
 
 version := "1.2.1-SNAPSHOT"
 
-crossScalaVersions := Seq("2.12.7", "2.11.12", "2.13.0-M4")
+crossScalaVersions := Seq("2.12.7", "2.11.12", "2.13.0-M5")
 scalaVersion := crossScalaVersions.value.head
 
 bintrayOrganization := Some("typesafe")
@@ -24,7 +24,7 @@ scalacOptions in (Compile, console) ~= (_ filterNot Set(
 licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.0.6-SNAP1" % Test
+  "org.scalatest" %% "scalatest" % "3.0.6-SNAP3" % Test
 )
 
 initialCommands in console := {

src/main/scala-2.11/com/lightbend/emoji/ScalaVersionSpecific.scala

@@ -0,0 +1,7 @@
+package com.lightbend.emoji
+
+object ScalaVersionSpecific {
+  def checkLengths(sc: StringContext, args: Seq[Any]): Unit =
+    sc.checkLengths(args)
+}
+

src/main/scala-2.12/com/lightbend/emoji/ScalaVersionSpecific.scala

@@ -0,0 +1,7 @@
+package com.lightbend.emoji
+
+object ScalaVersionSpecific {
+  def checkLengths(sc: StringContext, args: Seq[Any]): Unit =
+    sc.checkLengths(args)
+}
+

src/main/scala-2.13.0-M5/com/lightbend/emoji/ScalaVersionSpecific.scala

@@ -0,0 +1,7 @@
+package com.lightbend.emoji
+
+object ScalaVersionSpecific {
+  def checkLengths(sc: StringContext, args: Seq[Any]): Unit =
+    StringContext.checkLengths(args, sc.parts)
+}
+

src/main/scala/com/typesafe/emoji/ShortCodes.scala → src/main/scala/com/lightbend/emoji/ShortCodes.scala

@@ -3,6 +3,8 @@
  */
 package com.lightbend.emoji
 
+import ScalaVersionSpecific.checkLengths
+
 /**
  * An emoji to shortcode mapping.  This is a class that should be declared and used
  * as an implicit value, so that shortcode mappings don't have to be global across
@@ -144,7 +146,7 @@ object ShortCodes {
         def emojify(s: String): String = colonSyntax.replaceAllIn(s, m =>
           try m.group(1).emoji.toString
           catch { case _: EmojiNotFound => m.matched })
-        sc.checkLengths(args)
+        checkLengths(sc, args)
         val sb = new java.lang.StringBuilder
         def process(part: String): String = emojify(StringContext.processEscapes(part))
         def partly(part: String): Unit = {