Skip to content

Commit 83582c8

Browse files
authored
Merge branch 'master' into update/akka-stream-2.6.18
2 parents c8b577f + ced3aa8 commit 83582c8

File tree

3 files changed

+107
-4
lines changed

3 files changed

+107
-4
lines changed

.github/workflows/scala.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,17 @@ jobs:
2020
distribution: 'adopt'
2121
- name: Run Tests
2222
run: sbt clean compile test
23+
24+
merge:
25+
name: Merge dependency update
26+
if: github.actor == 'anand-singh'
27+
needs:
28+
- build
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: merge PR
32+
uses: desbo/merge-pr-action@v0
33+
with:
34+
GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
35+
ALLOWED_UPDATE: major
36+
MERGE_METHOD: squash

.scala-steward.conf

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# pullRequests.frequency allows to control how often or when Scala Steward
2+
# is allowed to create pull requests.
3+
#
4+
# Possible values:
5+
# @asap
6+
# PRs are created without delay.
7+
#
8+
# <timespan>
9+
# PRs are created only again after the given timespan since the last PR
10+
# has passed. Example values are "36 hours", "1 day", or "14 days".
11+
12+
# <CRON expression>
13+
# PRs are created roughly according to the given CRON expression.
14+
#
15+
# CRON expressions consist of five fields:
16+
# minutes, hour of day, day of month, month, and day of week.
17+
#
18+
# See https://www.alonsodomin.me/cron4s/userguide/index.html#parsing for
19+
# more information about the CRON expressions that are supported.
20+
#
21+
# Note that the date parts of the CRON expression are matched exactly
22+
# while the time parts are only used to abide to the frequency of
23+
# the given expression.
24+
#
25+
# Default: @asap
26+
#
27+
#pullRequests.frequency = "0 0 ? * 3" # every thursday on midnight
28+
#pullRequests.frequency = "7 days"
29+
30+
# Only these dependencies which match the given patterns are updated.
31+
#
32+
# Each pattern must have `groupId`, and may have `artifactId` and `version`.
33+
# Defaults to empty `[]` which mean Scala Steward will update all dependencies.
34+
#updates.allow = [ { groupId = "com.example" } ]
35+
36+
# The dependencies which match the given version pattern are updated.
37+
# Dependencies that are not listed will be updated.
38+
#
39+
# Each pattern must have `groupId`, `version` and optional `artifactId`.
40+
# Defaults to empty `[]` which mean Scala Steward will update all dependencies.
41+
# the following example will allow to update foo when version is 1.1.x
42+
#updates.pin = [ { groupId = "com.example", artifactId="foo", version = "1.1." } ]
43+
44+
# The dependencies which match the given pattern are NOT updated.
45+
#
46+
# Each pattern must have `groupId`, and may have `artifactId` and `version`.
47+
# Defaults to empty `[]` which mean Scala Steward will not ignore dependencies.
48+
#updates.ignore = [ { groupId = "org.acme", artifactId="foo", version = "1.0" } ]
49+
50+
# If set, Scala Steward will only create or update `n` PRs each time it runs (see `pullRequests.frequency` above).
51+
# Useful if running frequently and/or CI build are costly
52+
# Default: None
53+
#updates.limit = 5
54+
55+
# If set to "yes", Scala Steward will create PR for scala updates
56+
# If set to "draft", Scala Steward will create draft PR for scala updates
57+
# If set to "no", Scala Steward will not create PR for scala updates
58+
# The default is set to "draft" since updating scala version is tricky and error-prone
59+
# and is left upto the repo maintainer to mark it ready for review and merge when satisfactory
60+
# Default: draft
61+
updates.includeScala = yes
62+
63+
# The extensions of files that should be updated.
64+
# Default: [".scala", ".sbt", ".sbt.shared", ".sc", ".yml", "pom.xml"]
65+
updates.fileExtensions = [".scala", ".sbt", ".sbt.shared", ".sc", ".yml", ".md", ".markdown", ".txt"]
66+
67+
# If "on-conflicts", Scala Steward will update the PR it created to resolve conflicts as
68+
# long as you don't change it yourself.
69+
# If "always", Scala Steward will always update the PR it created as long as
70+
# you don't change it yourself.
71+
# If "never", Scala Steward will never update the PR
72+
# Default: "on-conflicts"
73+
#updatePullRequests = "always" | "on-conflicts" | "never"
74+
75+
# If set, Scala Steward will use this message template for the commit messages and PR titles.
76+
# Supported variables: ${artifactName}, ${currentVersion}, ${nextVersion} and ${default}
77+
# Default: "${default}" which is equivalent to "Update ${artifactName} to ${nextVersion}"
78+
commits.message = "Update ${artifactName} from ${currentVersion} to ${nextVersion}"
79+
80+
# If true and when upgrading version in .scalafmt.conf, Scala Steward will perform scalafmt
81+
# and add a separate commit when format changed. So you don't need reformat manually and can merge PR.
82+
# If false, Scala Steward will not perform scalafmt, so your CI may abort when reformat needed.
83+
# Default: true
84+
scalafmt.runAfterUpgrading = true
85+
86+
# It is possible to have multiple scala projects in a single repository. In that case the folders containing the projects (build.sbt folders)
87+
# are specified using the buildRoots property. Note that the paths used there are relative and if the repo directory itself also contains a build.sbt the dot can be used to specify it.
88+
# Default: ["."]
89+
#buildRoots = [ ".", "subfolder/projectA" ]

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ version := "1.0"
55
scalaVersion := "2.13.5"
66

77
libraryDependencies ++= Seq(
8-
"com.typesafe.akka" %% "akka-http" % "10.2.5",
8+
"com.typesafe.akka" %% "akka-http" % "10.2.8",
99
"com.typesafe.akka" %% "akka-stream" % "2.6.18",
10-
"com.typesafe" % "config" % "1.4.1",
10+
"com.typesafe" % "config" % "1.4.2",
1111
"org.reactivemongo" %% "reactivemongo" % "1.0.10",
1212
"ch.qos.logback" % "logback-classic" % "1.2.6",
13-
"net.codingwell" %% "scala-guice" % "5.0.1",
13+
"net.codingwell" %% "scala-guice" % "5.0.2",
1414
"org.json4s" %% "json4s-native" % "4.0.3",
1515
"org.scalatest" %% "scalatest" % "3.2.9" % "test",
16-
"com.typesafe.akka" %% "akka-http-testkit" % "10.2.5" % Test
16+
"com.typesafe.akka" %% "akka-http-testkit" % "10.2.8" % Test
1717
)

0 commit comments

Comments
 (0)