Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ sbt 1.5.7 #26

Merged
merged 2 commits into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.cache
.history
.lib/
.bsp/
dist/*
target/
lib_managed/
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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)
Expand All @@ -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,
Expand Down Expand Up @@ -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) =>
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.12
sbt.version=1.5.7
4 changes: 1 addition & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "5.0.1-SNAPSHOT"
ThisBuild / version := "5.0.1-SNAPSHOT"