diff --git a/build.sbt b/build.sbt index 4a99715..7dc027e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,11 +1,11 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} import ReleaseTransformations._ -scalaVersion in ThisBuild := "2.12.10" -crossScalaVersions in ThisBuild := Seq("2.11.12", scalaVersion.value, "2.13.0") -organization in ThisBuild := "com.github.vertical-blank" +(ThisBuild / scalaVersion) := "2.12.10" +(ThisBuild / crossScalaVersions) := Seq("2.11.12", scalaVersion.value, "2.13.0") +(ThisBuild / organization) := "com.github.vertical-blank" -onChangedBuildSource in Global := ReloadOnSourceChanges +(Global / onChangedBuildSource) := ReloadOnSourceChanges lazy val root = project .in(file(".")) @@ -16,9 +16,8 @@ lazy val root = project .dependsOn(scala_sql_formatterJVM, scala_sql_formatterJS) -lazy val scala_sql_formatter = crossProject(JSPlatform, JVMPlatform) - .crossType(CrossType.Full) - .in(file(".")) +lazy val scala_sql_formatter = (file(".") / crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full)) .settings(moduleName := "scala-sql-formatter", sharedSettings, publishingSettings) .jvmSettings( libraryDependencies += "com.github.vertical-blank" % "sql-formatter" % "1.0.1" @@ -63,7 +62,7 @@ lazy val commonScalacOptions = Def.setting { lazy val sharedSettings = Seq( scalacOptions ++= commonScalacOptions.value, - (scalacOptions in Test) ~= (_.filterNot(_ == "-Xfatal-warnings")), + ((Test / scalacOptions)) ~= (_.filterNot(_ == "-Xfatal-warnings")), libraryDependencies ++= Seq( "org.scalatest" %%% "scalatest" % "3.2.0" % Test ) @@ -76,7 +75,7 @@ lazy val publishingSettings = Seq( description := "SQL Formatter for Scala", releasePublishArtifactsAction := PgpKeys.publishSigned.value, publishMavenStyle := true, - publishArtifact in Test := false, + (Test / publishArtifact) := false, pomIncludeRepository := { _ => false }, diff --git a/project/build.properties b/project/build.properties index 0837f7a..081fdbb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.10.0 diff --git a/version.sbt b/version.sbt index ed5ce45..43b0424 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.0.1" \ No newline at end of file +(ThisBuild / version) := "1.0.1" \ No newline at end of file