From 7b72cf8fc803131696ea35c60eb31d792b3fd075 Mon Sep 17 00:00:00 2001 From: David Barri Date: Tue, 10 Aug 2021 11:24:31 +1000 Subject: [PATCH 1/4] Ignore modern Scala tooling artifacts --- .gitignore | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc9a72c3b..9c740c1c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ -target/ +.bloop +.bsp .cache .classpath +.idea +.idea_modules +.metals .project .settings/ -.idea -.idea_modules \ No newline at end of file +.vscode +metals.sbt +target/ From ee8f56e23f807c422c973dea8cb632f20e92456c Mon Sep 17 00:00:00 2001 From: David Barri Date: Tue, 10 Aug 2021 11:28:26 +1000 Subject: [PATCH 2/4] Upgrade Github Action versions --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/ghpages.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dfa54c7f..541a99df3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}" steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v10 + - uses: olafurpg/setup-scala@v13 with: java-version: "adopt@1.8" - - uses: coursier/cache-action@v5 + - uses: coursier/cache-action@v6 - name: Build run: sbt "++${{ matrix.scalaversion }}" package - name: Test generate documentation @@ -37,9 +37,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v10 + - uses: olafurpg/setup-scala@v13 with: java-version: "adopt@1.8" - - uses: coursier/cache-action@v5 + - uses: coursier/cache-action@v6 - name: Readme generation run: sbt readme/run diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml index 60cc6b6d0..1e39f5d0e 100644 --- a/.github/workflows/ghpages.yml +++ b/.github/workflows/ghpages.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v10 + - uses: olafurpg/setup-scala@v13 with: java-version: "adopt@1.8" - - uses: coursier/cache-action@v5 + - uses: coursier/cache-action@v6 - name: Build run: sbt readme/run From a5c5398e447933a28f5398f60d8b2b3f021d1202 Mon Sep 17 00:00:00 2001 From: David Barri Date: Tue, 10 Aug 2021 11:45:32 +1000 Subject: [PATCH 3/4] Update developer list --- build.sbt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build.sbt b/build.sbt index 371ebc4c8..7575d5f50 100644 --- a/build.sbt +++ b/build.sbt @@ -75,11 +75,21 @@ publishTo := { pomExtra := ( + + japgolly + David Barri + https://github.com/japgolly + lihaoyi Li Haoyi https://github.com/lihaoyi/ + + armanbilge + Arman Bilge + https://github.com/armanbilge + sjrd Sébastien Doeraene From 803d233ce68f0d453c8be872902858808ebda815 Mon Sep 17 00:00:00 2001 From: David Barri Date: Tue, 10 Aug 2021 11:47:01 +1000 Subject: [PATCH 4/4] Rename project/{build => plugins}.sbt as is the standard --- project/{build.sbt => plugins.sbt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename project/{build.sbt => plugins.sbt} (100%) diff --git a/project/build.sbt b/project/plugins.sbt similarity index 100% rename from project/build.sbt rename to project/plugins.sbt