From 5d61e6d98d54ceef4dcdbd674bd23ec12842beb7 Mon Sep 17 00:00:00 2001 From: Afsal Thaj Date: Fri, 27 Dec 2019 20:40:35 +1100 Subject: [PATCH] Fix build (#159) --- build.sbt | 15 +++++++-------- core/src/main/scala/zio/config/ConfigSource.scala | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index ccf22220a..8227f22b9 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ lazy val root = .aggregate(zioConfig, zioConfigMagnolia, examples, zioConfigRefined) lazy val zioConfig = - module("core") + module("zio-config", "core") .enablePlugins(BuildInfoPlugin) .settings(buildInfoSettings) .settings( @@ -72,7 +72,7 @@ lazy val zioConfig = ) lazy val zioConfigRefined = - module("refined") + module("zio-config-refined", "refined") .settings( libraryDependencies ++= Seq( @@ -84,7 +84,7 @@ lazy val zioConfigRefined = ) .dependsOn(zioConfig % "compile->compile;test->test") -lazy val examples = module("examples") +lazy val examples = module("zio-config-examples", "examples") .settings( skip in publish := true, fork := true, @@ -95,8 +95,7 @@ lazy val examples = module("examples") ) .dependsOn(zioConfig, zioConfigMagnolia, zioConfigRefined) -lazy val zioConfigMagnolia = module("magnolia") - .settings(skip in publish := true) +lazy val zioConfigMagnolia = module("zio-config-magnolia", "magnolia") .settings( libraryDependencies ++= Seq( "com.propensive" %% "magnolia" % magnoliaVersion @@ -104,9 +103,9 @@ lazy val zioConfigMagnolia = module("magnolia") ) .dependsOn(zioConfig) -def module(moduleName: String): Project = - Project(moduleName, file(moduleName)) - .settings(stdSettings("zio-config")) +def module(moduleName: String, fileName: String): Project = + Project(moduleName, file(fileName)) + .settings(stdSettings(moduleName)) .settings( libraryDependencies ++= Seq( "dev.zio" %% "zio" % zioVersion diff --git a/core/src/main/scala/zio/config/ConfigSource.scala b/core/src/main/scala/zio/config/ConfigSource.scala index a791e15fa..193c15961 100644 --- a/core/src/main/scala/zio/config/ConfigSource.scala +++ b/core/src/main/scala/zio/config/ConfigSource.scala @@ -49,7 +49,7 @@ object ConfigSource { (path: Vector[String]) => { val key = path.mkString(".") system - .env(key) + .property(key) .bimap(ReadError.FatalError(path, _), opt => opt.map(ConfigValue(_, SystemProperties))) .flatMap(IO.fromOption(_)) .mapError(_ => singleton(ReadError.MissingValue(path)))