From a78ac903559df51fb8f3e3f3c9f491785bf4589b Mon Sep 17 00:00:00 2001 From: Lunfu Zhong Date: Sun, 8 Oct 2023 08:43:07 +0000 Subject: [PATCH 1/5] Update scala-library, scala-reflect to 2.13.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index db2d19e..ecba829 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ lazy val basicSettings = Seq( ) ), - scalaVersion := "2.13.8", + scalaVersion := "2.13.12", scalacOptions += "-Ymacro-annotations", scalacOptions += "-encoding", scalacOptions += "utf8", From 2d5a4f82288a52e60ea22bcfddeabd34e424bc0d Mon Sep 17 00:00:00 2001 From: zhongl Date: Tue, 28 Nov 2023 14:54:00 +0800 Subject: [PATCH 2/5] Add ignores. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 958b696..a7b930a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,7 @@ target/ *.iml .bsp/ +.metals/ +metals.sbt +.vscode/ +.bloop/ \ No newline at end of file From 2b331031af233231a1730b1c59f776fa7eff36ab Mon Sep 17 00:00:00 2001 From: zhongl Date: Tue, 28 Nov 2023 14:54:49 +0800 Subject: [PATCH 3/5] Upgrade actions. --- .github/workflows/sbt-coverage.yml | 6 +++--- .github/workflows/sbt-release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sbt-coverage.yml b/.github/workflows/sbt-coverage.yml index 9ec97f9..b955f07 100644 --- a/.github/workflows/sbt-coverage.yml +++ b/.github/workflows/sbt-coverage.yml @@ -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: diff --git a/.github/workflows/sbt-release.yml b/.github/workflows/sbt-release.yml index 0f779e7..d95881e 100644 --- a/.github/workflows/sbt-release.yml +++ b/.github/workflows/sbt-release.yml @@ -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: From cd1b91d2efd033b34064581e060994fbd55808f2 Mon Sep 17 00:00:00 2001 From: zhongl Date: Tue, 28 Nov 2023 14:55:42 +0800 Subject: [PATCH 4/5] Upgrade sbt. --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 9a19778..b19d4e1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.8.0 +sbt.version = 1.9.7 From 67b702419eeaffa3a65a3c0cb2d87639c8405b5f Mon Sep 17 00:00:00 2001 From: zhongl Date: Tue, 28 Nov 2023 16:05:10 +0800 Subject: [PATCH 5/5] Fix broken test. --- .../com/wacai/config/annotation/ConfAnnotationSpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/scala/com/wacai/config/annotation/ConfAnnotationSpec.scala b/src/test/scala/com/wacai/config/annotation/ConfAnnotationSpec.scala index 72e40d7..59bfc12 100644 --- a/src/test/scala/com/wacai/config/annotation/ConfAnnotationSpec.scala +++ b/src/test/scala/com/wacai/config/annotation/ConfAnnotationSpec.scala @@ -67,7 +67,7 @@ class ConfAnnotationSpec extends AnyFlatSpec with Matchers { } val socket = new { - val timeout = 5 seconds + val timeout = 5.seconds val buffer = 1024 * 64L } @@ -75,7 +75,7 @@ class ConfAnnotationSpec extends AnyFlatSpec with Matchers { val debug = false - val delays = 2 seconds + val delays = 2.seconds def config = ConfigFactory.parseString( """| @@ -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", "") }