Rely on the redefined Dep and DepSyntax dependencies in kotlinlib pac…

…kage
com-lihaoyi · Sep 16, 2024 · 6c502ba · 6c502ba
1 parent a3eedda
commit 6c502ba
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/example/kotlinlib/basic/1-simple/build.mill b/example/kotlinlib/basic/1-simple/build.mill
@@ -1,6 +1,6 @@
 //// SNIPPET:BUILD
 package build
-import mill._, kotlinlib._, scalalib._
+import mill._, kotlinlib._
 
 object `package` extends RootModule with KotlinModule {
 

diff --git a/example/kotlinlib/basic/2-custom-build-logic/build.mill b/example/kotlinlib/basic/2-custom-build-logic/build.mill
@@ -1,6 +1,6 @@
 //// SNIPPET:BUILD
 package build
-import mill._, kotlinlib._, scalalib._
+import mill._, kotlinlib._
 
 object `package` extends RootModule with KotlinModule {
 

diff --git a/example/kotlinlib/basic/2-custom-build-logic/src/foo/Foo.kt b/example/kotlinlib/basic/2-custom-build-logic/src/foo/Foo.kt
@@ -8,12 +8,10 @@ fun getLineCount(): String? {
             .getResourceAsStream("line-count.txt")
             .readAllBytes()
             .toString(Charsets.UTF_8)
-        )
     } catch (e: IOException) {
         null
     }
 }
 
-fun main() {
-    println("Line Count: " + getLineCount())
-}
+fun main() = println("Line Count: " + getLineCount())
+
diff --git a/example/kotlinlib/basic/3-multi-module/build.mill b/example/kotlinlib/basic/3-multi-module/build.mill
@@ -1,6 +1,6 @@
 //// SNIPPET:BUILD
 package build
-import mill._, kotlinlib._, scalalib._
+import mill._, kotlinlib._
 
 trait MyModule extends KotlinModule {
 

diff --git a/example/kotlinlib/basic/4-builtin-commands/build.mill b/example/kotlinlib/basic/4-builtin-commands/build.mill
@@ -1,6 +1,6 @@
 //// SNIPPET:BUILD
 package build
-import mill._, kotlinlib._, scalalib._
+import mill._, kotlinlib._
 
 trait MyModule extends KotlinModule {
 

diff --git a/kotlinlib/src/mill/kotlinlib/KotlinModule.scala b/kotlinlib/src/mill/kotlinlib/KotlinModule.scala
@@ -9,7 +9,7 @@ import mill.api.{PathRef, Result}
 import mill.define.{Command, ModuleRef, Task}
 import mill.kotlinlib.worker.api.KotlinWorker
 import mill.scalalib.api.{CompilationResult, ZincWorkerApi}
-import mill.scalalib.{Dep, DepSyntax, JavaModule, Lib, ZincWorkerModule}
+import mill.scalalib.{JavaModule, Lib, ZincWorkerModule}
 import mill.util.Util.millProjectModule
 import mill.{Agg, T}