Skip to content

Commit 6b0266d

Browse files
committed
1. Further simplify javac settings (no dependency scope)
2. Configure minimized projects as java only Namely, disable incremental compilation, as it seems to wreak havoc
1 parent 4718bce commit 6b0266d

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

build.sbt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ lazy val minimizedSettings = List[Def.Setting[_]](
311311
(run / fork) := true,
312312
(Compile / unmanagedSourceDirectories) += minimizedSourceDirectory,
313313
libraryDependencies ++= List("org.projectlombok" % "lombok" % "1.18.22"),
314-
(Compile / javacOptions) ++=
314+
javacOptions ++=
315315
List[String](
316316
s"-Arandomtimestamp=${System.nanoTime()}",
317317
List(
@@ -327,13 +327,13 @@ lazy val minimizedSettings = List[Def.Setting[_]](
327327

328328
lazy val minimized = project
329329
.in(file("tests/minimized/.j11"))
330-
.settings(minimizedSettings)
330+
.settings(minimizedSettings, javaOnlySettings)
331331
.dependsOn(agent, plugin)
332332
.disablePlugins(JavaFormatterPlugin)
333333

334334
lazy val minimized8 = project
335335
.in(file("tests/minimized/.j8"))
336-
.settings(minimizedSettings, javaToolchainVersion := "8")
336+
.settings(minimizedSettings, javaToolchainVersion := "8", javaOnlySettings)
337337
.dependsOn(agent, plugin)
338338
.disablePlugins(JavaFormatterPlugin)
339339

@@ -354,6 +354,7 @@ def javacModuleOptions =
354354
lazy val minimized17 = project
355355
.in(file("tests/minimized/.j17"))
356356
.settings(
357+
javaOnlySettings,
357358
minimizedSettings,
358359
javaToolchainVersion := "17",
359360
javacOptions ++= javacModuleOptions
@@ -452,7 +453,7 @@ lazy val docs = project
452453
lazy val javaOnlySettings = List[Def.Setting[_]](
453454
autoScalaLibrary := false,
454455
incOptions ~= { old =>
455-
old.withEnabled(false)
456+
old.withEnabled(false).withApiDebug(true)
456457
},
457458
crossPaths := false
458459
)

project/JavaToolchainPlugin.scala

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object JavaToolchainPlugin extends AutoPlugin {
2626
}
2727
import autoImport._
2828

29-
lazy val configSettings = List(
29+
override lazy val projectSettings: Seq[Def.Setting[_]] = List(
3030
javacOptions ++=
3131
List(
3232
"-target",
@@ -40,21 +40,14 @@ object JavaToolchainPlugin extends AutoPlugin {
4040
(doc / javacOptions) --= bootclasspathSettings(javaToolchainVersion.value),
4141
(doc / javacOptions) --= List("-g"),
4242
javacOptions ++= bootclasspathSettings(javaToolchainVersion.value),
43-
javaOptions ++= bootclasspathSettings(javaToolchainVersion.value)
43+
javaOptions ++= bootclasspathSettings(javaToolchainVersion.value),
44+
fork := true,
45+
javaToolchainVersion := "11",
46+
javaToolchainJvmIndex := None,
47+
javaHome :=
48+
Some(getJavaHome(javaToolchainVersion.value, javaToolchainJvmIndex.value))
4449
)
4550

46-
override lazy val projectSettings: Seq[Def.Setting[_]] =
47-
List(Compile, Test).flatMap(c => inConfig(c)(configSettings)) ++
48-
List(
49-
fork := true,
50-
javaToolchainVersion := "11",
51-
javaToolchainJvmIndex := None,
52-
javaHome :=
53-
Some(
54-
getJavaHome(javaToolchainVersion.value, javaToolchainJvmIndex.value)
55-
)
56-
)
57-
5851
/**
5952
* For Java 8, we need to manually add the Java compiler to the boot
6053
* classpath.

0 commit comments

Comments
 (0)