Skip to content

Commit 83ae764

Browse files
committed
New scala-module-plugin with sbt-ci-release / travisci / dynver / header
1 parent 1f17d36 commit 83ae764

14 files changed

+95
-313
lines changed

.travis.yml

+11-19
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
language: scala
22

33
scala:
4+
- 0.17.0-RC1
45
- 2.12.9
56
- 2.13.0
6-
- 0.17.0-RC1
77

88
env:
9-
global:
10-
# PGP_PASSPHRASE
11-
- secure: "BYC1kEnHjNrINrHYWPGEuTTJ2V340/0ByzqeihLecjoZ75yrjWdsh6MI1JEUWgv5kb+58vLzib21JfnjsPK6Yb2bSXuCFCsEtJNh6RJKgxkWlCOzfTSh5I2wl7PCjRClRL6gseX2uTSvFjL4Z//pmxwxeXlLp7voQe4QAUq1+sE="
12-
# SONA_USER
13-
- secure: "OpBwPc1GNvauageYOH3RscAa7wpZxgpmqDz15aigIKLNWzAhAtVUx0MleZ8rQeoqml6nrAvlnzuVHjKL2lVcjMPpjUis7bcQ5UAGK7tZK8x+qZNQxXmpXu8+pENwQA2yFaqt/xy7K5jFOrHJHTRxcPnyVG1yKakPWz53PPYUwbc="
14-
# SONA_PASS
15-
- secure: "Xw7rI/qlML1nD2e2XwlakkhKAWNGZKqqE+Q3ntTvFpfHryl7KLCvVzJ4LIavnL6kGJaWOgy9vlSoEWn5g9nqHSfE31C/k5pY5nTMAKiwiJzfAS+r0asKXW2gmKhwtcTBkqyLVOZLCJSPVlFRQyfBJHY+Fs0L3KWcnMQgtBlyDhU="
16-
matrix:
17-
# The empty SCALAJS_VERSION will only compile for the JVM
18-
- SCALAJS_VERSION= ADOPTOPENJDK=8
19-
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
20-
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
21-
- SCALAJS_VERSION= ADOPTOPENJDK=11
9+
- SCALAJS_VERSION= ADOPTOPENJDK=8
10+
- SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8
11+
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
12+
- SCALAJS_VERSION= ADOPTOPENJDK=11
2213

2314
matrix:
2415
exclude:
@@ -31,20 +22,21 @@ before_install:
3122
# adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
3223
- "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/"
3324
- curl -sL https://get.sdkman.io | bash
34-
- echo sdkman_auto_answer=true > "$HOME/.sdkman/etc/config"
25+
- echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
3526
- source "$HOME/.sdkman/bin/sdkman-init.sh"
3627

3728
install:
3829
- sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1)
3930
- unset JAVA_HOME
4031
- java -Xmx32m -version
32+
- git fetch --tags # get all tags for sbt-dynver
4133

42-
script:
43-
- admin/build.sh
34+
script: ./build.sh
4435

4536
before_cache:
46-
- find $HOME/.sbt -name "*.lock" | xargs rm
47-
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
37+
- rm -fv $HOME/.ivy2/.sbt.ivy.lock
38+
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
39+
- find $HOME/.sbt -name "*.lock" -print -delete
4840
cache:
4941
directories:
5042
- $HOME/.ivy2/cache

admin/README.md

-68
This file was deleted.

admin/api-docs.sh

-71
This file was deleted.

admin/build.sh

-54
This file was deleted.

admin/encryptEnvVars.sh

-11
This file was deleted.

admin/genKeyPair.sh

-41
This file was deleted.

admin/gpg.sbt

-2
This file was deleted.

admin/publish-settings.sbt

-8
This file was deleted.

admin/pubring.asc

-18
This file was deleted.

admin/secring.asc.enc

-1.83 KB
Binary file not shown.

build.sbt

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import sbtcrossproject.CrossType
2-
import sbtcrossproject.CrossPlugin.autoImport.crossProject
3-
import ScalaModulePlugin._
4-
5-
crossScalaVersions in ThisBuild := List("2.12.9", "2.13.0")
1+
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
62

73
lazy val configSettings: Seq[Setting[_]] = Seq(
84
unmanagedSourceDirectories ++= {
@@ -27,14 +23,10 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
2723
.withoutSuffixFor(JVMPlatform)
2824
.crossType(CrossType.Full)
2925
.in(file("."))
30-
.settings(scalaModuleSettings)
31-
.jvmSettings(scalaModuleSettingsJVM)
32-
.jvmSettings(
33-
crossScalaVersions += "0.17.0-RC1"
34-
)
26+
.settings(ScalaModulePlugin.scalaModuleSettings)
27+
.jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
3528
.settings(
3629
name := "scala-xml",
37-
version := "2.0.0-SNAPSHOT",
3830

3931
scalacOptions ++= {
4032
val opts =
@@ -49,7 +41,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
4941

5042
scalacOptions in Test += "-Xxml:coalescing",
5143

52-
mimaPreviousVersion := {
44+
scalaModuleMimaPreviousVersion := {
5345
if (System.getenv("SCALAJS_VERSION") == "1.0.0-M8") None // No such release yet
5446
else Some("1.2.0")
5547
},
@@ -103,7 +95,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
10395
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.hStack"),
10496
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.scopeStack"),
10597
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.attribStack"),
106-
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.tagStack")
98+
exclude[IncompatibleResultTypeProblem]("scala.xml.parsing.FactoryAdapter.tagStack"),
99+
// New MiMa checks for generic signature changes
100+
exclude[IncompatibleSignatureProblem]("*"),
107101
)
108102
},
109103

@@ -154,6 +148,3 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform)
154148
fork in Test := false
155149
)
156150
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
157-
158-
lazy val xmlJVM = xml.jvm
159-
lazy val xmlJS = xml.js

0 commit comments

Comments
 (0)