twirl that works with scala API

rockjam · Apr 30, 2018 · 0daf9ca · 0daf9ca
1 parent 0ea7902
commit 0daf9ca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/twirllib/src/mill/twirllib/TwirlModule.scala b/twirllib/src/mill/twirllib/TwirlModule.scala
@@ -23,7 +23,10 @@ trait TwirlModule extends mill.Module {
         MavenRepository("https://repo1.maven.org/maven2")
       ),
       Lib.depToDependency(_, "2.12.4"),
-      Seq(ivy"com.typesafe.play::twirl-compiler:${twirlVersion()}")
+      Seq(
+        ivy"com.typesafe.play::twirl-compiler:${twirlVersion()}",
+        ivy"org.scala-lang.modules::scala-parser-combinators:1.0.5"
+      )
     )
   }
 

diff --git a/twirllib/src/mill/twirllib/TwirlWorker.scala b/twirllib/src/mill/twirllib/TwirlWorker.scala
@@ -23,7 +23,7 @@ class TwirlWorker {
       case Some((sig, instance)) if sig == classloaderSig => instance
       case _ =>
         val cl = new URLClassLoader(twirlClasspath.map(_.toIO.toURI.toURL).toArray)
-        val twirlCompilerClass = cl.loadClass("play.japi.twirl.compiler.TwirlCompiler")
+        val twirlCompilerClass = cl.loadClass("play.twirl.compiler.TwirlCompiler")
         // Use the Java API (available in Twirl 1.3+)
         // Using reflection on a method with "Seq[String] = Nil" parameter type does not seem to work.
 
@@ -34,8 +34,16 @@ class TwirlWorker {
           classOf[java.io.File],
           classOf[java.io.File],
           classOf[java.lang.String],
-          classOf[util.Collection[java.lang.String]],
-          classOf[util.List[java.lang.String]])
+          cl.loadClass("scala.collection.Seq"),
+          cl.loadClass("scala.collection.Seq"),
+          cl.loadClass("scala.io.Codec"),
+          classOf[Boolean]
+        )
+
+        val defaultAdditionalImportsMethod = twirlCompilerClass.getMethod("compile$default$5")
+        val defaultConstructorAnnotationsMethod = twirlCompilerClass.getMethod("compile$default$6")
+        val defaultCodecMethod = twirlCompilerClass.getMethod("compile$default$7")
+        val defaultFlagMethod = twirlCompilerClass.getMethod("compile$default$8")
 
         val instance = new TwirlWorkerApi {
           override def compileTwirl(source: File,
@@ -48,8 +56,11 @@ class TwirlWorker {
               sourceDirectory,
               generatedDirectory,
               formatterType,
-              additionalImports.asJava,
-              constructorAnnotations.asJava)
+              defaultAdditionalImportsMethod.invoke(null),
+              defaultConstructorAnnotationsMethod.invoke(null),
+              defaultCodecMethod.invoke(null),
+              defaultFlagMethod.invoke(null)
+            )
           }
         }
         twirlInstanceCache = Some((classloaderSig, instance))