Merge pull request #112 from lrytz/ci-release

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

Author: lrytz

.travis.yml

@@ -1,24 +1,42 @@
-dist: trusty
-
 language: scala
 
+scala:
+  - 2.11.12
+  - 2.12.10
+  - 2.13.1
+
 env:
-  global:
-    # PGP_PASSPHRASE
-    - secure: "MIHv2s6njtXubCzbP/eYXszuO/Y3FADYATZpDtOULZmQHcQ8z+sccQHidyq6hvoK9/I2hRUrc5RIelfA7D32tqP7aF3P9Dq1ZdiWqZYmFKUl6wzJMhgWwnT1RA9Nu67PcNLZGwOe7+55zZpWVNbeTKMe05TzUaaGUgApr9wvS0I="
-    # SONA_USER
-    - secure: "e3FEhT76+qpmeubxtthmubnuyf5faCZneB1lQE8zv89/NZrD+v6tM8hGWatfiyyswmcaUdukxW/Q3NVlesKiy+cJLgNJ8AImRckKPiPVUYpXcQoc0R1Nyl4DeDyorGE17SslW28frlRU9OutTnZQlOfg4uqCdZuuCdcPV0lnGAU="
-    # SONA_PASS
-    - secure: "BLhtiCjcjvwB0lUvfrMa9CSvWDcdGkadAVFFPyuXSU2OQw/RR9dZF3/ZLILf9jHL3pWj/Scp8jWRl40y6sUxihUOXhhxpDCF8UVgnXdDCQf/W7gerRC/+3Zpr3LugVeSEuBgECld6XZnYNst/xbL9GHzEc7kDm7MIfz8nY8Ic7s="
+  - ADOPTOPENJDK=8
+  - ADOPTOPENJDK=11
 
-script: admin/build.sh
+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/"
+  - curl -sL https://get.sdkman.io | bash
+  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
 
-jdk:
-- oraclejdk8
-- openjdk11
+install:
+  - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
+  - unset JAVA_HOME
+  - java -Xmx32m -version
+  - git fetch --tags # get all tags for sbt-dynver
+
+script: ./build.sh
 
 notifications:
   email:
     - [email protected]
     - [email protected]
     - [email protected]
+
+before_cache:
+  - rm -f $HOME/.ivy2/.sbt.ivy.lock
+  - find $HOME/.ivy2/cache     -name "ivydata-*.properties" | xargs rm
+  - find $HOME/.sbt            -name "*.lock"               | xargs rm
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt
+    - $HOME/.cache/coursier
+    - $HOME/.sdkman

admin/README.md

@@ -1,40 +1,13 @@
-import ScalaModulePlugin._
-
-scalaModuleSettings
-
-name               := "scala-swing"
-
-version            := "2.1.1"
-
-scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
-
-// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
-scalaVersionsByJvm in ThisBuild := Map(
-   8 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> true),
-   9 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
-  10 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
-  11 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false),
-  12 -> List("2.11.12", "2.12.8", "2.13.0").map(_ -> false)
-)
-
-scalaVersion in ThisBuild := "2.12.8"
-
-OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
-
-mimaPreviousVersion := Some("2.1.0")
-
-// set the prompt (for this build) to include the project id.
-shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project + "> " }
-
 lazy val swing = project.in(file("."))
+  .settings(ScalaModulePlugin.scalaModuleSettings)
+  .settings(ScalaModulePlugin.scalaModuleSettingsJVM)
   .settings(
-    libraryDependencies += {
-      if (scalaVersion.value == "2.13.0") {
-        "org.scalatest" % "scalatest_2.13.0-RC3" % "3.0.8-RC5" % Test
-      } else {
-        "org.scalatest" %% "scalatest" % "3.0.8-RC5" % Test
-      }
-    },
+    name := "scala-swing",
+    OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}"),
+    scalaModuleMimaPreviousVersion := Some("2.1.0"),
+    // set the prompt (for this build) to include the project id.
+    shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project + "> " },
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8" % Test,
     // Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
     // and  a `src/main/scala-2.13-` source directory for Scala version older than 2.13
     unmanagedSourceDirectories in Compile += {