Skip to content
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.

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

Switch to sbt-dynver #54

Merged
merged 95 commits into from
Apr 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
ebdd9e4
Add before_script section
Atry Oct 9, 2016
e5d569c
Upgrade sbt
Atry May 27, 2017
8c22f9b
Merge pull request #3 from ThoughtWorksInc/features/sbt-version
Atry May 27, 2017
cd8f997
Specify the version of sbt-best-practice
Atry Jun 9, 2017
3b5b165
Merge pull request #4 from ThoughtWorksInc/features/sbt-best-practice
Atry Jun 9, 2017
603ad03
Upgrade sbt-best-practice
Atry Jun 14, 2017
1c8bb24
Merge pull request #5 from ThoughtWorksInc/features/sbt-best-practice
Atry Jun 14, 2017
2d231af
Upgrade sbt-best-practice
Atry Jul 20, 2017
ae263db
Merge commit '2d231afabd94951acc0ec76af69b2c33ea690455' into template
Atry Jul 20, 2017
e2008e6
Upgrade sbt
Atry Jul 29, 2017
fac59b2
Merge pull request #6 from ThoughtWorksInc/features/sbt-version
Atry Jul 29, 2017
a9da3b7
Upgrade sbt-best-practice
Atry Aug 18, 2017
376b9cd
Merge pull request #7 from ThoughtWorksInc/features/sbt-best-practice
Atry Aug 18, 2017
ec29727
Upgrade sbt-best-practice
Atry Aug 23, 2017
9fa7f00
Merge pull request #8 from ThoughtWorksInc/features/sbt-best-practice
Atry Aug 23, 2017
1d157c6
Don't use addSbtFilesFromGit, because it has been removed in sbt 1.0
Atry Dec 8, 2017
1d2ae85
Merge branch 'features/sbt-best-practice-deploy' into features/sbt-be…
Atry Dec 8, 2017
4269156
Merge branch 'features/sbt-best-practice-sonatype-release' into template
Atry Dec 8, 2017
03fc4eb
Ignore secret directory
Atry Dec 8, 2017
988b7bf
Merge pull request #9 from ThoughtWorksInc/features/sbt-best-practice…
Atry Dec 8, 2017
298f2ec
Merge remote-tracking branch 'remotes/origin/features/sbt-best-practi…
Atry Dec 8, 2017
3bc8120
Add commons-io
Atry Dec 21, 2017
9e35e72
Merge remote-tracking branch 'scala-project-template/features/sbt-bes…
Atry Dec 21, 2017
cee18c1
Merge branch 'features/sbt-best-practice-deploy' into template
Atry Dec 21, 2017
8b92e33
Merge branch 'base-files/travis.yml' of github.com:ThoughtWorksInc/sc…
Atry Dec 26, 2017
2fa58ae
Merge branch 'features/deploy-release' into features/sbt-best-practic…
Atry Dec 26, 2017
48cd07d
Merge branch 'features/sbt-best-practice-deploy' into template
Atry Dec 26, 2017
76a3eb0
Upgrade to sbt 1.1.1
Atry Feb 19, 2018
8497fcb
Merge branch 'features/sbt-version' into features/sbt-best-practice
Atry Feb 19, 2018
a37c9be
Upgrade sbt-best-practice
Atry Feb 19, 2018
012dff4
Merge branch 'features/sbt-best-practice' into template
Atry Feb 19, 2018
bfcf490
Use sbt IO instead of apache commons to delete directories.
Atry Mar 15, 2018
857179c
Merge branch 'features/sbt-best-practice-deploy' into template
Atry Mar 15, 2018
59123a4
Upgrade sbt
Atry Mar 23, 2018
5607afb
Merge branch 'features/sbt-best-practice' into template
Atry Mar 23, 2018
d98db00
Upgrade sbt-best-practice
Atry Mar 23, 2018
a7db5b3
Merge branch 'features/sbt-best-practice' into template
Atry Mar 23, 2018
39a744a
Upgrade sbt-best-practice
Atry Apr 12, 2018
ac62c51
Merge branch 'features/sbt-best-practice' into template
Atry Apr 12, 2018
59e0d43
Upgrade sbt to 1.1.2
Atry Apr 18, 2018
4838e96
Merge pull request #12 from ThoughtWorksInc/features/sbt-version
Atry Apr 18, 2018
590cbb8
Upgrade sbt
Atry Apr 19, 2018
56f613f
Merge pull request #13 from ThoughtWorksInc/features/sbt-version
Atry Apr 19, 2018
44157f5
Enable partial-unification
Atry Apr 27, 2018
d73033d
Merge branch 'features/sbt-partial-unification' of github.com:Thought…
Atry Apr 27, 2018
c8cc673
Suppress error when GITHUB_PERSONAL_ACCESS_TOKEN is not present
Atry Apr 28, 2018
5788179
Merge pull request #15 from ThoughtWorksInc/features/sbt-best-practic…
Atry Apr 28, 2018
70e3749
Update deploy.sbt.disabled
Atry May 4, 2018
d4c17d2
Merge pull request #16 from ThoughtWorksInc/features/sbt-best-practic…
Atry May 4, 2018
c9406d1
Update deploy.sbt.disabled
Atry May 4, 2018
3f15fca
Merge pull request #17 from ThoughtWorksInc/features/sbt-best-practic…
Atry May 4, 2018
c5fa610
Update deploy.sbt.disabled
Atry May 4, 2018
d079777
Merge pull request #18 from ThoughtWorksInc/features/sbt-best-practic…
Atry May 4, 2018
bea2ecd
Upgrade sbt-best-practice
Atry May 12, 2018
0231f70
Merge remote-tracking branch 'remotes/scala-project-template/features…
Atry May 12, 2018
ddab88e
Upgrade sbt
Atry Aug 13, 2018
daf506e
Merge branch 'features/sbt-version' into template
Atry Aug 13, 2018
189d762
Upgrade sbt-best-practice
Atry Aug 14, 2018
019896a
Merge branch 'features/sbt-best-practice' into template
Atry Aug 14, 2018
3e1bb3e
Upgrade sbt
Atry Jan 9, 2019
1d7ede9
Merge pull request #19 from ThoughtWorksInc/features/sbt-version
Atry Jan 9, 2019
c23bb51
Cache $HOME/.coursier/
Atry Mar 10, 2019
e46ce0c
Merge pull request #20 from ThoughtWorksInc/features/sbt-cache
Atry Mar 10, 2019
fcad446
Remove enablePlugins(Travis) since it is automatically triggered
Atry Mar 11, 2019
59e098f
Merge commit 'fcad446c95de1a8da8f3019f0685f5271f458709' into features…
Atry Mar 11, 2019
e8d9b8a
Merge branch 'features/sbt-best-practice-sonatype-release' into template
Atry Mar 11, 2019
d83ce69
Update plugins.sbt
Atry Mar 12, 2019
23f74b8
Merge pull request #21 from ThoughtWorksInc/features/sbt-best-practice
Atry Mar 12, 2019
e2013d9
Merge pull request #22 from ThoughtWorksInc/features/sbt-best-practic…
Atry Mar 12, 2019
2309870
Merge remote-tracking branch 'origin/features/sbt-best-practice-sonat…
Atry Mar 12, 2019
b01e0fc
Upgrade sbt-best-practice to use sbt-release-early
Atry Mar 12, 2019
c220ad2
Deploy on tags
Atry Mar 12, 2019
60950e2
Fix deploy condition
Atry Mar 12, 2019
41431c6
Try to fix the deploy condition
Atry Mar 13, 2019
3b3501b
Enable sbt-release-early on all branches
Atry Mar 13, 2019
ed5bd0d
Update sbt-best-practice
Atry Mar 13, 2019
aff71a0
Upgrade sbt-best-practice to 5.0.0
Atry Mar 13, 2019
ad6377e
Upgrade sbt-best-practice to 6.0.0
Atry Mar 14, 2019
ed8f215
Don't deploy unless $GITHUB_PERSONAL_ACCESS_TOKEN is present
Atry Mar 14, 2019
07d7d9a
Update plugins.sbt
Atry Mar 16, 2019
9ac9647
Upgrade sonatype and sbt-best-practice
Atry Mar 16, 2019
64f8b34
Upgrade sbt-best-practice
Atry Mar 21, 2019
1e73dfa
Setup Scalafmt version
Atry Mar 26, 2019
cad0cb4
Upgrade sbt-dynver
Atry Mar 27, 2019
13a9465
Create dynver-dash-separator.sbt
Atry Mar 27, 2019
8f48030
Use coursier by default
Atry Mar 27, 2019
0e05d32
Delete dynver-dash-separator.sbt
Atry Mar 31, 2019
f245f55
Add sbt-example by default
Atry Mar 31, 2019
1f55938
Upgrade Coursier
Atry Apr 2, 2019
e6b0027
Merge branch 'template' of https://github.com/ThoughtWorksInc/scala-p…
Atry Apr 4, 2019
9e9ca52
Upgrade paradise plugin
Atry Apr 4, 2019
67bad51
Don't use enableIf
Atry Apr 4, 2019
6087096
Setup for sbt-dynver
Atry Apr 4, 2019
fb0e8fc
Remove subprojects other than each
Atry Apr 5, 2019
3197a7e
Fix deploy script
Atry Apr 5, 2019
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 .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