@@ -182,6 +182,15 @@ lazy val cli = project
182182 // sbt invokes it directly (e.g. from the scip-kotlinc snapshots
183183 // task) so it cannot kill the surrounding sbt process.
184184 Compile / run / fork := true ,
185+ Test / fork := true ,
186+ // Our CI set up is a couple of measly vCPUs so parallelising tests there makes
187+ // everything worse.
188+ Test / testForkedParallel := ! sys.env.contains(" CI" ),
189+ // The SCIP build tool drives javac in-process; on JDK 17+ this requires
190+ // opening the JDK-internal javac packages.
191+ Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix(" -J" )),
192+ // Pin the JDK version embedded in stdlib SCIP symbols so output is stable.
193+ Test / javaOptions += " -Dscip.jdk.version=11" ,
185194 libraryDependencies ++=
186195 List (
187196 " com.github.ajalt.clikt" % " clikt-jvm" % V .clikt,
@@ -195,6 +204,13 @@ lazy val cli = project
195204 " org.jetbrains.kotlin" % " kotlin-scripting-dependencies-maven" %
196205 V .kotlinVersion
197206 ),
207+ libraryDependencies ++=
208+ Seq (
209+ " org.jetbrains.kotlin" % " kotlin-test" % V .kotlinVersion % Test ,
210+ " org.jetbrains.kotlin" % " kotlin-test-junit5" % V .kotlinVersion % Test ,
211+ " com.github.sbt.junit" % " jupiter-interface" %
212+ JupiterKeys .jupiterVersion.value % Test
213+ ),
198214 (Compile / resourceGenerators) +=
199215 Def
200216 .task {
@@ -450,32 +466,6 @@ def javacModuleOptions = List(
450466 " -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
451467)
452468
453- lazy val buildTools = project
454- .in(file(" tests/buildTools" ))
455- .enablePlugins(KotlinPlugin )
456- .settings(
457- publish / skip := true ,
458- kotlinVersion := V .kotlinVersion,
459- kotlincJvmTarget := " 11" ,
460- Test / fork := true ,
461- // Our CI set up is a couple of measly vCPUs so parallelising tests there makes
462- // everything worse
463- Test / testForkedParallel := ! sys.env.contains(" CI" ),
464- // The SCIP build tool drives javac in-process; on JDK 17+ this requires
465- // opening the JDK-internal javac packages.
466- Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix(" -J" )),
467- // Pin the JDK version embedded in stdlib SCIP symbols so output is stable.
468- Test / javaOptions += " -Dscip.jdk.version=11" ,
469- libraryDependencies ++=
470- Seq (
471- " org.jetbrains.kotlin" % " kotlin-test" % V .kotlinVersion % Test ,
472- " org.jetbrains.kotlin" % " kotlin-test-junit5" % V .kotlinVersion % Test ,
473- " com.github.sbt.junit" % " jupiter-interface" %
474- JupiterKeys .jupiterVersion.value % Test
475- )
476- )
477- .dependsOn(cli)
478-
479469lazy val snapshots = project
480470 .in(file(" tests/snapshots" ))
481471 .settings(
0 commit comments