|
| 1 | +import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings |
| 2 | +import com.softwaremill.Publish.ossPublishSettings |
| 3 | + |
1 | 4 | lazy val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
|
2 | 5 | organization := "com.softwaremill.akka-http-session",
|
3 | 6 | 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") |
5 | 9 | )
|
6 | 10 |
|
7 | 11 | val akkaHttpVersion = "10.2.7"
|
@@ -63,16 +67,16 @@ lazy val javaTests: Project = (project in file("javaTests"))
|
63 | 67 | .settings(commonSettings: _*)
|
64 | 68 | .settings(
|
65 | 69 | 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 |
67 | 71 | crossPaths := false, // https://github.com/sbt/junit-interface/issues/35
|
68 | 72 | publishArtifact := false,
|
69 | 73 | libraryDependencies ++= Seq(
|
70 | 74 | akkaStreamsProvided,
|
71 | 75 | "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
|
72 | 76 | "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
|
73 | 77 | 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", |
76 | 80 | scalaTest
|
77 | 81 | )
|
78 | 82 | )
|
|
0 commit comments