From 87ed75f71489d64787aaf26dbabef916f08160eb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 18 Dec 2019 06:12:13 +0100 Subject: [PATCH 1/8] Update sbt-pgp to 2.0.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 38b24a4..84bbd59 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") From e897e12d5b40f8143e11b1d20dd4da2a42a2ae9f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Dec 2019 13:11:29 +0100 Subject: [PATCH 2/8] Update sbt-best-practice to 7.2.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 38b24a4..39c4a85 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.1.1") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "7.2.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") From 1cf2743cb6e4e5ea95f1db0bd07b25348b49b31f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Jan 2020 21:21:57 +0100 Subject: [PATCH 3/8] Update sbt-scalajs to 0.6.32 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 38b24a4..4670a1e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,4 +12,4 @@ addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32") From b902635be357dbd31f03f6ffb60846c7de2bf3d6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 21 Feb 2020 05:51:23 +0100 Subject: [PATCH 4/8] Update scalatest to 3.1.1 --- shared/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/build.sbt b/shared/build.sbt index 10d1b0a..9688fc2 100644 --- a/shared/build.sbt +++ b/shared/build.sbt @@ -1 +1 @@ -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.1" % Test From fa239c2cc418f0bba4628967f7bc3adbb3b60b7f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 23 Feb 2020 03:37:13 +0100 Subject: [PATCH 5/8] Update scalafmt-core to 2.4.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5c84156..3d0aaf9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,2 @@ -version = "2.3.2" +version = "2.4.2" maxColumn = 120 From 720f414fdb5ffb8999eac92870a04096d6b2883d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 15 Apr 2020 07:32:44 +0200 Subject: [PATCH 6/8] Update sbt to 1.3.10 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8522443..797e7cc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.2 +sbt.version=1.3.10 From 024c877ae93e770dd6b1afc8984c8e4b31a3bd3e Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 18 Apr 2020 18:39:23 -0700 Subject: [PATCH 7/8] Cross build for Scala.js 1.x and 0.6 --- .travis.yml | 13 ++++++++++++- build.sbt | 8 +++----- jvm/jvm.sbt | 4 ++++ project/plugins.sbt | 5 ++++- project/plugins.sbt.scalajs06 | 6 ++++++ 5 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 jvm/jvm.sbt create mode 100644 project/plugins.sbt.scalajs06 diff --git a/.travis.yml b/.travis.yml index 4877140..b9eb9bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,19 @@ before_deploy: deploy: - provider: script - script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease + script: sbt $SBT_ARGS ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease skip_cleanup: true on: all_branches: true condition: $GITHUB_PERSONAL_ACCESS_TOKEN + +env: + - SBT_ARGS= + - SBT_ARGS=--addPluginSbtFile=project/plugins.sbt.scalajs06 + +sbt_args: $SBT_ARGS + +jobs: + exclude: + - scala: 2.10.7 + env: SBT_ARGS= diff --git a/build.sbt b/build.sbt index a272d5f..d987fcc 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,10 @@ +import sbtcrossproject.CrossPlugin.autoImport.crossProject + publish / skip := true organization in ThisBuild := "com.thoughtworks.extractor" -lazy val extractor = crossProject in file(".") - -lazy val extractorJVM = extractor.jvm - -lazy val extractorJS = extractor.js +lazy val extractor = crossProject(JSPlatform, JVMPlatform) in file(".") // Workaround for randomly Travis CI fail parallelExecution in Global := false diff --git a/jvm/jvm.sbt b/jvm/jvm.sbt new file mode 100644 index 0000000..8c42c95 --- /dev/null +++ b/jvm/jvm.sbt @@ -0,0 +1,4 @@ +import Ordering.Implicits._ + +// To prevent duplicate JVM releases, only publish JVM artifacts when Scala.js version is 1.x +publish / skip := VersionNumber(scalaJSVersion).numbers < Seq(1) && VersionNumber(scalaBinaryVersion.value).numbers >= Seq(2, 11) diff --git a/project/plugins.sbt b/project/plugins.sbt index b846cf1..e38ff8f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,4 +12,7 @@ addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") + +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1") + diff --git a/project/plugins.sbt.scalajs06 b/project/plugins.sbt.scalajs06 new file mode 100644 index 0000000..73b34fc --- /dev/null +++ b/project/plugins.sbt.scalajs06 @@ -0,0 +1,6 @@ +// An optional sbt file to replace Scala.js 1.0 with 0.6 +dependencyOverrides += Defaults.sbtPluginExtra( + "org.scala-js" % "sbt-scalajs" % "0.6.32", + sbtBinaryVersion.value, + scalaBinaryVersion.value, +) From 58ed7ba86c98c3054abdd86b02f0a53d5be7c6a1 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 24 Apr 2020 16:54:16 -0700 Subject: [PATCH 8/8] Upgrade Scala versions --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9eb9bf..e2a0aa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ addons: language: scala scala: - - "2.10.7" - - "2.11.12" - - "2.12.6" - - "2.13.0" + - 2.10.7 + - 2.11.12 + - 2.12.11 + - 2.13.2 jdk: - openjdk8