Tweaks

lensesio · Nov 16, 2023 · fe45f73 · fe45f73
1 parent 74bf659
commit fe45f73
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,6 @@ import sbt.Project.projectToLocalProject
 
 import java.io.File
 
-ThisBuild / scalaVersion := Dependencies.scalaVersion
-
 lazy val subProjects: Seq[Project] = Seq(
   `query-language`,
   common,
@@ -39,6 +37,7 @@ lazy val root = (project in file("."))
     publish := {},
     publishArtifact := false,
     name := "stream-reactor",
+    scalaVersion := Dependencies.scalaVersion,
   )
   .aggregate(
     subProjectsRefs: _*,

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -28,7 +28,7 @@ object Dependencies {
   // scala versions
   val scalaOrganization = "org.scala-lang"
   val scalaVersion      = "2.13.10"
-  val supportedScalaVersions: Seq[String] = List(Dependencies.scalaVersion)
+  //val supportedScalaVersions: Seq[String] = List(Dependencies.scalaVersion)
 
   val commonResolvers: Seq[MavenRepository] = Seq(
     Resolver sonatypeRepo "public",
@@ -43,8 +43,7 @@ object Dependencies {
 
   object Versions {
     // libraries versions
-    val scalatestVersion               = "3.2.15" // Higher versions result in org.scala-lang.modules:scala-xml conflicts
-    val scalaCheckPlusVersion          = "3.1.0.0"
+    val scalatestVersion               = "3.2.17"
     val scalatestPlusScalaCheckVersion = "3.1.0.0-RC2"
     val scalaCheckVersion              = "1.17.0"
     val randomDataGeneratorVersion     = "2.8"
@@ -204,11 +203,9 @@ object Dependencies {
 
   // testing
   val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
-  val scalatestPlusScalaCheck =
-    "org.scalatestplus" %% "scalatestplus-scalacheck" % scalatestPlusScalaCheckVersion
-  val scalaCheck      = "org.scalacheck" %% "scalacheck"      % scalaCheckVersion
-  val `mockito-scala` = "org.mockito"    %% "mockito-scala"   % mockitoScalaVersion
-  val junit           = "com.github.sbt"  % "junit-interface" % "0.13.3"
+
+  val scalaCheck      = "org.scalacheck" %% "scalacheck"    % scalaCheckVersion
+  val `mockito-scala` = "org.mockito"    %% "mockito-scala" % mockitoScalaVersion
 
   lazy val pegDown = "org.pegdown" % "pegdown" % "1.6.0"
 
@@ -483,14 +480,12 @@ trait Dependencies {
     catsEffect,
     scalatest,
     catsEffectScalatest,
-    scalatestPlusScalaCheck,
     scalaCheck,
     `mockito-scala`,
     `wiremock-jre8`,
     jerseyCommon,
     avro4s,
     kafkaClients,
-    junit,
   ) ++ enumeratum ++ circe ++ http4s
 
   //Specific modules dependencies

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -142,7 +142,7 @@ object Settings extends Dependencies {
     Compile / connectInput := true,
     Compile / outputStrategy := Some(StdoutOutput),
     resolvers ++= projectResolvers,
-    crossScalaVersions := Dependencies.supportedScalaVersions,
+    scalaVersion := Dependencies.scalaVersion,
     excludeDependencies ++= globalExcludeDeps,
     headerLicense := Some(HeaderLicense.ALv2(s"2017-$currentYear", "Lenses.io Ltd")),
   )

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,19 +1,21 @@
 // Activate the following only when needed to use specific tasks like `whatDependsOn` etc...
 //addDependencyTreePlugin
+ThisBuild / libraryDependencySchemes ++= Seq(
+  "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always,
+)
+addSbtPlugin("org.scalameta"     %% "sbt-scalafmt"       % "2.5.2")
+addSbtPlugin("org.scoverage"     %% "sbt-scoverage"      % "2.0.9")
+addSbtPlugin("de.heikoseeberger" %% "sbt-header"         % "5.9.0")
+addSbtPlugin("com.typesafe.sbt"  %% "sbt-license-report" % "1.2.0")
 
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt"       % "2.5.2")
-addSbtPlugin("org.scoverage"     % "sbt-scoverage"      % "1.9.3")
-addSbtPlugin("de.heikoseeberger" % "sbt-header"         % "5.9.0")
-addSbtPlugin("com.typesafe.sbt"  % "sbt-license-report" % "1.2.0")
+addSbtPlugin("net.vonbuchholtz" %% "sbt-dependency-check" % "4.0.0")
 
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "4.0.0")
-
-addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.14")
+addSbtPlugin("org.xerial.sbt" %% "sbt-pack" % "0.14")
 
 addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
+addSbtPlugin("com.typesafe.sbt" %% "sbt-license-report" % "1.2.0")
 
 //addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2")
 
-addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")
+addSbtPlugin("com.simplytyped" %% "sbt-antlr4" % "0.8.3")