Merge pull request #252 from lrytz/ci-release

New scala-module-plugin with sbt-ci-release / travisci / dynver / header

Author: lrytz

.travis.yml

@@ -6,21 +6,12 @@ scala:
   - 2.13.0
 
 env:
-  global:
-
-    # PGP_PASSPHRASE
-    - secure: "rjetmX9HXoN/scxTCBFCHIUDFryY0Yd29sR6EBrW/2tCOILO09RTCcJB0kPn2YMZ9en8ChTtOpqGF9133f6wZ7/ZINSUt1tNwnbgDlhGbwJW2WFTUEmL7ScdqmgRGa294aVuAfrvJnr+dN92it6ibAB8nThgsjq0LnZREJsKwQ77vvEeATEKutuPLGlrHrmqL7/XCjb2uYz9Xh0sSpyQlKOGt5EN7JzM/Bzyju+RYS9BvnLVV86fey/UWO1DNDa4MU5835akevqvtwN7CpCFxFKgbfc+40bAh7Xc59UnkxP+Lcs2KxJx9heS6RJJiNEx99r59LL2JALyN++yOAS97HEfii4Yc3OK9VRZCNQFW4gNm3VtGNW4EC+LOX/9cUiUNg2J65nY0UF2d6R3vsqiCKaK6C0cm+jIs3fgDHFlB+MiHC/ZECaoPvwzm1AxQMIWyoFFqXuHQk3Ef137G0x1ejneUoGD/PqMbiEAX64+VVvOxgOI2/jyt4hFTEk6JiWVahmk+7oFAsLH1n9J1Y3csMvmo9S0S/Ey9D3bR07hggc8pj/CJPj9gFSfpGEVhroc37T/VlP23EVJgpteovERyeJGC3P7wVWvi1pNNW6iOVENzY1GkHlHkJUI7Q4B+eIW2mh5wi6JyC/DM2lO4z3M2KQkNqQgzIBdm5p/4hezkkA="
-    # SONA_USER
-    - secure: "oStf8s+LwXcmVENMnWU970OAImwXLV2E6FNXSLE7zdr4YL70cWVsDXDeAs0LSEmiOXTtHulmcIwUt6fCqZ1aiTxUxGX2avy0DSM9nCrQit7IXfwX8V9iK9/3t/SXo1g8yEfxyug+OK6CKOlLeA9HY/TJjO6fkYCsR1NrD8PLpgGtgSwS1GGjifbdahkQyyyivxROJ2UaRysm8PJ1X1966FoQoXKLU4HEztO48y3ZIlItZGwVv/1FJ18AniU2oCnV6XQVM+OB/j+IxNENzLBvd54/YjVtRRa22KTlC8j/NXo8Vq/f0ZhLjNLzYIEB1ER+2T2dthpek+Y8eMR5RdHrFj4Xp2kB04K70ZIL6pw2BDpqeiabjm1E3X6c+flj4pWR5p8uXguV7JmhYgl9d2UEqP7ZTzSbgh2S2WG9EjyK4C2L9jimgBP+Nih2yeW8GuURKgjQ5zrg3+7vxXqBjNN4PmTLpGiQ5shK1kZCpzdgfTl3LfUO4Uitg2Vl8yFC3Z9d3Fo5oV84DhL20pMIx7CtIcMX4b5QHArbUyICYFOvuz+8qP67kTPLVoErNmKWjqpp64VarqfoVbbe4NwRgGuNSMPR1nHb1LjloXv1CiNs9AocvnTknhV1T9I4F4XWi/J6mEwUbVW7GppzqszO6cAgcPLbqp92U8I+rexPjiieCZ0="
-    # SONA_PASS
-    - secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y="
-  matrix:
-    - SCALAJS_VERSION=         ADOPTOPENJDK=8
-    - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=8
-    - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
-    - SCALAJS_VERSION=         ADOPTOPENJDK=11
-    - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=11
-    - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
+  - SCALAJS_VERSION=         ADOPTOPENJDK=8
+  - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=8
+  - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
+  - SCALAJS_VERSION=         ADOPTOPENJDK=11
+  - SCALAJS_VERSION=0.6.28   ADOPTOPENJDK=11
+  - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
 
 matrix:
 
@@ -53,7 +44,7 @@ matrix:
 
 before_install:
   # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
-  - "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
+  - "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
   - curl -sL https://get.sdkman.io | bash
   - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
@@ -62,7 +53,7 @@ install:
   - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
   - unset JAVA_HOME
   - java -Xmx32m -version
-  - javac -J-Xmx32m -version
+  - git fetch --tags # get all tags for sbt-dynver
 
 before_script:
   - admin/checkCLA.sh
@@ -76,6 +67,7 @@ cache:
     - "$HOME/.sbt/boot/scala*"
     - "$HOME/.sbt/launchers"
     - "$HOME/.ivy2/cache"
+    - "$HOME/.cache/coursier"
     - "$HOME/.sdkman"
 
 before_cache:

admin/README.md

@@ -1,7 +1,7 @@
-import ScalaModulePlugin._
-import sbtcrossproject.{crossProject, CrossType}
 import _root_.scalafix.sbt.BuildInfo.{scalafixVersion, scala212 => scalafixScala212}
