2.13: radically simplify the build (#1472)

Author: SethTisue

artifactory/artifactory-scala-ci.xml

@@ -29,9 +29,6 @@ include file("resolvers.conf")
 
 vars {
   default-commands: []
-  sbt-0-13-version: "0.13.18"
-  sbt-1-3-version: "1.3.13"
-  sbt-1-4-version: "1.4.9"
   sbt-version: "1.5.5"
   sbt-java-options: ["-Xms1536m", "-Xmx1536m", "-Xss2m"]
 }
@@ -51,8 +48,8 @@ set commands ++= {
     val allDefs = r._1s.toSeq
     val scopes = allDefs.filter(_.key == st.key).map(_.scope).distinct
     val redefined = st match {
-      case setting: SettingKey[T] => scopes.map(scope => setting in scope ~= fn)
-      case task: TaskKey[T]       => scopes.map(scope => task in scope ~= fn)
+      case setting: SettingKey[T] => scopes.map(scope => scope / setting ~= fn)
+      case task: TaskKey[T]       => scopes.map(scope => scope / task ~= fn)
     }
     val session = extracted.session.appendRaw(redefined)
     BuiltinCommands.reapply(session, structure, s)
@@ -82,9 +79,13 @@ vars.default-commands += "appendScalacOptions "${vars.scalac-opts}
 vars.default-commands += "removeScalacOptions -Werror -Xfatal-warnings -Yno-adapted-args -Ywarn-inaccessible -Ywarn-nullary-override -Ywarn-nullary-unit -Ywarn-infer-any -Ywarn-unused-import -Ypartial-unification -Ywarn-adapted-args -Xmax-classfile-name -Ymacro-no-expand"
 vars.base.extra.commands = ${vars.default-commands}
 
-//// count lines of code
+//// default settings
 
-vars.base.extra.settings = ["""libraryDependencies in ThisBuild += compilerPlugin("com.lightbend" %% "cloc-plugin" % "0")"""]
+vars.base.extra.settings = [
+  """ThisBuild / libraryDependencies += compilerPlugin("com.lightbend" %% "cloc-plugin" % "0")"""
+  // dbuild gets confused if only crossScalaVersions is set?!
+  """ThisBuild / scalaVersion := "2.13.6""""
+]
 vars.base.deps.inject: ["com.lightbend#cloc-plugin"]
 
 //// cache
@@ -106,6 +107,9 @@ options.cleanup: {
 //// Scala itself
 
 build += {
+
+  space: scala
+
   sbt-version: ${vars.sbt-version}
   sbt-java-options: ${vars.sbt-java-options}
   extraction-version: ${vars.scala-version}
@@ -150,6 +154,13 @@ build += {
 // variables, we can only include them at the top level.  and we can't
 // `include "proj/*.conf"`, that's https://github.com/lightbend/config/issues/639
 
+include "core/genjavadoc.conf"
+include "core/kind-projector.conf"
+include "core/scalafix.conf"
+include "core/scalameta.conf"
+include "core/silencer.conf"
+include "core/wartremover.conf"
+
 include "proj/acyclic.conf"
 include "proj/advxml.conf"
 include "proj/airframe.conf"
@@ -161,7 +172,6 @@ include "proj/akka-http.conf"
 include "proj/akka-management.conf"
 include "proj/akka-persistence-cassandra.conf"
 include "proj/akka-persistence-jdbc.conf"
-include "proj/akka-protobuf-v3.conf"
 include "proj/akka-streams-tcp-chat.conf"
 include "proj/akka.conf"
 include "proj/algebra.conf"
@@ -199,7 +209,6 @@ include "proj/claimant.conf"
 include "proj/classutil.conf"
 include "proj/context-applied.conf"
 include "proj/coulomb.conf"
-include "proj/coursier.conf"
 include "proj/data-class.conf"
 include "proj/decline.conf"
 include "proj/discipline-munit.conf"
@@ -211,21 +220,17 @@ include "proj/doobie.conf"
 include "proj/doodle.conf"
 include "proj/droste.conf"
 include "proj/eff.conf"
-include "proj/elastic4s.conf"
 include "proj/enumeratum.conf"
 include "proj/euler.conf"
 include "proj/expecty.conf"
 include "proj/expression-evaluator.conf"
 include "proj/fansi.conf"
 include "proj/fast-string-interpolator.conf"
-include "proj/fastparse-scalameta.conf"
 include "proj/fastparse.conf"
 include "proj/finagle.conf"
 include "proj/fs2-chat.conf"
 include "proj/fs2.conf"
-include "proj/genjavadoc.conf"
 include "proj/geny.conf"
-include "proj/gigahorse.conf"
 include "proj/giter8.conf"
 include "proj/github4s.conf"
 include "proj/grizzled.conf"
@@ -243,7 +248,6 @@ include "proj/jsoniter-scala.conf"
 include "proj/jwt-scala.conf"
 include "proj/kafka.conf"
 include "proj/kamon.conf"
-include "proj/kind-projector.conf"
 include "proj/kits.conf"
 include "proj/kittens.conf"
 include "proj/lagom.conf"
@@ -281,7 +285,6 @@ include "proj/parboiled.conf"
 include "proj/parboiled2.conf"
 include "proj/pascal.conf"
 include "proj/perfolation.conf"
-include "proj/play-doc.conf"
 include "proj/play-file-watch.conf"
 include "proj/play-json.conf"
 include "proj/play-webgoat.conf"
@@ -292,8 +295,6 @@ include "proj/pprint.conf"
 include "proj/prog-scala-examples.conf"
 include "proj/pureconfig.conf"
 include "proj/quicklens.conf"
-include "proj/reactive-mongo.conf"
-include "proj/reactive-mongo-bson.conf"
 include "proj/redis4cats.conf"
 include "proj/refined.conf"
 include "proj/requests-scala.conf"
@@ -329,25 +330,18 @@ include "proj/scalacheck-shapeless.conf"
 include "proj/scalacheck.conf"
 include "proj/scalachess.conf"
 include "proj/scaladex.conf"
-include "proj/scalafix.conf"
 include "proj/scalafmt.conf"
 include "proj/scalafx.conf"
 include "proj/scalaj-http.conf"
 include "proj/scalajson.conf"
 include "proj/scalalib.conf"
-include "proj/scalameta.conf"
 include "proj/scalamock.conf"
 include "proj/scalapb.conf"
 include "proj/scalaprops.conf"
 include "proj/scalariform.conf"
 include "proj/scalastyle.conf"
 include "proj/scalatags.conf"
-include "proj/scalatest-3-0.conf"
 include "proj/scalatest.conf"
-include "proj/scalatestplus-junit.conf"
-include "proj/scalatestplus-mockito.conf"
-include "proj/scalatestplus-scalacheck.conf"
-include "proj/scalatestplus-testng.conf"
 include "proj/scalikejdbc.conf"
 include "proj/scallop.conf"
 include "proj/scapegoat.conf"
@@ -362,11 +356,9 @@ include "proj/scribe.conf"
 include "proj/scrooge.conf"
 include "proj/shapeless-java-records.conf"
 include "proj/shapeless.conf"
-include "proj/silencer.conf"
 include "proj/simulacrum-scalafix.conf"
 include "proj/singleton-ops.conf"
 include "proj/sjson-new.conf"
-include "proj/sksamuel-exts.conf"
 include "proj/skunk.conf"
 include "proj/slick.conf"
 include "proj/sourcecode.conf"
@@ -393,8 +385,8 @@ include "proj/upickle.conf"
 include "proj/utest.conf"
 include "proj/vault.conf"
 include "proj/verify.conf"
-include "proj/wartremover.conf"
 include "proj/weaver-test.conf"
 include "proj/zinc.conf"
 
+include "core.conf"
 include "projs.conf"

community.conf

@@ -0,0 +1,23 @@
+build += {
+
+  space: scala
+
+  cross-version: [ disabled, standard ]
+
+  // all dependencies are binary
+  check-missing: [ false, false ]
+
+  extraction-version: ${vars.scala-version}
+  sbt-version: ${vars.sbt-version}
+  sbt-java-options: ${vars.sbt-java-options}
+
+  projects: [
+
+  ${vars.proj.genjavadoc}
+  ${vars.proj.kind-projector}
+  ${vars.proj.scalafix}
+  ${vars.proj.scalameta}
+  ${vars.proj.silencer}
+  ${vars.proj.wartremover}
+
+]}

core.conf

@@ -0,0 +1,16 @@
+// https://github.com/scalacenter/scalafix.git#main
+
+vars.proj.scalafix: ${vars.base} {
+  name: "scalafix"
+  uri: "https://github.com/scalacenter/scalafix.git#fd4ce4630c9d0bc374db766c6737b3925e622046"
+
+  extra.exclude: [
+    // out of scope
+    "docs"
+    // it would really be better if we could build and run the tests, but
+    // the effort to do so in https://github.com/scala/community-build/pull/1290
+    // ran aground. we should try again once ScalaTest 3.0 doesn't need to be part
+    // of the picture anymore
+    "unit"
+  ]
+}