Skip to content

Commit

Permalink
Merge branch 'master' into update/munit-1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
fthomas committed Dec 27, 2024
2 parents 39c12ca + beb6c65 commit 395c1ee
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.1
version = 3.8.3
runner.dialect = scala3
continuationIndent.defnSite = 2
docstrings.style = Asterisk
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions config/src/test/scala-3/io.circe.config/CirceConfigSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
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.9.9
sbt.version=1.10.7
3 changes: 1 addition & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 395c1ee

Please sign in to comment.