-import sys.process._
+import com.lightbend.tools.scalamoduleplugin.ScalaModulePlugin._
+
+import scala.sys.process._
 
 lazy val commonSettings = Seq(
   headerLicense := Some(HeaderLicense.Custom(s"""|Scala (https://www.scala-lang.org)
@@ -14,11 +14,9 @@ lazy val commonSettings = Seq(
                                                  |See the NOTICE file distributed with this work for
                                                  |additional information regarding copyright ownership.
                                                  |""".stripMargin)),
-  mimaPreviousVersion := Some("2.1.1"),
+  scalaModuleMimaPreviousVersion := Some("2.1.1"),
 )
 
-version in ThisBuild := "2.1.3-SNAPSHOT"
-
 lazy val root = project
   .in(file("."))
   .settings(commonSettings)
@@ -52,16 +50,6 @@ lazy val scala211 = "2.11.12"
 lazy val scala212 = "2.12.8"
 lazy val scala213 = "2.13.0"
 
-scalaVersionsByJvm in ThisBuild := {
-  val all = List(scala211, scala212, scala213)
-  // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
-  Map(
-    8  -> all.map(_ -> true),
-    11 -> all.map(_ -> false),
-    12 -> all.map(_ -> false)
-  )
-}
-
 /** Create an OSGi version range for standard Scala versioning
  * schemes that describes binary compatible versions. */
 def osgiVersionRange(version: String, requireMicro: Boolean = false): String =
@@ -289,54 +277,21 @@ lazy val dontPublish = Seq(
   packagedArtifacts := Map.empty,
   publish := {},
   publishLocal := {},
-  mimaPreviousVersion := None,
+  scalaModuleMimaPreviousVersion := None,
 )
 
-val preRelease         = "preRelease"
 val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
 val releaseVersion     = sys.env.get("TRAVIS_TAG").flatMap(Version.parse)
 val isScalaJs          = sys.env.get("SCALAJS_VERSION").map(_.nonEmpty).getOrElse(false)
 val isScalaNative      = sys.env.get("SCALANATIVE_VERSION").map(_.nonEmpty).getOrElse(false)
 val isScalafix         = sys.env.get("TEST_SCALAFIX").nonEmpty
 val isScalafmt         = sys.env.get("TEST_SCALAFMT").nonEmpty
 val isBinaryCompat     = sys.env.get("TEST_BINARY_COMPAT").nonEmpty
-val isRelease          = releaseVersion.nonEmpty
-
-val releaseCredentials =
-  if (isRelease) {
-    def env(key: String): String = Option(System.getenv(key)).getOrElse("")
-
-    Seq(
-      pgpPassphrase := Some(env("PGP_PASSPHRASE").toArray),
-      pgpPublicRing := file("admin/pubring.asc"),
-      pgpSecretRing := file("admin/secring.asc"),
-      credentials += Credentials("Sonatype Nexus Repository Manager",
-                                 "oss.sonatype.org",
-                                 env("SONA_USER"),
-                                 env("SONA_PASS"))
-    )
-  } else {
-    Seq()
-  }
-
-inThisBuild(releaseCredentials)
+val jdkVersion         = sys.env.get("ADOPTOPENJDK").map(_.toInt)
 
 // required by sbt-scala-module
 inThisBuild(
   Seq(
-    commands += Command.command(preRelease) { state =>
-      // Show Compat version, Scala version, and Java Version
-      val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor
-      releaseVersion match {
-        case Some(tagVersion) =>
-          println(
-            s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.")
-          // Copy pgp stuff
-          "admin/pre-release.sh" ! state.globalLogging.full
-        case None =>
-      }
-      state
-    },
     commands += Command.command("scalafmt-test") { state =>
       Seq("admin/scalafmt.sh", "--test") ! state.globalLogging.full
       state
@@ -388,10 +343,18 @@ inThisBuild(
             releaseVersion.map("set every version := \"" + _ + "\"").toList
 
           val publishTask =
-            if (releaseVersion.nonEmpty && !isBinaryCompat) {
+            if (releaseVersion.nonEmpty && !isBinaryCompat && jdkVersion == Some(8)) {
+              // we cannot run "ci-release" because that reads the `CI_RELEASE` / `CI_SONATYPE_RELEASE`
+              // env vars, which we cannot modify from java (easily). so we inline what this command does.
+              CiReleasePlugin.setupGpg()
               List(
-                preRelease,
-                s"$projectPrefix/publishSigned"
+                // work around https://github.com/olafurpg/sbt-ci-release/issues/64
+                "set pgpSecretRing := pgpSecretRing.value",
+                "set pgpPublicRing := pgpPublicRing.value",
+                s"$projectPrefix/publishSigned",
+                "sonatypePrepare",
+                "sonatypeBundleUpload",
+                "sonatypeClose",
               )
             } else {
               Nil

admin/encryptEnvVars.sh

@@ -8,8 +8,6 @@ addSbtPlugin("org.scala-js"           % "sbt-scalajs"                   % scalaJ
 addSbtPlugin("org.portable-scala"     % "sbt-scalajs-crossproject"      % crossVer)
 addSbtPlugin("org.scala-native"       % "sbt-scala-native"              % scalaNativeVersion)
 addSbtPlugin("org.portable-scala"     % "sbt-scala-native-crossproject" % crossVer)
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module"              % "2.0.0")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module"              % "2.1.1")
 addSbtPlugin("ch.epfl.scala"          % "sbt-scalafix"                  % "0.9.6")
 addSbtPlugin("com.eed3si9n"           % "sbt-buildinfo"                 % "0.9.0")
-addSbtPlugin("com.jsuereth"           % "sbt-pgp"                       % "1.1.2-1")
-addSbtPlugin("de.heikoseeberger"      % "sbt-header"                    % "5.2.0")