diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fe4d34..bcb43a1 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: Install 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: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -204,13 +210,16 @@ 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: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -257,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/.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 diff --git a/build.sbt b/build.sbt index aeb8134..06dac21 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.15" val scala3 = "3.3.4" ThisBuild / scalaVersion := scala213 ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3) @@ -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 = "1.0.3" val disciplineMunit = "1.0.9" @@ -49,8 +49,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/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 { 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 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")