Skip to content

Commit

Permalink
Fixed minor sbt problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Martomate committed Dec 4, 2023
1 parent 8e32e65 commit c041080
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ ThisBuild / publishArtifact := false
ThisBuild / logBuffered := false
ThisBuild / fork := true

val commonSettings: Seq[Def.SettingsDefinition] = Defaults.coreDefaultSettings ++ Seq(
artifactName := { (sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
module.organization + "." + artifact.name + "-" + module.revision + "." + artifact.extension
val commonSettings: scala.Seq[Def.Setting[?]] = Defaults.coreDefaultSettings ++ Seq(
artifactName := { (_: ScalaVersion, module: ModuleID, artifact: Artifact) =>
module.organization + "." + module.name + "-" + module.revision + "." + artifact.extension
},
scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature")
)

lazy val root = project
lazy val hexacraft = project
.in(file("."))
.aggregate(nbt, game)
.dependsOn(nbt, game)
Expand All @@ -33,14 +33,15 @@ lazy val game = project
.dependsOn(nbt)
.settings(commonSettings*)
.settings( // General
name := "hexacraft",
javaOptions ++= (if (isMac) Some("-XstartOnFirstThread") else None)
)
.settings( // Dependencies
libraryDependencies ++= lwjglDependencies ++ Seq(Joml) ++ Seq(MUnit, Mockito) ++ ArchUnit
)
.enablePlugins(PackPlugin)
.settings( // Packaging
.settings( // Packaging (using sbt-pack)
moduleName := "hexacraft",
packArchivePrefix := "hexacraft",
packMain := Map(
"hexacraft" -> "hexacraft.main.Main",
"hexacraft-mac" -> "hexacraft.main.Main"
Expand All @@ -50,7 +51,6 @@ lazy val game = project
"hexacraft-mac" -> Seq("-XstartOnFirstThread")
),
packJarNameConvention := "full",
packCopyDependenciesTarget := packTargetDir.value / packDir.value / "libs",
packGenerateMakefile := false,
packArchiveExcludes := Seq("VERSION", "bin/hexacraft-mac.bat")
)

0 comments on commit c041080

Please sign in to comment.