Skip to content

Commit

Permalink
Merge pull request #54 from ThoughtWorksInc/dynver
Browse files Browse the repository at this point in the history
Switch to sbt-dynver
  • Loading branch information
Atry authored Apr 5, 2019
2 parents 6e7a9c4 + 3197a7e commit 5ee8442
Show file tree
Hide file tree
Showing 33 changed files with 58 additions and 2,378 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.*
target/
local.sbt
secret/
*.class
1 change: 1 addition & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
version = "1.5.1"
maxColumn = 120
21 changes: 13 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ addons:

language: scala

scala:
- "2.10.7"
- "2.11.12"
- "2.12.8"

jdk:
- oraclejdk8

Expand All @@ -18,16 +23,16 @@ cache:
directories:
- $HOME/.ivy2/cache
- $HOME/.sbt/boot/
- $HOME/.coursier/

script:
- sbt test +update # Test for only Scala 2.10, while check library dependencies for all targets
before_script:

before_deploy:

deploy:
skip_cleanup: true
provider: script
script: sbt "release with-defaults"
on:
condition: -e ./deploy.sbt
all_branches: true
- provider: script
script: sbt ++$TRAVIS_SCALA_VERSION "sonatypeOpen \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\"" publishSigned sonatypeRelease
skip_cleanup: true
on:
all_branches: true
condition: $GITHUB_PERSONAL_ACCESS_TOKEN
42 changes: 5 additions & 37 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,50 +1,18 @@
organization in ThisBuild := "com.thoughtworks.sde"
organization in ThisBuild := "com.thoughtworks.each"

publishArtifact := false
publish / skip := true

// Workaround for randomly Travis CI fail
parallelExecution in Global := false

fork in Global in compile := true

crossScalaVersions in ThisBuild := Seq("2.10.7", "2.11.12", "2.12.8")

description in ThisBuild := "A collection of Scala language extension for specific domains."

lazy val core = crossProject.crossType(CrossType.Pure)

lazy val coreJVM = core.jvm.addSbtFiles(file("../build.sbt.shared"))

lazy val coreJS = core.js.addSbtFiles(file("../build.sbt.shared"))

lazy val each = crossProject.crossType(CrossType.Pure).dependsOn(core, `comprehension-monad`)

lazy val eachJVM = each.jvm.addSbtFiles(file("../build.sbt.shared"))

lazy val eachJS = each.js.addSbtFiles(file("../build.sbt.shared"))

lazy val `comprehension-monad` = crossProject.crossType(CrossType.Pure)

lazy val `comprehension-monadJVM` = `comprehension-monad`.jvm.addSbtFiles(file("../build.sbt.shared"))

lazy val `comprehension-monadJS` = `comprehension-monad`.js.addSbtFiles(file("../build.sbt.shared"))

lazy val future = crossProject.crossType(CrossType.Pure).dependsOn(core)

lazy val futureJS = future.js.addSbtFiles(file("../build.sbt.shared"))

lazy val futureJVM = future.jvm.addSbtFiles(file("../build.sbt.shared"))

lazy val source = crossProject.crossType(CrossType.Pure).dependsOn(core)

lazy val sourceJS = source.js.addSbtFiles(file("../build.sbt.shared"))

lazy val sourceJVM = source.jvm.addSbtFiles(file("../build.sbt.shared"))

lazy val gen = crossProject.crossType(CrossType.Pure).dependsOn(core)
lazy val each = crossProject.crossType(CrossType.Pure)

lazy val genJS = gen.js.addSbtFiles(file("../build.sbt.shared"))
lazy val eachJVM = each.jvm

lazy val genJVM = gen.jvm.addSbtFiles(file("../build.sbt.shared"))
lazy val eachJS = each.js

startYear in ThisBuild := Some(2015)
1 change: 0 additions & 1 deletion comprehension-monad/.js/build.sbt

This file was deleted.

11 changes: 0 additions & 11 deletions comprehension-monad/build.sbt.shared

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion core/.js/build.sbt

This file was deleted.

15 changes: 0 additions & 15 deletions core/build.sbt.shared

This file was deleted.

Loading

0 comments on commit 5ee8442

Please sign in to comment.