Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump scala versions (2.12.19, 2.13.13, 3.3.3 LTS) #1441

Open
wants to merge 4 commits into
base: series/4.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
java: ['adopt@1.8', 'adopt@1.11']
scala: ['2.12.18', '2.13.12', '3.4.1']
scala: ['2.12.19', '2.13.13', '3.3.3']
platform: ['JS', 'JVM', 'Native']
steps:
- name: Checkout current branch
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ inThisBuild(

addCommandAlias("fmt", "; scalafmtSbt; scalafmt; test:scalafmt")
addCommandAlias("fix", "; all compile:scalafix test:scalafix; all scalafmtSbt scalafmtAll")
addCommandAlias("compileAll", "; ++2.12.18; root2-12/compile; ++2.13.12!; root2-13/compile; ++3.2.2!; root3/compile;")
addCommandAlias("testAll", "; ++2.12.18; root2-12/test; ++2.13.12!; root2-13/test; ++3.2.2!; root3/test;")
addCommandAlias("compileAll", "; ++2.12.19; root2-12/compile; ++2.13.13!; root2-13/compile; ++3.3.3!; root3/compile;")
addCommandAlias("testAll", "; ++2.12.19; root2-12/test; ++2.13.13!; root2-13/test; ++3.3.3!; root3/test;")
addCommandAlias(
"testJS",
";zioConfigJS/test"
Expand Down
4 changes: 2 additions & 2 deletions core/shared/src/main/scala/zio/config/IndexedFlat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ trait IndexedFlat extends ConfigProvider.Flat {
final def load[A](path: Chunk[String], config: Config.Primitive[A])(implicit
trace: Trace
): IO[Config.Error, Chunk[A]] =
load(path, config, true)
load(path, config, split = true)

final override def load[A](path: Chunk[String], config: Config.Primitive[A], split: Boolean)(implicit
trace: Trace
Expand All @@ -27,7 +27,7 @@ trait IndexedFlat extends ConfigProvider.Flat {
final def loadIndexed[A](path: ConfigPath, config: Config.Primitive[A])(implicit
trace: Trace
): IO[Config.Error, Chunk[A]] =
loadIndexed(path, config, true)
loadIndexed(path, config, split = true)
}

object IndexedFlat {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ object DeriveConfig {
.toMap

val keyNameIfPureConfig: Option[String] =
sealedTrait.annotations.collectFirst { case discriminator: discriminator => discriminator.keyName }
sealedTrait.annotations.collectFirst { case discriminator1: discriminator => discriminator1.keyName }

val desc =
keyNameIfPureConfig match {
Expand Down
2 changes: 1 addition & 1 deletion project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ object BuildHelper {
Seq.empty
else
Seq(
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full)
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full)
)
},
semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB
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.8
sbt.version = 1.10.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package zio.config.refined
import eu.timepit.refined.numeric.{Divisible, Greater, GreaterEqual, Less, LessEqual, NonDivisible}

private[refined] trait NumericTestTypes {
type Less10 = Less[10]
type Greater10 = Greater[10]
type Less10 = Less[10]
type Greater10 = Greater[10]
type GreaterOrEqual10 = GreaterEqual[10]
type LessOrEqual10 = LessEqual[10]
type DivisibleBy10 = Divisible[10]
type LessOrEqual10 = LessEqual[10]
type DivisibleBy10 = Divisible[10]
type NonDivisibleBy10 = NonDivisible[10]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package zio.config.magnolia

import zio.ConfigProvider
import zio.config._
import zio.config.derivation.{ name => derivedName }
import zio.config.derivation.{name => derivedName}
import zio.test.Assertion._
import zio.test.{ZIOSpecDefault, _}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ object TypesafeConfigSpec extends ZIOSpecDefault {
Employee("martha", None, Right("Medium"))
),
1000,
true,
boolean = true,
None
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ object YamlConfigSpec extends ZIOSpecDefault {

val zio = provider.load(config)

val expected = Child(List(A("str", Nil), B(false, List(C(1), C(2)), Map("hi" -> 1, "bi" -> 2))))
val expected = Child(List(A("str", Nil), B(b = false, List(C(1), C(2)), Map("hi" -> 1, "bi" -> 2))))

assertZIO(zio.exit)(succeeds(equalTo(expected)))
},
Expand All @@ -61,8 +61,8 @@ object YamlConfigSpec extends ZIOSpecDefault {
val configDataBaseConfig: Config[DataBaseConfig] = Config.string("url").to[DataBaseConfig]

val yamlConfig: String = s"""url: "some_url""""
val result = read(configDataBaseConfig from ConfigProvider.fromYamlStringZIO(yamlConfig))
val expected = DataBaseConfig("some_url")
val result = read(configDataBaseConfig from ConfigProvider.fromYamlStringZIO(yamlConfig))
val expected = DataBaseConfig("some_url")
assertZIO(result)(equalTo(expected))
}
)
Expand Down
Loading