Add support for Kotlin 1.7

.gitignore

@@ -1,2 +1,3 @@
 target/
-.idea
+.idea
+.bsp

build.sbt

@@ -36,5 +36,6 @@ bintrayOrganization := None
 // scripted
 scriptedLaunchOpts ++= Seq(
  "-Xmx1024m",
- "-Dplugin.version=" + version.value
-)
+ "-Dplugin.org=" + organization.value,
+ "-Dplugin.name=" + name.value,
+ "-Dplugin.version=" + version.value)

project/plugins.sbt

@@ -1,4 +1,4 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

src/main/scala/KotlinCompile.scala

@@ -3,13 +3,13 @@ package kotlin
 import java.io.File
 import java.lang.reflect.{Field, Method}
 import java.util.jar.JarEntry
-
 import sbt.Keys.{Classpath, TaskStreams}
 import sbt._
 import sbt.io._
 import sbt.internal.inc.classpath.ClasspathUtilities
 
 import collection.JavaConverters._
+import scala.math.Ordered.orderingToOrdered
 import scala.util.Try
 
 /**
@@ -27,6 +27,7 @@ object KotlinCompile {
 
  def compile(options: Seq[String],
  jvmTarget: String,
+ kotlinVersion: String,
  sourceDirs: Seq[File],
  kotlinPluginOptions: Seq[String],
  classpath: Classpath,
@@ -35,7 +36,7 @@ object KotlinCompile {
  import language.reflectiveCalls
  val stub = KotlinStub(s, kotlinMemo(compilerClasspath))
  val args = stub.compilerArgs
- stub.parse(args.instance, options.toList)
+ stub.parse(kotlinVersion, args.instance, options.toList)
  val kotlinFiles = "*.kt" || "*.kts"
  val javaFiles = "*.java"
 
@@ -147,16 +148,31 @@ case class KotlinStub(s: TaskStreams, kref: KotlinReflection) {
  Proxy.newProxyInstance(cl, Array(messageCollectorClass), messageCollectorInvocationHandler)
  }
 
- def parse(args: Object, options: List[String]): Unit = {
+ def parse(kotlinVersion: String, args: Object, options: List[String]): Unit = {
  // TODO FIXME, this is much worse than it used to be, the parsing api has been
  // deeply in flux since 1.1.x
  val parser = kref.cl.loadClass(
  "org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt")
  val commonToolArguments = cl.loadClass(
- "org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments")
- val parserMethod = parser.getMethod("parseCommandLineArguments", classOf[java.util.List[java.lang.String]], commonToolArguments)
+ "org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments"
+ )
  import collection.JavaConverters._
- parserMethod.invoke(null, options.asJava, args)
+ if (KotlinVersion(kotlinVersion) < KotlinVersion("1.7.0")) {
+ val parserMethod = parser.getMethod(
+ "parseCommandLineArguments",
+ classOf[java.util.List[java.lang.String]],
+ commonToolArguments
+ )
+ parserMethod.invoke(null, options.asJava, args)
+ } else {
+ val parserMethod = parser.getMethod(
+ "parseCommandLineArguments",
+ classOf[java.util.List[java.lang.String]],
+ commonToolArguments,
+ classOf[Boolean]
+ )
+ parserMethod.invoke(null, options.asJava, args, false: java.lang.Boolean)
+ }
  }
 
  def compilerArgs = {

src/main/scala/KotlinPlugin.scala

@@ -57,7 +57,7 @@ object KotlinPlugin extends AutoPlugin {
  }
  },
  kotlinVersion := "1.3.50",
- kotlincJvmTarget := "1.6",
+ kotlincJvmTarget := "1.8",
  kotlincOptions := Nil,
  kotlincPluginOptions := Nil,
  watchSources ++= {
@@ -80,6 +80,7 @@ object KotlinPlugin extends AutoPlugin {
  kotlinCompile := Def.task {
  KotlinCompile.compile(kotlincOptions.value,
  kotlincJvmTarget.value,
+ kotlinVersion.value,
  sourceDirectories.value, kotlincPluginOptions.value,
  dependencyClasspath.value, (managedClasspath in KotlinInternal).value,
  classDirectory.value, streams.value)

src/sbt-test/kotlin/basic-tests/project/plugins.sbt

@@ -1,9 +1 @@
-{
- val ver = System.getProperty("plugin.version")
- if (ver == null)
- throw new RuntimeException("""
- |The system property 'plugin.version' is not defined.
- |Specify this property using scriptedLaunchOpts -Dplugin.version."""
- .stripMargin)
- else addSbtPlugin("com.hanhuy.sbt" % "kotlin-plugin" % ver)
-}
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/basic/project/plugins.sbt

@@ -1,9 +1 @@
-{
- val ver = System.getProperty("plugin.version")
- if (ver == null)
- throw new RuntimeException("""
- |The system property 'plugin.version' is not defined.
- |Specify this property using scriptedLaunchOpts -Dplugin.version."""
- .stripMargin)
- else addSbtPlugin("com.hanhuy.sbt" % "kotlin-plugin" % ver)
-}
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/kotlin-1.1-compat/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.hanhuy.sbt" % "kotlin-plugin" % sys.props("plugin.version"))
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/kotlin-1.2-compat/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.hanhuy.sbt" % "kotlin-plugin" % sys.props("plugin.version"))
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/kotlin-1.3-compat/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.hanhuy.sbt" % "kotlin-plugin" % sys.props("plugin.version"))
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/kotlin-1.5-compat/build.sbt

@@ -0,0 +1,10 @@
+kotlinLib("stdlib")
+
+kotlinVersion := "1.5.32"
+
+val listClasses = taskKey[Unit]("listClasses")
+
+listClasses := {
+ val classes = (classDirectory in Compile).value.listFiles()
+ streams.value.log.info("classes: " + classes)
+}

src/sbt-test/kotlin/kotlin-1.5-compat/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin(sys.props("plugin.org") % sys.props("plugin.name") % sys.props("plugin.version"))

src/sbt-test/kotlin/kotlin-1.5-compat/src/main/kotlin/SimpleScript.kts

@@ -0,0 +1 @@
+println("Hello world!")

src/sbt-test/kotlin/kotlin-1.5-compat/src/main/kotlin/simple.kt

@@ -0,0 +1,16 @@
+package demo
+
+sealed interface Polygon
+sealed interface Fillable
+
+class FilledRectangle: Polygon, Fillable
+
+@JvmInline
+value class Password(val s: String)
+
+// Test some Kotlin 1.5 features
+fun main() {
+ val rectangle = FilledRectangle()
+
+ val password = Password("")
+}

src/sbt-test/kotlin/kotlin-1.5-compat/test

@@ -0,0 +1,4 @@
+> compile
+> listClasses
+$ exists target/scala-2.12/classes/demo/SimpleKt.class
+$ exists target/scala-2.12/classes/SimpleScript.class

src/sbt-test/kotlin/kotlin-1.6-compat/build.sbt

@@ -0,0 +1,10 @@
+kotlinLib("stdlib")
+
+kotlinVersion := "1.6.21"
+
+val listClasses = taskKey[Unit]("listClasses")
+
+listClasses := {
+ val classes = (classDirectory in Compile).value.listFiles()
+ streams.value.log.info("classes: " + classes)
+}