From d12ca54c9077c284a512ec8103277a4be1426497 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 11:36:59 +0000 Subject: [PATCH 1/9] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5703e4a..0c53a22 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.3 runner.dialect = scala3 continuationIndent.defnSite = 2 docstrings.style = Asterisk From d77eba77fe335a4a7d6acdb6fb7db5ed8a7f95a2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 8 Sep 2024 13:21:22 +0000 Subject: [PATCH 2/9] Update circe-core, circe-generic, ... to 0.14.10 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1420095..e65fb8b 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ ThisBuild / tlMimaPreviousVersions ++= Set( ) val Versions = new { - val circe = "0.14.7" + val circe = "0.14.10" val config = "1.4.3" val munit = "0.7.29" val disciplineMunit = "1.0.9" From 9c26ac7fe290ece3896e85a02cea7e3b880ce4a2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 13 Dec 2024 14:06:15 +0000 Subject: [PATCH 3/9] Update sbt-doctest to 0.11.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c7cf629..79f8924 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0") +addSbtPlugin("io.github.sbt-doctest" % "sbt-doctest" % "0.11.1") addSbtPlugin("io.circe" % "sbt-circe-org" % "0.3.1") From 38c6a029d46c4d6f69a790c2c2108637db4f793a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 23 Dec 2024 15:02:16 +0000 Subject: [PATCH 4/9] Update sbt to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b1..73df629 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.7 From 0a4bb8020d80706b6f052bfa06759503e60ccd90 Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Thu, 26 Dec 2024 15:50:10 +0100 Subject: [PATCH 5/9] Use sbt/setup-sbt@v1 --- .github/workflows/ci.yml | 9 +++++++++ build.sbt | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fe4d34..1cf3e9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,9 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -117,6 +120,9 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -211,6 +217,9 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: diff --git a/build.sbt b/build.sbt index c783872..65429f8 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ ThisBuild / developers := List( Developer("jonas", "Jonas Fonseca", "jonas.fonseca@gmail.com", url("https://github.com/jonas")) ) val scala212 = "2.12.18" -val scala213 = "2.13.11" +val scala213 = "2.13.13" val scala3 = "3.3.4" ThisBuild / scalaVersion := scala213 ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3) @@ -24,6 +24,11 @@ ThisBuild / tlMimaPreviousVersions ++= Set( "0.7.0-M1", "0.8.0" ) +ThisBuild / githubWorkflowJobSetup := + WorkflowStep.Use( + ref = UseRef.Public("sbt", "setup-sbt", "v1"), + name = Some("Setup sbt") + ) +: (ThisBuild / githubWorkflowJobSetup).value val Versions = new { val circe = "0.14.7" From f22be5ff5ee03c62a4ceed505508b924949ca489 Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Thu, 26 Dec 2024 16:03:24 +0100 Subject: [PATCH 6/9] Disable doctest, update sbt-circe-org --- build.sbt | 2 -- project/plugins.sbt | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 65429f8..19833e3 100644 --- a/build.sbt +++ b/build.sbt @@ -54,8 +54,6 @@ lazy val config = project "org.typelevel" %% "discipline-munit" % Versions.disciplineMunit % Test, "org.typelevel" %% "munit-cats-effect-3" % Versions.munitCatsEffect % Test ), - doctestTestFramework := DoctestTestFramework.Munit, - doctestMarkdownEnabled := true, tlVersionIntroduced := Map( "2.12" -> "0.3.0", "2.13" -> "0.7.0", diff --git a/project/plugins.sbt b/project/plugins.sbt index c7cf629..98f1e4f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1 @@ -addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0") -addSbtPlugin("io.circe" % "sbt-circe-org" % "0.3.1") +addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.5") From 489e3a007594a56a31862c89e0b22313d5b170ce Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Thu, 26 Dec 2024 16:06:59 +0100 Subject: [PATCH 7/9] Remove manually added sbt-setup --- .github/workflows/ci.yml | 11 +++++++---- build.sbt | 5 ----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1cf3e9a..bcb43a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: - - name: Setup sbt + - name: Install sbt uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) @@ -120,7 +120,7 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: - - name: Setup sbt + - name: Install sbt uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) @@ -210,14 +210,14 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] java: [temurin@11] runs-on: ${{ matrix.os }} steps: - - name: Setup sbt + - name: Install sbt uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) @@ -266,6 +266,9 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (fast) uses: actions/checkout@v4 diff --git a/build.sbt b/build.sbt index 6bb5f08..87f4828 100644 --- a/build.sbt +++ b/build.sbt @@ -24,11 +24,6 @@ ThisBuild / tlMimaPreviousVersions ++= Set( "0.7.0-M1", "0.8.0" ) -ThisBuild / githubWorkflowJobSetup := - WorkflowStep.Use( - ref = UseRef.Public("sbt", "setup-sbt", "v1"), - name = Some("Setup sbt") - ) +: (ThisBuild / githubWorkflowJobSetup).value val Versions = new { val circe = "0.14.10" From 4252fe180ddadaa9843086f252074b300c6e4d66 Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Thu, 26 Dec 2024 16:08:56 +0100 Subject: [PATCH 8/9] Scala 2.13.15 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 87f4828..867a0b5 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ ThisBuild / developers := List( Developer("jonas", "Jonas Fonseca", "jonas.fonseca@gmail.com", url("https://github.com/jonas")) ) val scala212 = "2.12.18" -val scala213 = "2.13.13" +val scala213 = "2.13.15" val scala3 = "3.3.4" ThisBuild / scalaVersion := scala213 ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3) From 618b5699c18970253def7a5c14941a2c9296b5f3 Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Thu, 26 Dec 2024 16:12:35 +0100 Subject: [PATCH 9/9] Run Scalafix --- .../test/scala-3/io.circe.config/CirceConfigSpec.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/src/test/scala-3/io.circe.config/CirceConfigSpec.scala b/config/src/test/scala-3/io.circe.config/CirceConfigSpec.scala index 5f7965f..b7b328d 100644 --- a/config/src/test/scala-3/io.circe.config/CirceConfigSpec.scala +++ b/config/src/test/scala-3/io.circe.config/CirceConfigSpec.scala @@ -25,14 +25,14 @@ package io.circe.config import cats.effect.IO -import com.typesafe.config.{parser => _, _} -import io.circe.config.syntax._ -import io.circe.syntax._ -import io.circe.{parser => _, _} +import com.typesafe.config.{parser as _, *} +import io.circe.config.syntax.* +import io.circe.syntax.* +import io.circe.{parser as _, *} import munit.CatsEffectSuite import java.time.Period -import scala.concurrent.duration._ +import scala.concurrent.duration.* import scala.io.Source class CirceConfigSpec extends CatsEffectSuite {