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 scala-library, scala-reflect to 2.13.12 #147

Merged
merged 5 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/sbt-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: olafurpg/setup-scala@v13
- uses: actions/checkout@v4
- uses: coursier/setup-action@v1
- name: branch-names
id: branch-name
uses: tj-actions/branch-names@v2.2
uses: tj-actions/branch-names@v7
- run: sbt coverage +test coverageReport
- run: sbt coveralls
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sbt-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: olafurpg/setup-scala@v10
- uses: coursier/setup-action@v1
- uses: olafurpg/setup-gpg@v3
- run: sbt ci-release
env:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
target/
*.iml
.bsp/
.metals/
metals.sbt
.vscode/
.bloop/
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lazy val basicSettings = Seq(
)
),

scalaVersion := "2.13.8",
scalaVersion := "2.13.12",
scalacOptions += "-Ymacro-annotations",
scalacOptions += "-encoding",
scalacOptions += "utf8",
Expand Down
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.0
sbt.version = 1.9.7
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ class ConfAnnotationSpec extends AnyFlatSpec with Matchers {
}

val socket = new {
val timeout = 5 seconds
val timeout = 5.seconds
val buffer = 1024 * 64L
}

val client = "id"

val debug = false

val delays = 2 seconds
val delays = 2.seconds

def config = ConfigFactory.parseString(
"""|
Expand Down Expand Up @@ -119,7 +119,7 @@ class ConfAnnotationSpec extends AnyFlatSpec with Matchers {
val b = List(true, false)
val d = List(1.1, 2.2)
val l = List(512L, 1024 * 3L)
val t = List(1 second, 2 minutes)
val t = List(1.second, 2.minutes)
val s = List("a", "b")
val e = List("", "a", "", "c", "")
}
Expand Down