From 3862a5bde70d3a63aa6a93c7190b724c31a51f33 Mon Sep 17 00:00:00 2001
From: carwilki <cwilkins@reonomy.com>
Date: Mon, 20 Mar 2023 16:31:15 -0700
Subject: [PATCH] upgraded sbt to current version to work with sbt and bloop
 build server. (#679)

Co-authored-by: Carson Wilkins <carson.wilkins@databricks.com>
---
 .gitignore               |  9 +++++++++
 build.sbt                | 31 ++++++-------------------------
 project/build.properties |  2 +-
 project/plugins.sbt      |  3 +--
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index dfe5f4ae9..391e3291b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,12 @@ project/target/
 \.terraform
 terraform.tfstate*
 \.terraform.lock.hcl
+*/.bloop
+*/.bsp
+*/.idea
+*/.metals
+*/.vscode
+.bloop
+.bsp
+.metals
+.idea
diff --git a/build.sbt b/build.sbt
index 019d441ae..fb4a637dd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,8 +7,8 @@ version := "0.7.2.0"
 scalaVersion := "2.12.12"
 scalacOptions ++= Seq("-Xmax-classfile-name", "78")
 
-fork in Test := true
-envVars in Test := Map("OVERWATCH_ENV" -> " ","OVERWATCH_TOKEN" -> " ","OVERWATCH" -> " ")
+Test / fork  := true
+Test / envVars := Map("OVERWATCH_ENV" -> " ","OVERWATCH_TOKEN" -> " ","OVERWATCH" -> " ")
 
 val sparkVersion = "3.1.2"
 libraryDependencies += "org.apache.spark" %% "spark-core" % sparkVersion % Provided
@@ -29,8 +29,8 @@ libraryDependencies += "com.github.mrpowers" %% "spark-fast-tests" % "0.23.0" %
 libraryDependencies += "org.mockito" % "mockito-core" % "3.5.15" % Test
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % Test
 
-run in Compile := Defaults.runTask(fullClasspath in Compile, mainClass in (Compile, run), runner in (Compile, run)).evaluated
-runMain in Compile := Defaults.runMainTask(fullClasspath in Compile, runner in(Compile, run)).evaluated
+Compile / run := Defaults.runTask(Compile / fullClasspath ,Compile/ run / mainClass, Compile / run / runner).evaluated
+Compile / runMain  := Defaults.runMainTask(Compile / fullClasspath,Compile / run /  runner ).evaluated
 
 // groupId, SCM, license information
 homepage := Some(url("https://github.com/databrickslabs/overwatch"))
@@ -38,8 +38,7 @@ scmInfo := Some(ScmInfo(url("https://github.com/databrickslabs/overwatch"), "git
 developers := List(Developer("geeksheikh", "Daniel Tomes", "daniel@databricks.com", url("https://github.com/GeekSheikh")))
 licenses += ("Databricks", url("https://github.com/databrickslabs/overwatch/blob/develop/LICENSE"))
 publishMavenStyle := true
-
-parallelExecution in Test := false //TO avoid object collision happening in PipelineFunctionsTest
+Test / parallelExecution := false //TO avoid object collision happening in PipelineFunctionsTest
 
 publishTo := Some(
   if (version.value.endsWith("SNAPSHOT"))
@@ -48,26 +47,8 @@ publishTo := Some(
     Opts.resolver.sonatypeStaging
 )
 
-// enforce execution of tests during packaging - uncomment next line when we fix dependencies
-// Keys.`package` := (Compile / Keys.`package` dependsOn Test / test).value
-
-//coverageEnabled := true
-//coverageMinimum := 80
-//coverageFailOnMinimum := true
-
-//test in assembly := {}
-
 assemblyMergeStrategy in assembly := {
   case PathList("META-INF", xs @ _*) => MergeStrategy.discard
   case x => MergeStrategy.first
 }
-assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
-
-// exclude scala-library dependency
-// assemblyExcludedJars in assembly := {
-//   val cp = (fullClasspath in assembly).value
-//   cp filter { f =>
-//     f.data.getName.contains("eventhubs") ||
-//     f.data.getName.contains("msal4j")
-//   }
-// }
+ assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false)
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index c0bab0494..c13a9b3a3 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.8.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 365e527c0..79c33f0b0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,5 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC6-8")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.5")
 addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.3")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
\ No newline at end of file