You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2022/12/09 23:23:39 UTC
[incubator-toree] branch master updated: [TOREE-533][BUILD] Migrate sbt script to slash syntax (#197)
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
The following commit(s) were added to refs/heads/master by this push:
new 1f3ee658 [TOREE-533][BUILD] Migrate sbt script to slash syntax (#197)
1f3ee658 is described below
commit 1f3ee658df8adfc1e864ba1f7b8951b183955e60
Author: Cheng Pan <pa...@gmail.com>
AuthorDate: Sat Dec 10 07:23:33 2022 +0800
[TOREE-533][BUILD] Migrate sbt script to slash syntax (#197)
---
build.sbt | 58 +++++++++++++++++++++++-----------------------
kernel/build.sbt | 2 +-
plugins/build.sbt | 2 +-
project/CommonPlugin.scala | 24 +++++++++----------
protocol/build.sbt | 4 +---
5 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/build.sbt b/build.sbt
index 7b98b564..d41889c2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,13 +18,13 @@
import scala.util.Properties
// Version settings
-version in ThisBuild := Properties.envOrElse("VERSION", "0.0.0-dev") +
- (if ((isSnapshot in ThisBuild).value) "-SNAPSHOT" else "")
-isSnapshot in ThisBuild := Properties.envOrElse("IS_SNAPSHOT","true").toBoolean
-organization in ThisBuild := "org.apache.toree.kernel"
-crossScalaVersions in ThisBuild := Seq("2.12.15") // https://github.com/scala/bug/issues/12475, for Spark 3.2.0
-scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
-Dependencies.sparkVersion in ThisBuild := {
+ThisBuild / version := Properties.envOrElse("VERSION", "0.0.0-dev") +
+ (if ((ThisBuild / isSnapshot ).value) "-SNAPSHOT" else "")
+ThisBuild / isSnapshot := Properties.envOrElse("IS_SNAPSHOT","true").toBoolean
+ThisBuild / organization := "org.apache.toree.kernel"
+ThisBuild / crossScalaVersions := Seq("2.12.15") // https://github.com/scala/bug/issues/12475, for Spark 3.2.0
+ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions ).value.head
+ThisBuild / Dependencies.sparkVersion := {
val envVar = "APACHE_SPARK_VERSION"
val defaultVersion = "3.0.0"
@@ -39,7 +39,7 @@ Dependencies.sparkVersion in ThisBuild := {
}
// Compiler settings
-scalacOptions in ThisBuild ++= Seq(
+ThisBuild / scalacOptions ++= Seq(
"-deprecation",
"-unchecked",
"-feature",
@@ -50,9 +50,9 @@ scalacOptions in ThisBuild ++= Seq(
)
// Java-based options for compilation (all tasks)
// NOTE: Providing a blank flag causes failures, only uncomment with options
-//javacOptions in Compile ++= Seq(""),
+// Compile / javacOptions ++= Seq(""),
// Java-based options for just the compile task
-javacOptions in ThisBuild ++= Seq(
+ThisBuild / javacOptions ++= Seq(
"-Xlint:all", // Enable all Java-based warnings
"-Xlint:-path", // Suppress path warnings since we get tons of them
"-Xlint:-options",
@@ -62,42 +62,42 @@ javacOptions in ThisBuild ++= Seq(
"-target", "1.6"
)
// Options provided to forked JVMs through sbt, based on our .jvmopts file
-javaOptions in ThisBuild ++= Seq(
+ThisBuild / javaOptions ++= Seq(
"-Xms1024M", "-Xmx4096M", "-Xss2m", "-XX:MaxPermSize=1024M",
"-XX:ReservedCodeCacheSize=256M", "-XX:+TieredCompilation",
"-XX:+CMSClassUnloadingEnabled",
"-XX:+UseConcMarkSweepGC", "-XX:+HeapDumpOnOutOfMemoryError"
)
// Add additional test option to show time taken per test
-testOptions in (ThisBuild, Test) += Tests.Argument("-oDF")
+ThisBuild / Test / testOptions += Tests.Argument("-oDF")
// Build-wide dependencies
-resolvers in ThisBuild ++= Seq(
+ThisBuild / resolvers ++= Seq(
"Apache Snapshots" at "https://repository.apache.org/snapshots/",
"Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/",
"Jitpack" at "https://jitpack.io",
"bintray-sbt-plugins" at "https://dl.bintray.com/sbt/sbt-plugin-releases"
)
-updateOptions in ThisBuild := updateOptions.value.withCachedResolution(true)
-libraryDependencies in ThisBuild ++= Seq(
+ThisBuild / updateOptions := updateOptions.value.withCachedResolution(true)
+ThisBuild / libraryDependencies ++= Seq(
Dependencies.scalaTest % "test",
Dependencies.mockito % "test",
Dependencies.jacksonDatabind % "test"
)
// Publish settings
-pgpPassphrase in ThisBuild := Some(Properties.envOrElse("GPG_PASSWORD","").toArray)
-publishTo in ThisBuild := {
+ThisBuild / pgpPassphrase := Some(Properties.envOrElse("GPG_PASSWORD","").toArray)
+ThisBuild / publishTo := {
if (isSnapshot.value)
Some("Apache Staging Repo" at "https://repository.apache.org/content/repositories/snapshots/")
else
Some("Apache Staging Repo" at "https://repository.apache.org/content/repositories/staging/")
}
-mappings in packageBin in ThisBuild := Seq(
+ThisBuild / packageBin / mappings := Seq(
file("LICENSE") -> "LICENSE",
file("NOTICE") -> "NOTICE"
)
-licenses in ThisBuild := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-pomExtra in ThisBuild := {
+ThisBuild / licenses := Seq("Apache 2" -> url("https://www.apache.org/licenses/LICENSE-2.0.txt"))
+ThisBuild / pomExtra := {
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -113,7 +113,7 @@ pomExtra in ThisBuild := {
<tag>HEAD</tag>
</scm>
}
-credentials in ThisBuild+= Credentials(Path.userHome / ".ivy2" / ".credentials")
+ThisBuild / credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
// Project structure
@@ -202,7 +202,7 @@ lazy val kernel = (project in file("kernel"))
// Root project settings
enablePlugins(ScalaUnidocPlugin)
-scalacOptions in (ScalaUnidoc, unidoc) ++= Seq(
+(ScalaUnidoc / unidoc / scalacOptions) ++= Seq(
"-Ymacro-expand:none",
"-skip-packages", Seq(
"akka",
@@ -212,20 +212,20 @@ scalacOptions in (ScalaUnidoc, unidoc) ++= Seq(
)
libraryDependencies ++= Dependencies.sparkAll.value
-unmanagedResourceDirectories in Compile += { baseDirectory.value / "dist/toree-legal" }
+Compile / unmanagedResourceDirectories += { baseDirectory.value / "dist/toree-legal" }
-assemblyShadeRules in assembly := Seq(
+assembly / assemblyShadeRules := Seq(
ShadeRule.rename("org.clapper.classutil.**" -> "shadeclapper.@0").inAll,
ShadeRule.rename("org.objectweb.asm.**" -> "shadeasm.@0").inAll
)
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy := {
case "module-info.class" => MergeStrategy.discard
case x =>
- val oldStrategy = (assemblyMergeStrategy in assembly).value
+ val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
}
-test in assembly := {}
-assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
-aggregate in assembly := false
+assembly / test := {}
+assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeScala = false)
+assembly / aggregate := false
diff --git a/kernel/build.sbt b/kernel/build.sbt
index 99951cd3..f77546a5 100644
--- a/kernel/build.sbt
+++ b/kernel/build.sbt
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-fork in Test := true
+Test / fork := true
libraryDependencies ++= Dependencies.sparkAll.value
libraryDependencies += Dependencies.guava
diff --git a/plugins/build.sbt b/plugins/build.sbt
index f41d40bb..88f9a494 100644
--- a/plugins/build.sbt
+++ b/plugins/build.sbt
@@ -15,7 +15,7 @@
* limitations under the License
*/
-fork in Test := true
+Test / fork := true
// Needed for type inspection
libraryDependencies ++= Seq(
diff --git a/project/CommonPlugin.scala b/project/CommonPlugin.scala
index 093fad92..5ac5a8d7 100644
--- a/project/CommonPlugin.scala
+++ b/project/CommonPlugin.scala
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License
*/
-import sbt._
+import sbt.{Def, _}
import sbt.Keys._
object CommonPlugin extends AutoPlugin {
@@ -29,24 +29,24 @@ object CommonPlugin extends AutoPlugin {
}
import autoImport._
- override def projectSettings = {
+ override def projectSettings: Seq[Def.Setting[_]] = {
inConfig(UnitTest)(Defaults.testSettings) ++
inConfig(IntegrationTest)(Defaults.testSettings) ++
inConfig(SystemTest)(Defaults.testSettings) ++
Seq(
- testOptions in UnitTest := Seq(Tests.Filter(unitFilter)),
- testOptions in IntegrationTest := Seq(Tests.Filter(intFilter)),
- testOptions in SystemTest := Seq(Tests.Filter(sysFilter)),
+ UnitTest / testOptions := Seq(Tests.Filter(unitFilter)),
+ IntegrationTest / testOptions := Seq(Tests.Filter(intFilter)),
+ SystemTest / testOptions := Seq(Tests.Filter(sysFilter)),
// Add a global resource directory with compile/ and test/ for resources in all projects
- unmanagedResourceDirectories in Compile ++= Seq(
- (baseDirectory in ThisBuild).value / "resources" / "compile"
+ Compile / unmanagedResourceDirectories ++= Seq(
+ (ThisBuild / baseDirectory).value / "resources" / "compile"
),
- unmanagedResourceDirectories in Test ++= Seq(
- (baseDirectory in ThisBuild).value / "resources" / "test"
+ Test / unmanagedResourceDirectories ++= Seq(
+ (ThisBuild / baseDirectory).value / "resources" / "test"
),
- resourceGenerators in Compile += Def.task {
- val inputFile = (deliverLocal in Compile).value
- val outputFile = (resourceManaged in Compile).value / s"${name.value}-ivy.xml"
+ Compile / resourceGenerators += Def.task {
+ val inputFile = (Compile / deliverLocal).value
+ val outputFile = (Compile / resourceManaged).value / s"${name.value}-ivy.xml"
streams.value.log.info(s"Copying ${inputFile.getPath} to ${outputFile.getPath}")
IO.copyFile(inputFile, outputFile)
Seq(outputFile)
diff --git a/protocol/build.sbt b/protocol/build.sbt
index f9da47cf..64618975 100644
--- a/protocol/build.sbt
+++ b/protocol/build.sbt
@@ -19,9 +19,7 @@
// JSON DEPENDENCIES
//
libraryDependencies ++= Seq(
- Dependencies.playJson excludeAll(
- ExclusionRule(organization = "com.fasterxml.jackson.core")
- ),
+ Dependencies.playJson excludeAll ExclusionRule(organization = "com.fasterxml.jackson.core"),
Dependencies.jacksonDatabind,
Dependencies.slf4jApi
)