Skip to content

Upgrade Scala versions #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 25, 2020
Merged

Upgrade Scala versions #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
87ed75f
Update sbt-pgp to 2.0.1
scala-steward Dec 18, 2019
e897e12
Update sbt-best-practice to 7.2.0
scala-steward Dec 26, 2019
1cf2743
Update sbt-scalajs to 0.6.32
scala-steward Jan 23, 2020
b902635
Update scalatest to 3.1.1
scala-steward Feb 21, 2020
fa239c2
Update scalafmt-core to 2.4.2
scala-steward Feb 23, 2020
720f414
Update sbt to 1.3.10
scala-steward Apr 15, 2020
7298cff
Merge pull request #53 from scala-steward/update/sbt-1.3.10
Atry Apr 24, 2020
3238280
Merge pull request #49 from scala-steward/update/scalafmt-core-2.4.2
Atry Apr 24, 2020
f391cc2
Merge pull request #48 from scala-steward/update/scalatest-3.1.1
Atry Apr 24, 2020
d4d75f4
Merge pull request #43 from scala-steward/update/sbt-scalajs-0.6.32
Atry Apr 24, 2020
f21d59a
Merge pull request #40 from scala-steward/update/sbt-best-practice-7.2.0
Atry Apr 24, 2020
47c6a62
Merge pull request #39 from scala-steward/update/sbt-pgp-2.0.1
Atry Apr 24, 2020
024c877
Cross build for Scala.js 1.x and 0.6
Atry Apr 19, 2020
5f18697
Merge branch 'master' into scala-js-1
Atry Apr 25, 2020
58ed7ba
Upgrade Scala versions
Atry Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "2.3.2"
version = "2.4.2"
maxColumn = 120
21 changes: 16 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=
8 changes: 3 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions jvm/jvm.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.2
sbt.version=1.3.10
9 changes: 6 additions & 3 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
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")

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")

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.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")

6 changes: 6 additions & 0 deletions project/plugins.sbt.scalajs06
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)
2 changes: 1 addition & 1 deletion shared/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
enablePlugins(Example)

libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0" % Test
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.1" % Test