From d13490b91b93cdea1fb93f279faa42c17d6d4ba9 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 4 Oct 2019 10:00:07 -0700 Subject: [PATCH 01/38] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dfa772b9..8522443d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 \ No newline at end of file +sbt.version=1.3.2 From d80070d7def9da4dda0f49eb29bc68804304d0fd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 21 Nov 2019 18:25:20 -0800 Subject: [PATCH 02/38] Create .gitpod.yml --- .gitpod.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000..c0194336 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,5 @@ +image: instructure/scala-sbt:1.2 +vscode: + extensions: + - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== + - scalameta.metals@1.6.0:Yi5jjDJjIyozrOuZIWFt/g== From bd2c2aad031b5462575cf3e422c1ac39baae7c49 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 21 Nov 2019 18:37:13 -0800 Subject: [PATCH 03/38] Ignore Metals files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d180f4bd..1ecb4e01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ target/ local.sbt secret/ +.metals/ +.bloop/ From 7d7fcc80f7931fc60fcf868f1709a2ac18cad5b2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 22 Nov 2019 03:18:03 +0000 Subject: [PATCH 04/38] Switch to a docker image that supports Node.js --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index c0194336..6db8e4ce 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: instructure/scala-sbt:1.2 +image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== From ad26ea5eccecfee47a9a09f671f11e2000a963dd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 23 Nov 2019 19:36:10 -0800 Subject: [PATCH 05/38] Update .scalafmt.conf --- .scalafmt.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f216dbfd..9c1a40ca 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,2 @@ -version = "1.5.1" -maxColumn = 120 \ No newline at end of file +version = "2.2.2" +maxColumn = 120 From 44904216609827d158abdfb9ff17c2e76cae1fec Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 23 Nov 2019 21:54:46 -0800 Subject: [PATCH 06/38] Upgrade metals --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 6db8e4ce..b7d40fe3 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,4 +2,4 @@ image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== - - scalameta.metals@1.6.0:Yi5jjDJjIyozrOuZIWFt/g== + - scalameta.metals@1.6.3:pVVu91DEAijx+sPKu8fgHA== From 16d167270439bc14d12529cc9ffa5b5d6177df05 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Dec 2019 03:48:02 +0100 Subject: [PATCH 07/38] Update scalatest to 3.1.0 --- domains-cats/build.sbt | 2 +- .../test/scala/com/thoughtworks/dsl/domains/catsSpec.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/domains-cats/build.sbt b/domains-cats/build.sbt index a17c5dfe..ab9c70bb 100644 --- a/domains-cats/build.sbt +++ b/domains-cats/build.sbt @@ -4,7 +4,7 @@ libraryDependencies += "org.typelevel" %%% "cats-free" % "2.0.0" % Optional // F libraryDependencies += "org.typelevel" %%% "cats-core" % "2.0.0" -libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test +libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0" % Test libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.5.2" diff --git a/domains-cats/src/test/scala/com/thoughtworks/dsl/domains/catsSpec.scala b/domains-cats/src/test/scala/com/thoughtworks/dsl/domains/catsSpec.scala index f2de838c..59c2c976 100644 --- a/domains-cats/src/test/scala/com/thoughtworks/dsl/domains/catsSpec.scala +++ b/domains-cats/src/test/scala/com/thoughtworks/dsl/domains/catsSpec.scala @@ -1,14 +1,15 @@ package com.thoughtworks.dsl.domains -import org.scalatest.{FreeSpec, Matchers} import _root_.cats.instances.stream._ import com.thoughtworks.dsl.keywords.{Monadic, Shift, Yield} import com.thoughtworks.dsl.domains.cats._ +import org.scalatest.freespec.AnyFreeSpec +import org.scalatest.matchers.should.Matchers /** * @author 杨博 (Yang Bo) */ -class catsSpec extends FreeSpec with Matchers { +class catsSpec extends AnyFreeSpec with Matchers { "Given a continuation that uses Yield and Monadic expressions" - { From c682fefe70d42dc829247432f43d78ba9c64b987 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 2 Dec 2019 22:35:45 -0800 Subject: [PATCH 08/38] Update sbt-example --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4842aae6..c8202f94 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") -addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "6.0.1") +addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") From 50a24861fe1f2a65483350f0a7731fde108b1c06 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 18 Apr 2020 18:26:28 -0700 Subject: [PATCH 09/38] Ignore more Metals files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1ecb4e01..24f4eb65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ local.sbt secret/ .metals/ .bloop/ +project/metals.sbt From f863c3a6b535441e240a558529d9fafec46307eb Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 18 Apr 2020 22:43:51 -0700 Subject: [PATCH 10/38] Update JDK version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ed3a0a7..8208d2c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ scala: - 2.12.8 jdk: - - openjdk8 + - openjdk11 before_cache: - find $HOME/.sbt -name '*.lock' -delete From 9b1fde028a85cb768c9cf8b671f64659e4733810 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:17:56 -0700 Subject: [PATCH 11/38] Clear cache according to https://www.scala-sbt.org/1.x/docs/Travis-CI-with-sbt.html#Caching --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8208d2c7..8e61b099 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,9 @@ jdk: - openjdk11 before_cache: - - find $HOME/.sbt -name '*.lock' -delete - - find $HOME/.ivy2 -name 'ivydata-*.properties' -delete + - rm -fv $HOME/.ivy2/.sbt.ivy.lock + - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete + - find $HOME/.sbt -name "*.lock" -print -delete cache: directories: From 680293ce37973ddf1e96b8e595b6cd1f412c6fc2 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:28:26 -0700 Subject: [PATCH 12/38] Migrate deprecated Travis CI settings --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e61b099..acf0cc58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: false - addons: apt: packages: @@ -31,7 +29,7 @@ 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 - skip_cleanup: true + cleanup: false on: all_branches: true condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 03cedbf25585bfd54d707cf8877649b98dd05a32 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 13:47:21 -0700 Subject: [PATCH 13/38] Update cache directory according to https://www.scala-sbt.org/1.x/docs/Travis-CI-with-sbt.html#Caching --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index acf0cc58..230ca9d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ before_cache: cache: directories: + - $HOME/.cache/coursier - $HOME/.ivy2/cache - - $HOME/.sbt/boot/ - - $HOME/.coursier/ + - $HOME/.sbt before_script: From b947e2d086dd2d2b7e45c0f0ae4167bfe4ba2dc9 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 25 Apr 2020 14:19:45 -0700 Subject: [PATCH 14/38] Switch to dpl v2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 230ca9d1..49dcd279 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ 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 cleanup: false + edge: true on: all_branches: true condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 64470597e7c288ef476d0f9d8f6451bfd260bb74 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 29 May 2020 23:31:09 +0000 Subject: [PATCH 15/38] Update Metals --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index b7d40fe3..cd17bda2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,4 +2,4 @@ image: igeolise/scalajs-test-runner:latest vscode: extensions: - scala-lang.scala@0.3.8:wQBBM+lKILHBqOqlqW60xA== - - scalameta.metals@1.6.3:pVVu91DEAijx+sPKu8fgHA== + - scalameta.metals@1.9.0:EyAIfy0ykjUn9htpw3f7GA== \ No newline at end of file From ccbecaa37d5a3516fe95fadda80ae0919346239d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 11:18:36 -0700 Subject: [PATCH 16/38] Also ignore project/project/metals.sbt --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 24f4eb65..1cb04be5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ local.sbt secret/ .metals/ .bloop/ -project/metals.sbt +metals.sbt From 24038c56ee989dfcd2927145aa9d0554813fcd65 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:27:22 -0700 Subject: [PATCH 17/38] Add .vscode/ --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..32cfc61d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.watcherExclude": { + "**/target": true + } +} \ No newline at end of file From bd7a8d7481fdf7eea6b36cccc696322e3f6d1a26 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 09:34:32 -0700 Subject: [PATCH 18/38] Set up Github Actions --- .github/workflows/scala.yml | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/scala.yml diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml new file mode 100644 index 00000000..31792710 --- /dev/null +++ b/.github/workflows/scala.yml @@ -0,0 +1,42 @@ +name: Scala CI + +on: +- push +- pull_request + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + scala: + - 2.12.8 + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # Need the git history for sbt-dynver to determine the version + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Cache SBT + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache/ + ~/.sbt/ + ~/.coursier/ + key: | + ${{ runner.os }}-${{matrix.scala}}-${{ hashFiles('**/*.sbt') }} + ${{ runner.os }}-${{matrix.scala}}- + - name: Run tests + run: sbt ++${{ matrix.scala }} test + - name: Publish to Maven Central Repository + env: + GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} + if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }} + run: sbt ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}} ${{github.run_number}} ${{github.run_attempt}} ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease From c77da292b3e421f9bbdd5645a3bb7e77652ded9a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:29:16 -0700 Subject: [PATCH 19/38] Upgrade sbt-best-practice --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c8202f94..0bdc8bcd 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" % "8.0.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") From 4536453d8f90415162b31c9237a6bbed5c59d0b7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:30:04 -0700 Subject: [PATCH 20/38] Remove Travis CI configuration --- .travis.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 49dcd279..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -addons: - apt: - packages: - - graphviz - -language: scala - -scala: - - 2.12.8 - -jdk: - - openjdk11 - -before_cache: - - rm -fv $HOME/.ivy2/.sbt.ivy.lock - - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete - - find $HOME/.sbt -name "*.lock" -print -delete - -cache: - directories: - - $HOME/.cache/coursier - - $HOME/.ivy2/cache - - $HOME/.sbt - -before_script: - -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 - cleanup: false - edge: true - on: - all_branches: true - condition: $GITHUB_PERSONAL_ACCESS_TOKEN From 5d87b7d365bd5e279b71f02946d970d2f170a551 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 16:42:45 -0700 Subject: [PATCH 21/38] Upgrade sbt to 1.5.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8522443d..10fd9eee 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.2 +sbt.version=1.5.5 From aea68e93d24296195ffccc3b81dba80734f1320f Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 2 Nov 2021 23:03:45 -0700 Subject: [PATCH 22/38] Ignore .bsp/sbt.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1cb04be5..5387d4b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ secret/ .metals/ .bloop/ metals.sbt +.bsp/sbt.json From 68d057622d54bd3e58289f4283eae42bc27df314 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 6 Nov 2021 12:47:52 -0700 Subject: [PATCH 23/38] Don't fail fast --- .github/workflows/scala.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 31792710..79239f67 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: scala: - 2.12.8 From 5e3c91e911a5fe16686e84bb68e9d6c151509cd1 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 11 Nov 2021 16:18:37 -0800 Subject: [PATCH 24/38] Add a random number into sonatypeSessionName --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 79239f67..b9625551 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -40,4 +40,4 @@ jobs: env: GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }} - run: sbt ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}} ${{github.run_number}} ${{github.run_attempt}} ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease + run: sbt ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease From b8e8c87e02bc733d7aff1148131241648eb9ad4f Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 13 Nov 2021 00:01:08 -0800 Subject: [PATCH 25/38] Cache ~/.ivy/local for Github Actions --- .github/workflows/scala.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index b9625551..7796cccf 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -28,6 +28,7 @@ jobs: uses: actions/cache@v2 with: path: | + ~/.ivy2/local/ ~/.ivy2/cache/ ~/.sbt/ ~/.coursier/ From b4969d0cf78de600b9df9c54a242dde2b6f92ef5 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 16 Nov 2021 18:49:30 -0800 Subject: [PATCH 26/38] Add runner.dialect and update scalafmt version --- .scalafmt.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9c1a40ca..a6300edd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,3 @@ -version = "2.2.2" +runner.dialect = "scala213" +version = "3.1.1" maxColumn = 120 From d77d29a796ff2b0a9410d9f91134e62f334b4e7f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 26 Nov 2021 08:58:06 +0100 Subject: [PATCH 27/38] Update compilerplugins-bangnotation, ... to 1.5.5 --- domains-cats/build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/domains-cats/build.sbt b/domains-cats/build.sbt index a17c5dfe..f554aae5 100644 --- a/domains-cats/build.sbt +++ b/domains-cats/build.sbt @@ -6,19 +6,19 @@ libraryDependencies += "org.typelevel" %%% "cats-core" % "2.0.0" libraryDependencies += "org.scalatest" %%% "scalatest" % "3.0.8" % Test -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.5.2" % Optional +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.5.5" % Optional -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.5.2" % Optional +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.5.5" % Optional -addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.5.2") +addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.5.5") -addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.5.2") +addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.5.5") scalacOptions ++= { import Ordering.Implicits._ From a29a0e31f50f4d822c837a84b4b3cfcd5b02994a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 5 Dec 2021 22:33:26 -0800 Subject: [PATCH 28/38] Update sbt-best-practice to 8.2.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0bdc8bcd..38bc3b08 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.0.0") +addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8") From 9f9cf58088b8236e47cc8fbebf009bb5647c015a Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 7 Dec 2021 01:38:30 -0800 Subject: [PATCH 29/38] Set maxColumn to 80 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a6300edd..26467aa1 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = "scala213" version = "3.1.1" -maxColumn = 120 +maxColumn = 80 From a353ce68acb08fd6c56ad66ccb476237cecab0b7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 7 Dec 2021 18:28:20 -0800 Subject: [PATCH 30/38] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5387d4b3..51b7c9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ secret/ .bloop/ metals.sbt .bsp/sbt.json +.vscode/launch.json From 74ed2d73e404ac3c58bf791b1663e1b601e82525 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 27 Dec 2021 11:00:01 -0800 Subject: [PATCH 31/38] Update Scala to 2.12.15 --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 7796cccf..06ead645 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: scala: - - 2.12.8 + - 2.12.15 steps: - uses: actions/checkout@v2 From e28acdbcf9e59a9c6c15dd1282466de9c8bf0837 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 5 Feb 2022 21:40:29 -0800 Subject: [PATCH 32/38] Ignore *.scala.semanticdb --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 51b7c9dd..1b716451 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ secret/ metals.sbt .bsp/sbt.json .vscode/launch.json +*.scala.semanticdb From 10022752c23977a79aa6af779ac458907f19b4fc Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 17 Mar 2022 01:53:31 -0700 Subject: [PATCH 33/38] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1b716451..5701ab54 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ secret/ .metals/ .bloop/ metals.sbt -.bsp/sbt.json +.bsp/ .vscode/launch.json *.scala.semanticdb From 5ece74ca49806732b22ebad38a2e90b95f033288 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sat, 19 Mar 2022 10:27:59 -0700 Subject: [PATCH 34/38] Use Temurin JDK --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 06ead645..78a21b04 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: '11' - distribution: 'adopt' + distribution: temurin - name: Cache SBT uses: actions/cache@v2 with: From 89f3c1058a893041ffdbce87382bc57cfa643bf1 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 10 Jul 2022 19:39:08 +0000 Subject: [PATCH 35/38] Update Scala.js to 0.6.33 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1a43c678..43777ca7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,4 +12,4 @@ addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.33") From 4152131b9908921a0344ba45ed43a001e9ca4bbd Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 10 Jul 2022 19:39:19 +0000 Subject: [PATCH 36/38] Downgrade Scala to 2.13.4 --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index d5b1d8e4..1cdc31e7 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -15,7 +15,7 @@ jobs: scala: - 2.11.12 - 2.12.15 - - 2.13.7 + - 2.13.4 steps: - uses: actions/checkout@v2 From 2226310d2a7b8c65f38178b755efa1ead1cf40f3 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 10 Jul 2022 19:46:26 +0000 Subject: [PATCH 37/38] Cross build for Scala.js 1.x and 0.6.x --- .github/workflows/scala.yml | 15 ++++++++++++++- project/plugins.sbt | 4 ++-- project/plugins.sbt.scalajs06 | 22 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 project/plugins.sbt.scalajs06 diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 1cdc31e7..4f329a14 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -15,7 +15,20 @@ jobs: scala: - 2.11.12 - 2.12.15 - - 2.13.4 + - 2.13.7 + sbt-args: + - --addPluginSbtFile=project/plugins.sbt.scalajs06 + - '' + exclude: + - scala: 2.12.15 + sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06 + - scala: 2.13.7 + sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06 + include: + - scala: 2.12.13 + sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06 + - scala: 2.13.4 + sbt-args: --addPluginSbtFile=project/plugins.sbt.scalajs06 steps: - uses: actions/checkout@v2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 43777ca7..50b4576a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,6 +10,6 @@ addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2") addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "7.0.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.33") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") diff --git a/project/plugins.sbt.scalajs06 b/project/plugins.sbt.scalajs06 new file mode 100644 index 00000000..df1f1fb1 --- /dev/null +++ b/project/plugins.sbt.scalajs06 @@ -0,0 +1,22 @@ +// An optional sbt file to replace Scala.js 1.0 with 0.6 +dependencyOverrides += Defaults.sbtPluginExtra( + "org.scala-js" % "sbt-scalajs" % "0.6.33", + sbtBinaryVersion.value, + scalaBinaryVersion.value, +) + +Compile / sourceGenerators += Def.task { + val file = (Compile / sourceManaged).value / "SkipPublishForNonScalaJSProjects.scala" + IO.write(file, """ + import scalajscrossproject.ScalaJSCrossPlugin.autoImport._ + import sbtcrossproject.CrossPlugin.autoImport._ + import sbt._, Keys._ + object SkipPublishForNonScalaJSProjects extends AutoPlugin { + override def trigger = allRequirements + override def projectSettings = Seq( + publish / skip := crossProjectPlatform.?.value != Some(JSPlatform) + ) + } + """) + Seq(file) +}.taskValue \ No newline at end of file From 8f8998bcb157d14dcc6951268621d9d4a7c7a331 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Sun, 10 Jul 2022 19:53:15 +0000 Subject: [PATCH 38/38] Upgrade Dsl.scala to 1.5.5 --- domains-cats/build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/domains-cats/build.sbt b/domains-cats/build.sbt index ab9c70bb..558d9ea0 100644 --- a/domains-cats/build.sbt +++ b/domains-cats/build.sbt @@ -6,19 +6,19 @@ libraryDependencies += "org.typelevel" %%% "cats-core" % "2.0.0" libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0" % Test -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-catch" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-monadic" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.5.2" +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-return" % "1.5.5" -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.5.2" % Optional +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-shift" % "1.5.5" % Optional -libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.5.2" % Optional +libraryDependencies += "com.thoughtworks.dsl" %%% "keywords-yield" % "1.5.5" % Optional -addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.5.2") +addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.5.5") -addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.5.2") +addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.5.5") scalacOptions ++= { import Ordering.Implicits._