diff --git a/.gitignore b/.gitignore index 81f42eb..8f05ac3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .cache .history .lib/ +.bsp/ dist/* target/ lib_managed/ diff --git a/build.sbt b/build.sbt index d818bc6..c197f4f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbt.Keys.thisProjectRef -organization in ThisBuild := "io.waylay.kairosdb" +ThisBuild / organization := "io.waylay.kairosdb" val playWsVersion = "2.0.7" val playJsonVersion = "2.7.4" @@ -10,8 +10,8 @@ val dockerTestkitVersion = "0.10.0-beta8" val scalaTestVersion = "3.0.8" val playVersion = "2.7.3" // test only -val scala2_12 = "2.12.10" -val scala2_13 = "2.13.1" +val scala2_12 = "2.12.15" +val scala2_13 = "2.13.7" ThisBuild / scalaVersion := scala2_13 ThisBuild / crossScalaVersions := Seq(scala2_12, scala2_13) @@ -33,8 +33,8 @@ val exclusions = Seq( lazy val root = (project in file(".")) .settings( name := "kairosdb-scala", - fork in Test := true, - parallelExecution in IntegrationTest := false, + Test / fork := true, + IntegrationTest / parallelExecution := false, libraryDependencies ++= Seq( "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2", "com.typesafe.play" %% "play-json" % playJsonVersion, @@ -77,7 +77,7 @@ enablePlugins(SiteScaladocPlugin) val publishScalaDoc = (ref: ProjectRef) => ReleaseStep( - action = releaseStepTaskAggregated(ghpagesPushSite in ref) // publish scaladoc + action = releaseStepTaskAggregated(ref / ghpagesPushSite) // publish scaladoc ) val runIntegrationTest = (ref: ProjectRef) => diff --git a/project/build.properties b/project/build.properties index 654fe70..baf5ff3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.12 +sbt.version=1.5.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 191d4d9..26ea9d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,6 @@ -resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" - addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") diff --git a/version.sbt b/version.sbt index ebff591..9f42197 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "5.0.1-SNAPSHOT" +ThisBuild / version := "5.0.1-SNAPSHOT"