Skip to content

Commit fe32ab4

Browse files
committed
removing deprecated in references
1 parent e567c35 commit fe32ab4

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

build.sbt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Compile / compileOrder := CompileOrder.JavaThenScala
3737
// Spark session used by many tasks cannot be used concurrently.
3838
val testConcurrency = 1
3939
Test / fork := true
40-
concurrentRestrictions in Global := Seq(
40+
Global / concurrentRestrictions := Seq(
4141
Tags.limit(Tags.ForkedTestGroup, testConcurrency)
4242
)
4343

@@ -60,14 +60,14 @@ def groupByHash(tests: Seq[TestDefinition]): Seq[Tests.Group] = {
6060
lazy val commonSettings = Seq(
6161
//mainScalastyle := scalastyle.in(Compile).toTask("").value,
6262
//testScalastyle := scalastyle.in(Test).toTask("").value,
63-
testGrouping in Test := groupByHash((definedTests in Test).value),
63+
Test / testGrouping := groupByHash((Test / definedTests).value),
6464
//test in Test := ((test in Test) dependsOn mainScalastyle).value,
6565
//test in Test := ((test in Test) dependsOn testScalastyle).value,
6666
//test in Test := ((test in Test) dependsOn scalafmtCheckAll).value,
6767
//test in Test := ((test in Test) dependsOn (headerCheck in Compile)).value,
6868
//test in Test := ((test in Test) dependsOn (headerCheck in Test)).value,
69-
test in assembly := {},
70-
assemblyMergeStrategy in assembly := {
69+
assembly / test := {},
70+
assembly / assemblyMergeStrategy := {
7171
// Assembly jar is not executable
7272
case p if p.toLowerCase.contains("manifest.mf") =>
7373
MergeStrategy.discard
@@ -132,7 +132,7 @@ lazy val core = (project in file("."))
132132
publish / skip := false,
133133
// Adds the Git hash to the MANIFEST file. We set it here instead of relying on sbt-release to
134134
// do so.
135-
packageOptions in (Compile, packageBin) +=
135+
Compile / packageBin / packageOptions +=
136136
Package.ManifestAttributes("Git-Release-Hash" -> currentGitHash(baseDirectory.value)),
137137
bintrayRepository := "smolder",
138138
libraryDependencies ++= coreDependencies :+ scalaLoggingDependency.value,
@@ -189,10 +189,9 @@ ThisBuild / stableVersion := IO
189189
lazy val stagedRelease = (project in file("src/test"))
190190
.settings(
191191
commonSettings,
192-
resourceDirectory in Test := baseDirectory.value / "resources",
193-
scalaSource in Test := baseDirectory.value / "scala",
194-
unmanagedSourceDirectories in Test += baseDirectory.value / "shim" / majorMinorVersion(
195-
sparkVersion),
192+
Test / resourceDirectory := baseDirectory.value / "resources",
193+
Test / scalaSource := baseDirectory.value / "scala",
194+
Test / unmanagedSourceDirectories += baseDirectory.value / "shim" / majorMinorVersion(sparkVersion),
196195
libraryDependencies ++= testSparkDependencies ++ testCoreDependencies :+
197196
"com.databricks.labs" %% "smolder" % stableVersion.value % "test",
198197
resolvers := Seq("bintray-staging" at "https://dl.bintray.com/com.databricks.labs/smolder"),

0 commit comments

Comments
 (0)