Skip to content

Commit 684084d

Browse files
committed
Update build & release
1 parent 2604a45 commit 684084d

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

build.sbt

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
2+
import com.softwaremill.Publish.ossPublishSettings
3+
14
lazy val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
25
organization := "com.softwaremill.akka-http-session",
36
scalaVersion := "2.13.8",
4-
crossScalaVersions := Seq(scalaVersion.value, "2.12.15")
7+
crossScalaVersions := Seq(scalaVersion.value, "2.12.15"),
8+
versionScheme := Some("early-semver")
59
)
610

711
val akkaHttpVersion = "10.2.7"
@@ -63,16 +67,16 @@ lazy val javaTests: Project = (project in file("javaTests"))
6367
.settings(commonSettings: _*)
6468
.settings(
6569
name := "javaTests",
66-
Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
70+
Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
6771
crossPaths := false, // https://github.com/sbt/junit-interface/issues/35
6872
publishArtifact := false,
6973
libraryDependencies ++= Seq(
7074
akkaStreamsProvided,
7175
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
7276
"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
7377
akkaStreamsTestkit,
74-
"junit" % "junit" % "4.13.2" % "test",
75-
"com.github.sbt" % "junit-interface" % "0.13.3" % "test",
78+
"junit" % "junit" % "4.13.2" % "test",
79+
"com.github.sbt" % "junit-interface" % "0.13.3" % "test",
7680
scalaTest
7781
)
7882
)

project/plugins.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % "1.9.14")
2-
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % "1.9.14")
3-
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-extra" % "1.9.14")
1+
val sbtSoftwareMillVersion = "2.0.9"
2+
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
3+
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
4+
addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-browser-test-js" % sbtSoftwareMillVersion)
5+
46
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.16")

version.sbt

-1
This file was deleted.

0 commit comments

Comments
 (0)