diff --git a/build.sbt b/build.sbt index a1afb7e..a9cbb90 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val root = project.in(file(".")) featherweightGoJVM ) -lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full))) +lazy val featherweightGo = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full) in file(".")) .settings( scalaVersion := scala213Version, scalacOptions ++= defaultScalacOptions, @@ -38,7 +38,7 @@ lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).c ) .jsSettings( scalacOptions += { - val a = ((LocalRootProject / baseDirectory)).value.toURI.toString + val a = (baseDirectory in LocalRootProject).value.toURI.toString val g = "https://raw.githubusercontent.com/y-yu/featherweight_go/" + tagOrHash.value s"-P:scalajs:mapSourceURI:$a->$g/" } @@ -47,7 +47,7 @@ lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).c mainClass := Some("featherweightgo.Main") ) -lazy val featherweightGoCore = ((file("./core") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure))) +lazy val featherweightGoCore = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure) in file("./core")) .settings( organization := "com.github.y-yu", name := "featherweight_go", @@ -78,7 +78,7 @@ lazy val publishSettings = Seq( else Opts.resolver.sonatypeStaging ), - (Test / publishArtifact) := false, + publishArtifact in Test := false, pomExtra := @@ -113,7 +113,7 @@ lazy val publishSettings = Seq( ) val tagName = Def.setting { - s"v${if (releaseUseGlobalVersion.value) ((ThisBuild / version)).value else version.value}" + s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}" } val tagOrHash = Def.setting { diff --git a/project/build.properties b/project/build.properties index 3040987..dbae93b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.4 +sbt.version=1.4.9