Skip to content

Commit d8c66c1

Browse files
committed
Remove javaHome hack and deduplicate javacOptions in msgpack-jackson3
Replace the fragile JAVA17_HOME/JAVA_HOME path resolution with a simple requirement to run sbt under Java 17+ (managed via mise). Drop redundant -encoding/-Xlint flags already provided by buildSettings.
1 parent 2ac3cbc commit d8c66c1

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

build.sbt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -180,19 +180,8 @@ lazy val msgpackJackson3 = Project(id = "msgpack-jackson3", base = file("msgpack
180180
description := "Jackson 3.x extension that adds support for MessagePack",
181181
OsgiKeys.bundleSymbolicName := "org.msgpack.msgpack-jackson3",
182182
OsgiKeys.exportPackage := Seq("org.msgpack.jackson", "org.msgpack.jackson.dataformat"),
183-
// Jackson 3.x requires Java 17+
184-
Compile / javaHome := {
185-
val home = sys.env.getOrElse("JAVA17_HOME",
186-
sys.env.getOrElse("JAVA_HOME",
187-
sys.props.getOrElse("java.home", "")))
188-
val jdk17 = file(home)
189-
if (home.nonEmpty && jdk17.exists()) Some(jdk17)
190-
else throw new RuntimeException("Java 17 home not found. Set JAVA17_HOME or JAVA_HOME environment variable.")
191-
},
192-
Test / javaHome := (Compile / javaHome).value,
193-
doc / javaHome := (Compile / javaHome).value,
194-
Test / fork := true,
195-
javacOptions := Seq("-source", "17", "-target", "17", "-encoding", "UTF-8", "-Xlint:unchecked", "-Xlint:deprecation"),
183+
Test / fork := true,
184+
javacOptions := Seq("-source", "17", "-target", "17"),
196185
doc / javacOptions := Seq("-source", "17", "-Xdoclint:none"),
197186
libraryDependencies ++=
198187
Seq(

0 commit comments

Comments
 (0)