Skip to content

Commit

Permalink
Merge pull request #374 from scala-steward/update/sbt-circe-org-0.4.2
Browse files Browse the repository at this point in the history
Update sbt-circe-org to 0.4.2
  • Loading branch information
hamnis authored Aug 19, 2024
2 parents 0836179 + 19112dc commit 212106d
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 17 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -121,6 +125,10 @@ jobs:
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -225,6 +233,10 @@ jobs:
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down
13 changes: 7 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
val Versions = new {
val circe = "0.14.6"
val monocle = "3.2.0"
val discipline = "2.2.0"
val scalaTestPlus = "3.2.11.0"
val circe = "0.14.9"
val monocle = "3.3.0"
val discipline = "2.3.0"
val scalaTestPlus = "3.2.19.0"

val scala213 = "2.13.13"
val scala213 = "2.13.14"
val scala3 = "3.3.3"

val scalaVersions = Seq(scala213, scala3)
Expand All @@ -13,6 +13,7 @@ val Versions = new {
ThisBuild / crossScalaVersions := Versions.scalaVersions
ThisBuild / scalaVersion := Versions.scala213
ThisBuild / tlFatalWarnings := false //TODO: ... fix this someday
ThisBuild / startYear := Some(2016)

ThisBuild / tlBaseVersion := "0.15"

Expand All @@ -34,7 +35,7 @@ lazy val optics = crossProject(JVMPlatform, JSPlatform)
"io.circe" %%% "circe-core" % Versions.circe,
"io.circe" %%% "circe-generic" % Versions.circe % Test,
"io.circe" %%% "circe-testing" % Versions.circe % Test,
"org.scalatestplus" %%% "scalacheck-1-15" % Versions.scalaTestPlus % Test,
"org.scalatestplus" %%% "scalacheck-1-18" % Versions.scalaTestPlus % Test,
"org.typelevel" %%% "discipline-scalatest" % Versions.discipline % Test
)
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/main/scala/io/circe/optics/JsonOptics.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/main/scala/io/circe/optics/JsonPath.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/main/scala/io/circe/optics/package.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/test/scala/io/circe/optics/CirceSuite.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/test/scala/io/circe/optics/JsonPathSuite.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/test/scala/io/circe/optics/LawsTests.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion optics/src/test/scala/io/circe/optics/OpticsSuite.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 circe
* Copyright 2016 circe
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("io.circe" % "sbt-circe-org" % "0.3.1")
addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

0 comments on commit 212106d

Please sign in to comment.