Skip to content

Commit 30c86cc

Browse files
committed
New scala-module-plugin with sbt-ci-release / travisci / dynver / header
1 parent 69482b2 commit 30c86cc

File tree

13 files changed

+107
-238
lines changed

13 files changed

+107
-238
lines changed

.travis.yml

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
11
language: scala
2-
sudo: false
2+
3+
scala:
4+
- 2.12.10
5+
- 2.13.0
6+
37
env:
4-
global:
5-
# PGP_PASSPHRASE
6-
- secure: "ENsi/6s/RXiPqrfrU7kXqaDz8WiZeenQMhaSFshxbueJ8EtN20FIVt4rSM8HOpLbn1pYeq6PiQ7T2mxlsaJMWCUNud9CqOxgSH9vCoYkJJy6CkTIVLLKdu5teHVIzWcl3smbk7LZYv/4FuljBqYs9EecWjuYF7dZrY/otE5kKbA="
7-
# SONA_USER
8-
- secure: "cQAs8Q/a2YrqzRv3+QAiHchLac35Ppu7rppwJs2favmVJFL0SIBtPu891UiPy0V/3QN1JmwPLbsR/lsgpoGM76AMCn3rgq88zp45pD+UiH0d7dgFMzXorNGt3K+YpiW4j6iHyzM/POKVO7vLnRuln6jTE0QRcjRbEOqg+xtQo+I="
9-
# SONA_PASS
10-
- secure: "Cj4PsumsWL37Pl7V5ZPJw+/xH9esHblG5nN9Op91XcCfG006xHsz2w1iNOqFqCF8wAhgObuA2CmAH3ZuI1jZGGSo2HMt9+f5Z6tpifFzsTHZJtdNIVOpS3/NGhvgtg3UnT5WQQtnVi6zlkKl1xCpAIDNhOJ9dXoL54auAqvxpko="
11-
script:
12-
- admin/build.sh
13-
jdk:
14-
- oraclejdk8
15-
- openjdk11
8+
- ADOPTOPENJDK=8
9+
- ADOPTOPENJDK=11
10+
11+
before_install:
12+
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
13+
- "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
14+
- curl -sL https://get.sdkman.io | bash
15+
- echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
16+
- source "$HOME/.sdkman/bin/sdkman-init.sh"
17+
18+
install:
19+
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
20+
- unset JAVA_HOME
21+
- java -Xmx32m -version
22+
- git fetch --tags # get all tags for sbt-dynver
23+
24+
script: ./build.sh
25+
1626
notifications:
1727
email:
1828
- jason.zaugg@lightbend.com
1929
- seth.tisue@lightbend.com
30+
31+
before_cache:
32+
- rm -f $HOME/.ivy2/.sbt.ivy.lock
33+
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
34+
- find $HOME/.sbt -name "*.lock" | xargs rm
35+
cache:
36+
directories:
37+
- $HOME/.ivy2/cache
38+
- $HOME/.sbt
39+
- $HOME/.cache/coursier
40+
- $HOME/.sdkman

admin/README.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

admin/build.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

admin/encryptEnvVars.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

admin/genKeyPair.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

admin/gpg.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

admin/publish-settings.sbt

Lines changed: 0 additions & 9 deletions
This file was deleted.

admin/pubring.asc

Lines changed: 0 additions & 18 deletions
This file was deleted.

admin/secring.asc.enc

-1.81 KB
Binary file not shown.

build.sbt

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
1-
import ScalaModulePlugin._
2-
3-
scalaModuleSettings
4-
5-
scalaVersionsByJvm in ThisBuild := {
6-
val v212 = "2.12.8"
7-
val v213 = "2.13.0"
8-
9-
val allFalse = List(v212 -> false, v213 -> false)
10-
Map(
11-
8 -> List(v212 -> true, v213 -> true),
12-
11 -> allFalse,
13-
12 -> allFalse
14-
)
15-
}
1+
ScalaModulePlugin.scalaModuleSettings
2+
ScalaModulePlugin.scalaModuleSettingsJVM
163

174
name := "scala-async"
18-
repoName := "async"
19-
20-
version := "0.10.1-SNAPSHOT"
215

226
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
237
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test" // for ToolBox
248
libraryDependencies += "junit" % "junit" % "4.12" % "test"
259
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
2610

27-
enableOptimizer
11+
ScalaModulePlugin.enableOptimizer
2812
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s")
2913
scalacOptions in Test ++= Seq("-Yrangepos")
3014

0 commit comments

Comments
 (0)