Skip to content

Commit

Permalink
Add Scala versions (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
sideeffffect authored Apr 2, 2021
1 parent e9c693a commit 429cee8
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 26 deletions.
12 changes: 12 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"automerge": true,
"labels": ["type: dependencies"],
"packageRules": [
{
"matchManagers": [
"sbt"
],
"enabled": false
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
auto-approve:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: hmarr/[email protected]
if: github.actor == 'scala-steward'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
jobs:
ci:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
fail-fast: false
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
dependabot-auto-merge:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: ahmadnassri/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: release-drafter/[email protected]
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [ published ]
jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/[email protected]
with:
Expand Down
13 changes: 7 additions & 6 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ pull_request_rules:
users: [sideeffffect]
label:
add: ["type: dependencies"]
- name: label scala-steward's breaking PRs
conditions:
- author=scala-steward
- "body~=(labels: library-update, semver-major)|(labels: sbt-plugin-update, semver-major)"
actions:
label:
add: ["type: breaking"]
- name: merge Scala Steward's PRs
conditions:
- base=master
Expand All @@ -15,8 +22,6 @@ pull_request_rules:
actions:
merge:
method: squash
delete_head_branch:
force: true
- name: automatic merge on CI success and review
conditions:
- base=master
Expand All @@ -27,8 +32,6 @@ pull_request_rules:
actions:
merge:
method: squash
delete_head_branch:
force: true
- name: automatic merge for master when CI passes
conditions:
- base=master
Expand All @@ -37,8 +40,6 @@ pull_request_rules:
actions:
merge:
method: squash
delete_head_branch:
force: true
- name: automatic update for PR marked mergify-update
conditions:
- -conflict # skip PRs with conflicts
Expand Down
30 changes: 15 additions & 15 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
rules = [
OrganizeImports
RemoveUnused
NoAutoTupling
LeakingImplicitClassVal
NoValInForComprehension
ProcedureSyntax
Disable
DisableSyntax
ExplicitResultTypes
Disable
LeakingImplicitClassVal
MissingFinal
NoAutoTupling
NoValInForComprehension
OrganizeImports
ProcedureSyntax
RemoveUnused
]

OrganizeImports {
groupedImports = Merge
}

RemoveUnused {
imports = false // handled by OrganizeImports
}

Disable {
ifSynthetic = [
"java/io/Serializable"
Expand All @@ -44,3 +36,11 @@ DisableSyntax {
noWhileLoops = true
noXml = true
}

OrganizeImports {
groupedImports = Merge
}

RemoveUnused {
imports = false // handled by OrganizeImports
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ object DecentScalaPlugin extends AutoPlugin {
}

trait DecentScala {
lazy val decentScalaVersion211 = "2.11.12"
lazy val decentScalaVersion212 = "2.12.13"
lazy val decentScalaVersion213 = "2.13.5"
lazy val decentScalaSettings: List[Def.Setting[_]] =
List(
scalaVersion := decentScalaVersion213,
crossScalaVersions := Seq(decentScalaVersion211, decentScalaVersion212, decentScalaVersion213),
libraryDependencies ++= List(
compilerPlugin(Dependencies.betterMonadicFor),
compilerPlugin(Dependencies.kindProjector),
Expand Down

0 comments on commit 429cee8

Please sign in to comment.