From b6c8f2b3da2a9a45ec0d07dccaf4b3da00c1c4c9 Mon Sep 17 00:00:00 2001 From: Thijs Broersen Date: Sat, 16 Nov 2024 15:54:29 +0100 Subject: [PATCH] fix mima and scalafix --- .scalafix.conf | 3 +- .scalafmt.conf | 17 ++--------- build.sbt | 28 ++++++------------- .../scala-3/zio/config/TupleConversion.scala | 2 +- .../scala/zio/config/IndexedFlatSpec.scala | 2 +- .../examples/ConfigSourceOrElseExample.scala | 2 +- .../zio/config/examples/StandardPattern.scala | 4 +-- .../AutoDerivationCustomKeys.scala | 1 + .../examples/refined/RefinedReadConfig.scala | 6 ++-- .../typesafe/SealedTraitListExample.scala | 12 +++++--- .../typesafe/TypesafeConfigList.scala | 3 +- .../zio/config/magnolia/DeriveConfig.scala | 24 +++++++--------- .../scala-3/zio/config/magnolia/Macros.scala | 3 +- .../examples/AutoDerivationSimple.scala | 16 ++++------- .../magnolia/examples/SampleConfig.scala | 2 +- .../scala-3/zio/config/magnolia/package.scala | 3 +- .../config/magnolia/AutomaticConfigSpec.scala | 13 +++++---- .../config/magnolia/DefaultValueSpec.scala | 7 ++--- .../zio/config/magnolia/MarkdownSpec.scala | 13 +++++---- project/plugins.sbt | 2 +- .../zio/config/magnolia/AnnotationsTest.scala | 2 +- .../TypesafeConfigProviderZIOTest.scala | 2 +- .../config/xml/experimental/XmlParser.scala | 4 +-- .../yaml/generators/WhiteSpacedXml.scala | 2 +- .../ParameterStoreConfigProvider.scala | 2 +- 25 files changed, 77 insertions(+), 98 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index b090394cd..19c0f9298 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -23,5 +23,6 @@ OrganizeImports { } RemoveUnused { - imports = false // handled by OrganizeImports + # handled by OrganizeImports + imports = false } diff --git a/.scalafmt.conf b/.scalafmt.conf index 65764a8b7..44739e1dc 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -3,7 +3,7 @@ runner.dialect = scala213 fileOverride { "glob:**/project/**" { - runner.dialect = scala213 + runner.dialect = scala3 } "glob:**/build.sbt" { runner.dialect = scala213 @@ -32,20 +32,9 @@ includeCurlyBraceInSelectChains = false danglingParentheses.preset = true optIn.annotationNewlines = true -rewrite.rules = [SortImports, RedundantBraces] +rewrite.rules = [RedundantBraces] + project.excludeFilters = [ "core/src/main/scala/zio/config/ProductBuilder.scala", "core/src/test/scala/zio/config/ProductBuilderTest.scala", ] - -fileOverride { - "glob:**/scala-dotty/**" { - runner.dialect = scala3 - } - "glob:**/scala-3.x/**" { - runner.dialect = scala3 - } - "glob:**/project/**" { - runner.dialect = scala3 - } -} diff --git a/build.sbt b/build.sbt index d18d57932..de8a2fcd6 100644 --- a/build.sbt +++ b/build.sbt @@ -56,7 +56,7 @@ lazy val zioConfig = projectMatrix .enablePlugins(BuildInfoPlugin) .settings(buildInfoSettings("zio.config")) .settings(macroDefinitionSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "dev.zio" %%% "zio" % Versions.zio, @@ -73,7 +73,7 @@ lazy val zioConfigAws = projectMatrix .in(file("aws")) .settings(stdSettings(Some("zio-config-aws"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "com.amazonaws" % "aws-java-sdk-ssm" % Versions.aws, @@ -89,7 +89,7 @@ lazy val zioConfigZioAws = projectMatrix .in(file("zio-aws")) .settings(stdSettings(Some("zio-config-zio-aws"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "dev.zio" %% "zio-aws-ssm" % Versions.zioAws, @@ -123,7 +123,7 @@ lazy val zioConfigPureconfig = projectMatrix .settings(stdSettings(Some("zio-config-pureconfig"))) .settings(crossProjectSettings) .settings( - enableMimaSettings ++ Seq( + enableMimaSettings() ++ Seq( checkMima / skip := true ) ) @@ -172,7 +172,7 @@ lazy val zioConfigDerivation = projectMatrix .in(file("derivation")) .settings(stdSettings(Some("zio-config-derivation"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .dependsOn(zioConfig) .jvmPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3), settings = jvmSettings) .jsPlatform(scalaVersions = Seq(Scala212, Scala213, Scala3), settings = jsSettings) @@ -182,7 +182,7 @@ lazy val zioConfigMagnolia = projectMatrix .in(file("magnolia")) .settings(stdSettings(Some("zio-config-magnolia"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( Dependencies.magnolia, scalacOptions ++= { @@ -205,7 +205,7 @@ lazy val zioConfigTypesafe = projectMatrix .in(file("typesafe")) .settings(stdSettings(Some("zio-config-typesafe"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.4.3", @@ -220,7 +220,7 @@ lazy val zioConfigYaml = projectMatrix .in(file("yaml")) .settings(stdSettings(Some("zio-config-yaml"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "org.snakeyaml" % "snakeyaml-engine" % "2.8", @@ -235,7 +235,7 @@ lazy val zioConfigXml = projectMatrix .in(file("xml")) .settings(stdSettings(Some("zio-config-xml"))) .settings(crossProjectSettings) - .settings(enableMimaSettings) + .settings(enableMimaSettings()) .settings( libraryDependencies ++= Seq( "dev.zio" %%% "zio-parser" % "0.1.10", @@ -342,13 +342,3 @@ lazy val docs = projectMatrix zioConfigMagnolia ) .enablePlugins(WebsitePlugin) - -val checkMima = taskKey[Unit]("Check mima") - -lazy val enableMimaSettings = - Def.settings( - checkMima := { if (isScalaJVM.value && !(checkMima / skip).value) mimaReportBinaryIssues.value else () }, - mimaFailOnProblem := true, - mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet, - mimaBinaryIssueFilters := Seq() - ) diff --git a/core/src/main/scala-3/zio/config/TupleConversion.scala b/core/src/main/scala-3/zio/config/TupleConversion.scala index f442b2a07..4bf10ed4e 100644 --- a/core/src/main/scala-3/zio/config/TupleConversion.scala +++ b/core/src/main/scala-3/zio/config/TupleConversion.scala @@ -1,6 +1,6 @@ package zio.config -import scala.deriving._ +import scala.deriving.* trait TupleConversion[A, B] { def to(a: A): B diff --git a/core/src/test/scala/zio/config/IndexedFlatSpec.scala b/core/src/test/scala/zio/config/IndexedFlatSpec.scala index b0a3f262c..6abb7a714 100644 --- a/core/src/test/scala/zio/config/IndexedFlatSpec.scala +++ b/core/src/test/scala/zio/config/IndexedFlatSpec.scala @@ -6,7 +6,7 @@ import zio.test._ object IndexedFlatSpec extends ZIOSpecDefault { - def spec = suite("IndexedFlatSpec") { + def spec: Spec[Environment & (TestEnvironment & Scope), Any] = suite("IndexedFlatSpec") { test("indexed sequence simple") { val configProvider = ConfigProvider.fromMap(Map("id[0]" -> "1", "id[1]" -> "2", "id[2]" -> "3")) val config = Config.listOf("id", Config.int) diff --git a/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala b/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala index 62f24c5ba..624f5d75d 100644 --- a/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala +++ b/examples/src/main/scala/zio/config/examples/ConfigSourceOrElseExample.scala @@ -86,7 +86,7 @@ object ConfigSourceOrElseExample extends App { } object Hi extends App { - val runner = + val runner: IO[Config.Error, Map[String, String]] = ConfigProvider .fromMap(Map("afsal.thaj" -> "damn")) .load(Config.table("afsal.thaj", Config.string)) diff --git a/examples/src/main/scala/zio/config/examples/StandardPattern.scala b/examples/src/main/scala/zio/config/examples/StandardPattern.scala index b24068d7b..cba0288c8 100644 --- a/examples/src/main/scala/zio/config/examples/StandardPattern.scala +++ b/examples/src/main/scala/zio/config/examples/StandardPattern.scala @@ -1,8 +1,8 @@ package zio.config.examples -import zio.{Config, Runtime, ZIO, ZLayer} import zio.config.magnolia.deriveConfig import zio.config.typesafe.TypesafeConfigProvider +import zio.{Config, ExitCode, Runtime, URIO, ZIO, ZLayer} object StandardPattern extends zio.ZIOAppDefault { @@ -21,7 +21,7 @@ object StandardPattern extends zio.ZIOAppDefault { .kebabCase ) - def run = ZIO + def run: URIO[Any, ExitCode] = ZIO .config(CombinedArrayValue.config) .debug("result") .exitCode diff --git a/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala index b82170589..52aecee10 100644 --- a/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala +++ b/examples/src/main/scala/zio/config/examples/autoderivation/AutoDerivationCustomKeys.scala @@ -5,6 +5,7 @@ import zio.config.examples.typesafe.EitherImpureOps import zio.config.magnolia.deriveConfig import zio.config.typesafe.TypesafeConfigProvider import zio.{Config, IO} + import examples._ object AutoDerivationCustomKeys extends App with EitherImpureOps { diff --git a/examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala b/examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala index df80124be..3e103b765 100644 --- a/examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala +++ b/examples/src/main/scala/zio/config/examples/refined/RefinedReadConfig.scala @@ -2,10 +2,10 @@ package zio.config.examples.refined import eu.timepit.refined.api.Refined import eu.timepit.refined.collection.NonEmpty -import zio.ConfigProvider import zio.config._ import zio.config.examples.ZioOps import zio.config.refined._ +import zio.{Config, ConfigProvider, IO} object RefinedReadConfig extends App { case class RefinedProd( @@ -13,7 +13,7 @@ object RefinedReadConfig extends App { dbUrl: Option[Refined[String, NonEmpty]] ) - def prodConfig = + def prodConfig: Config[RefinedProd] = ( refine[String, NonEmpty]("LDAP") zip refine[String, NonEmpty]("DB_URL").optional @@ -31,7 +31,7 @@ object RefinedReadConfig extends App { import zio.config.magnolia.deriveConfig - val prodConfigAutomatic = + val prodConfigAutomatic: IO[Config.Error, RefinedProd] = read( deriveConfig[RefinedProd].mapKey(toSnakeCase).mapKey(_.toUpperCase) from ConfigProvider.fromMap( configMap diff --git a/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala b/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala index 9fd3b26bb..a834a4681 100644 --- a/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala +++ b/examples/src/main/scala/zio/config/examples/typesafe/SealedTraitListExample.scala @@ -1,9 +1,12 @@ package zio.config.examples package typesafe -import zio.ConfigProvider +import zio.config._ import zio.config.derivation.discriminator -import zio.config._, typesafe._, magnolia._ +import zio.{Config, ConfigProvider, IO} + +import typesafe._ +import magnolia._ object SealedTraitListExample extends App { @@ -14,7 +17,7 @@ object SealedTraitListExample extends App { case class TransformationRules(transformations: List[DataTransformation]) - val transformations = + val transformations: String = s""" |transformations = [ | { @@ -28,7 +31,8 @@ object SealedTraitListExample extends App { | ] |""".stripMargin - val pgm = ConfigProvider.fromHoconString(transformations).load(deriveConfig[TransformationRules]) + val pgm: IO[Config.Error, TransformationRules] = + ConfigProvider.fromHoconString(transformations).load(deriveConfig[TransformationRules]) pgm equalM (TransformationRules( List(CastColumns(Map("col_C" -> "decimal(19,2)", "col_B" -> "double", "col_A" -> "string"))) diff --git a/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala index 6d01cb1a4..1d780aeff 100644 --- a/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala +++ b/examples/src/main/scala/zio/config/examples/typesafe/TypesafeConfigList.scala @@ -1,9 +1,10 @@ package zio.config.examples.typesafe +import zio.Runtime.default import zio.config._ import zio.{Config, ConfigProvider, IO, Unsafe} + import magnolia._ -import zio.Runtime.default object TypesafeConfigList extends App with EitherImpureOps { val configString: String = diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala b/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala index 9ce23bf4e..8a736ea72 100644 --- a/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala +++ b/magnolia/src/main/scala-3/zio/config/magnolia/DeriveConfig.scala @@ -1,21 +1,17 @@ package zio.config.magnolia -import zio.config._ -import zio.NonEmptyChunk +import zio.config.* +import zio.config.derivation.* +import zio.{Chunk, Config, LogLevel} -import java.io.File -import java.net.{URI, URL} -import java.time.{Duration, Instant, LocalDate, LocalDateTime, LocalTime, OffsetDateTime} +import java.net.URI +import java.time.{LocalDate, LocalDateTime, LocalTime, OffsetDateTime} import java.util.UUID -import scala.concurrent.duration.{Duration => ScalaDuration} -import scala.deriving._ import scala.compiletime.{constValue, constValueTuple, erasedValue, summonFrom, summonInline} -import scala.quoted -import scala.util.Try -import DeriveConfig._ -import zio.{Chunk, Config, ConfigProvider, LogLevel}, Config._ -import zio.config.syntax._ -import zio.config.derivation._ +import scala.deriving.* + +import DeriveConfig.* +import Config.* final case class DeriveConfig[A](desc: Config[A], metadata: Option[DeriveConfig.Metadata] = None) { def ??(description: String): DeriveConfig[A] = @@ -39,7 +35,7 @@ object DeriveConfig { def apply[A](implicit ev: DeriveConfig[A]): DeriveConfig[A] = ev - def from[A](desc: Config[A]) = + def from[A](desc: Config[A]): DeriveConfig[A] = DeriveConfig(desc, None) sealed trait Metadata { diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala b/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala index a176338d8..186abcb0a 100644 --- a/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala +++ b/magnolia/src/main/scala-3/zio/config/magnolia/Macros.scala @@ -1,7 +1,8 @@ package zio.config.magnolia +import zio.config.derivation.* + import scala.quoted.* -import zio.config.derivation._ object Macros: inline def nameOf[T]: List[name] = ${ anns[T, name]("zio.config.derivation.name") } diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala b/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala index 2adb61bd0..d5b4102c6 100644 --- a/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala +++ b/magnolia/src/main/scala-3/zio/config/magnolia/examples/AutoDerivationSimple.scala @@ -1,16 +1,12 @@ package zio.config.magnolia.examples -import zio.config.magnolia._ -import zio.{Config, ConfigProvider} -import zio.config.magnolia._ -import zio.config._ -import zio.Unsafe -import zio.IO -import zio.config.syntax._ +import zio.config.* +import zio.config.magnolia.* +import zio.{ConfigProvider, IO, Unsafe} object AutoDerivationSimple extends App: // Use of Either is almost prohibited by the looks of it - val sourceMap = + val sourceMap: Map[String, String] = Map( "a.b-c" -> "v1", "a.c-d" -> "C", @@ -25,7 +21,7 @@ object AutoDerivationSimple extends App: "a.y" -> "HmmAbc" ) - val source = + val source: ConfigProvider = ConfigProvider.fromMap( sourceMap, pathDelim = ".", @@ -35,7 +31,7 @@ object AutoDerivationSimple extends App: val io: IO[String, A] = source.load(deriveConfig[A].toKebabCase).mapError(_.prettyPrint()) - val readResult = Unsafe.unsafe { implicit u => + val readResult: A = Unsafe.unsafe { implicit u => zio.Runtime.default.unsafe.run(io).getOrThrowFiberFailure() } diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala b/magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala index f62ec0468..c5d613572 100644 --- a/magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala +++ b/magnolia/src/main/scala-3/zio/config/magnolia/examples/SampleConfig.scala @@ -1,6 +1,6 @@ package zio.config.magnolia.examples -import zio.config.magnolia._ +import zio.config.magnolia.* final case class A(a: B) diff --git a/magnolia/src/main/scala-3/zio/config/magnolia/package.scala b/magnolia/src/main/scala-3/zio/config/magnolia/package.scala index fdf61dbb5..42e5eabcb 100644 --- a/magnolia/src/main/scala-3/zio/config/magnolia/package.scala +++ b/magnolia/src/main/scala-3/zio/config/magnolia/package.scala @@ -1,7 +1,6 @@ package zio.config -import zio.{Config, ConfigProvider} -import zio.IO +import zio.{Config, ConfigProvider, IO} import scala.deriving.Mirror diff --git a/magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala index 3ba9ae24e..93f0e14bb 100644 --- a/magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala +++ b/magnolia/src/test/scala-3/zio/config/magnolia/AutomaticConfigSpec.scala @@ -1,17 +1,18 @@ package zio.config.magnolia -import zio.{Config, ConfigProvider} -import zio.config._ -import zio.test.Assertion._ -import zio.test._ +import zio.config.* +import zio.test.* +import zio.test.Assertion.* +import zio.{Config, ConfigProvider, Scope} import java.time.{Instant, LocalDate, LocalDateTime, LocalTime, ZoneOffset} import java.util.UUID -import AutomaticConfigTestUtils._ + +import AutomaticConfigTestUtils.* object AutomaticConfigSpec extends ZIOSpecDefault { - def spec = + def spec: Spec[Environment & (TestEnvironment & Scope), Any] = suite("magnolia spec")( test("automatic derivation spec") { check(genEnvironment) { environment => diff --git a/magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala index 0baa5704b..4cc53756d 100644 --- a/magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala +++ b/magnolia/src/test/scala-3/zio/config/magnolia/DefaultValueSpec.scala @@ -1,11 +1,10 @@ package zio.config.magnolia import zio.config.BaseSpec -import zio.Random import zio.test.Assertion.equalTo -import zio.test._ -import DefaultValueSpecUtils._ -import zio.config.magnolia.Macros +import zio.test.{Macros as _, *} + +import DefaultValueSpecUtils.* object DefaultValueSpec extends BaseSpec { val spec: Spec[TestConfig, Any] = diff --git a/magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala b/magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala index c2b2c370d..bda69bb95 100644 --- a/magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala +++ b/magnolia/src/test/scala-3/zio/config/magnolia/MarkdownSpec.scala @@ -1,14 +1,15 @@ package zio.config.magnolia -import zio.config._ -import zio.test.Assertion._ -import zio.test._ +import zio.config.* +import zio.test.* +import zio.test.Assertion.* +import zio.{Config, Scope} -import zio.Config, Config._ -import MarkdowSpecUtils._ +import Config.* +import MarkdowSpecUtils.* object MarkdownSpec extends BaseSpec { - val spec = suite("Markdown Spec")( + val spec: Spec[Environment & (TestEnvironment & Scope), Any] = suite("Markdown Spec")( test("toGithubFlavouredMarkdown works for a complex config") { val markdown = generateDocs(deriveConfig[RawConfig]).toTable.toGithubFlavouredMarkdown diff --git a/project/plugins.sbt b/project/plugins.sbt index 6ba6cb900..045798b60 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val zioSbtVersion = "0.0.0+524-5fdf568b-SNAPSHOT" +val zioSbtVersion = "0.0.0+526-a72bd851-SNAPSHOT" addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0") diff --git a/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala index bf4075ff7..7f49e3549 100644 --- a/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala +++ b/typesafe-magnolia-tests/src/test/scala/zio/config/magnolia/AnnotationsTest.scala @@ -3,7 +3,7 @@ package magnolia import zio.config.typesafe.TypesafeConfigProvider import zio.test.Assertion.equalTo -import zio.test.{assertZIO, Spec, ZIOSpecDefault} +import zio.test.{Spec, ZIOSpecDefault, assertZIO} import zio.{Config, IO} object AnnotationsTest extends ZIOSpecDefault { diff --git a/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala index c42edface..7fc3de970 100644 --- a/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala +++ b/typesafe-magnolia-tests/src/test/scala/zio/config/typesafe/TypesafeConfigProviderZIOTest.scala @@ -4,7 +4,7 @@ package typesafe import zio.Config import zio.config.magnolia.deriveConfig import zio.test.Assertion.equalTo -import zio.test.{assertZIO, Spec, ZIOSpecDefault} +import zio.test.{Spec, ZIOSpecDefault, assertZIO} object TypesafeConfigProviderZIOTest extends ZIOSpecDefault { diff --git a/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala b/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala index e2df2930f..53782d4ed 100644 --- a/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala +++ b/xml/src/main/scala/zio/config/xml/experimental/XmlParser.scala @@ -1,10 +1,10 @@ package zio.config.xml.experimental import zio.Chunk +import zio.parser.{Parser, StringParserError} + import Parsers._ import XmlObject.TagElement -import zio.parser.Parser -import zio.parser.StringParserError object XmlParser { diff --git a/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala index cfae7d92b..550e6ac03 100644 --- a/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala +++ b/xml/src/test/scala/zio/config/yaml/generators/WhiteSpacedXml.scala @@ -1,8 +1,8 @@ package zio.config.yaml.generators import zio.Chunk -import zio.config.xml.experimental.XmlObject.TagElement import zio.config.xml.experimental.XmlObject +import zio.config.xml.experimental.XmlObject.TagElement import zio.config.yaml.generators.WhiteSpacedXml.Children import zio.test.Gen diff --git a/zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala b/zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala index a50e494fe..67bad1077 100644 --- a/zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala +++ b/zio-aws/src/main/scala/zio/config/aws/parameterstore/ParameterStoreConfigProvider.scala @@ -34,7 +34,7 @@ object ParameterStoreConfigProvider { parameter.value.map { value => name.replaceFirst(str, "") -> value } - }.toOption + }.toChunk }.toMap } }