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

Update template #156

Open
wants to merge 55 commits into
base: 3.3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
996ce99
Use SECRET_GIST instead of GITHUB_PERSONAL_ACCESS_TOKEN
Atry Jun 5, 2019
d95f4b8
Update .travis.yml
Atry Jun 5, 2019
3b875bf
Update plugins.sbt
Atry Jun 11, 2019
9e30edb
Merge commit '3b875bff5977a95269326d92cdee7c5a8c147e9d' into template
Atry Jun 12, 2019
9c3a0d3
Upgrade sbt-dynver
Atry Jun 20, 2019
8442fd7
Merge branch 'upstream-template' into template
Atry Jun 20, 2019
3aebc15
Merge branch 'upstream-template' into template
Atry Jun 23, 2019
fa2d834
Upgrade sbt
Atry Sep 5, 2019
75bfab0
Use publish / skip
Atry Sep 5, 2019
e537cb4
Merge commit 'fdc190cb16b03e4a4a617965cc5ba97a461907fa' into template
Atry Sep 6, 2019
880b43f
Update sbt-sonatype to 3.6
scala-steward Sep 6, 2019
5300633
Merge branch 'upstream-template' into template
Atry Sep 9, 2019
cb8bc64
Merge pull request #1 from ThoughtWorksInc/template
Atry Sep 11, 2019
073623c
Upgrade sbt-sonatype
Atry Oct 4, 2019
94df716
Update build.properties
Atry Oct 4, 2019
819d9f0
Merge branch 'template' of github.com:ThoughtWorksInc/scala-project-t…
Atry Oct 4, 2019
98e0ca3
Merge pull request #2 from ThoughtWorksInc/template
Atry Nov 22, 2019
9b2c0b0
Merge pull request #3 from ThoughtWorksInc/template
Atry Nov 22, 2019
f6b6738
Merge commit '9b2c0b0f86c0548c5756404a14f1e3e8e1eede17' into template
Atry Nov 22, 2019
50a8a9c
Merge pull request #4 from ThoughtWorksInc/template
Atry Nov 24, 2019
eadea3d
Merge pull request #5 from ThoughtWorksInc/template
Atry Nov 24, 2019
b420caf
Merge pull request #6 from ThoughtWorksInc/template
Atry Dec 3, 2019
5c3d919
Merge pull request #7 from ThoughtWorksInc/template
Atry Apr 19, 2020
48a409a
Merge pull request #8 from ThoughtWorksInc/template
Atry Apr 19, 2020
b8bc077
Merge pull request #9 from ThoughtWorksInc/template
Atry Apr 25, 2020
9fcb079
Merge pull request #10 from ThoughtWorksInc/template
Atry Apr 25, 2020
1edd706
Merge pull request #11 from ThoughtWorksInc/template
Atry Apr 25, 2020
0fd971f
Merge pull request #12 from ThoughtWorksInc/template
Atry Apr 25, 2020
f109a82
Merge pull request #13 from Atry/update-metals
Atry May 29, 2020
9b74ae3
Merge commit 'aea68e93d24296195ffccc3b81dba80734f1320f' into template
Atry Nov 3, 2021
078e700
Merge branch 'template' into template
Atry Dec 16, 2021
6f76452
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 9, 2023
26b2258
Merge branch 'template' of github.com:ThoughtWorksInc/scala-project-t…
Atry Jan 11, 2023
d7474b5
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 26, 2023
c065799
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 26, 2023
8b1f0fd
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 27, 2023
9668383
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 27, 2023
1cb728c
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 27, 2023
805e013
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 27, 2023
855d12b
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 27, 2023
d72c5e9
Merge branch 'ThoughtWorksInc:template' into template
Atry Jan 30, 2023
fc08ba2
Update and rename plugins.sbt to sbt-best-practice.sbt
Atry Feb 14, 2023
0ff30d8
Update scalafmt-core to 3.7.1 in template (#16)
github-actions[bot] Jul 1, 2023
9ec37b4
Merge branch 'template' of https://github.com/thoughtworksinc/scala-p…
Atry Jul 1, 2023
dc8b239
Merge branch 'template' of github.com:Atry/scala-project-template int…
Atry Jul 1, 2023
421e174
Update scalafmt-core to 3.7.5 in template (#22)
github-actions[bot] Jul 1, 2023
4614ec7
Update sbt to 1.8.3 in template (#21)
github-actions[bot] Jul 1, 2023
08fb755
Add GitHub Action to pull scala-project-template
Atry Jul 1, 2023
fa38523
Update sbt to 1.9.1 in template (#24)
github-actions[bot] Jul 1, 2023
744999e
Update scala-project-template.yml
Atry Jul 1, 2023
418b18d
Update scala-project-template.yml
Atry Jul 1, 2023
c31f513
Update scala-project-template.yml
Atry Jul 1, 2023
885406c
Delete .gitpod.yml
Atry Jul 1, 2023
a335404
Update scala-project-template.yml
Atry Jul 1, 2023
a5a30ce
Merge branch '3.3.x' of github.com:ThoughtWorksInc/each into update/t…
Atry Jul 2, 2023
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
31 changes: 31 additions & 0 deletions .github/workflows/scala-project-template.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
on:
push:
branches-ignore:
- "update/**"
schedule:
- cron: "0 0 * * 0"
workflow_dispatch:

name: Update Scala project template

jobs:
update-scala-project-template:
permissions:
# for aws-actions/configure-aws-credentials to assume an AWS role
id-token: write
# for peter-evans/create-pull-request to create branch
contents: write
# for peter-evans/create-pull-request to create a PR
pull-requests: write
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- run: git fetch https://github.com/Atry/scala-project-template.git template
- run: git reset --hard FETCH_HEAD
- uses: peter-evans/create-pull-request@v5
with:
delete-branch: true
base: ${{github.ref_name}}
branch: update/${{github.ref_name}}/scala-project-template
title: Update scala-project-template
token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
5 changes: 0 additions & 5 deletions .gitpod.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
runner.dialect = scala212source3
version = "3.7.1"
version = "3.7.5"
maxColumn = 80
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.9.1
14 changes: 0 additions & 14 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
addSbtPlugin(
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.2.5"
)

addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.0.0")

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

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17")

addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")

addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.2")

addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "9.2.1")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
3 changes: 3 additions & 0 deletions project/sbt-best-practice.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
addSbtPlugin(
"com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "8.3.0"
)
2 changes: 1 addition & 1 deletion secret.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lazy val secret = {
org.eclipse.jgit.api.Git
.cloneRepository()
.setURI(
"https://github.com/ThoughtWorksInc/tw-data-china-continuous-delivery-password.git"
"https://github.com/Atry/secrets.git"
)
.setDirectory(secretDirectory)
.setCredentialsProvider(
Expand Down