Skip to content

Commit

Permalink
Move everything to the io.circe.config package (#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas committed Aug 22, 2017
1 parent 4f3f059 commit 8e74928
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 24 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release notes

## master

- circe-config is now part of the [circe](https://github.com/circe) GitHub
organization.
- Move everything under the `io.config.config` package.

## 0.2.1

- Update circe to version 0.8.0.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ libraryDependencies += "io.github.jonas" %% "circe-config" % "0.2.1"
```scala
scala> import com.typesafe.config.{ ConfigFactory, ConfigMemorySize }
scala> import io.circe.generic.auto._
scala> import io.github.jonas.circe.config.syntax._
scala> import io.circe.config.syntax._
scala> import scala.concurrent.duration.FiniteDuration

scala> case class ServerSettings(host: String, port: Int, timeout: FiniteDuration, maxUpload: ConfigMemorySize)
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name := "circe-config"
organization := "io.github.jonas"
organization := "io.circe"
description := "Yet another Typesafe Config decoder"
homepage := Some(url("https://github.com/jonas/circe-config"))
homepage := Some(url("https://github.com/circe/circe-config"))
licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")
apiURL := Some(url("https://jonas.github.io/circe-config/api/"))
apiURL := Some(url("https://circe.github.io/circe-config/api/"))

crossScalaVersions := Seq("2.11.11", "2.12.3")
scalaVersion := crossScalaVersions.value.last
Expand Down Expand Up @@ -87,8 +87,8 @@ scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value

scmInfo := Some(
ScmInfo(
url("https://github.com/jonas/circe-config"),
"scm:git:git@github.com:jonas/circe-config.git"
url("https://github.com/circe/circe-config"),
"scm:git:git@github.com:circe/circe-config.git"
)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.jonas.circe
package io.circe

import io.circe._
import com.typesafe.config._
import scala.collection.JavaConverters._

Expand All @@ -27,7 +26,7 @@ import scala.collection.JavaConverters._
* {{{
* scala> import com.typesafe.config.ConfigFactory
* scala> import io.circe.generic.auto._
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
*
* scala> case class ServerSettings(host: String, port: Int, ssl: Option[String])
* scala> case class HttpSettings(server: ServerSettings, version: Double)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.jonas.circe.config
package io.circe
package config

import cats.data.ValidatedNel
import cats.syntax.either._
import io.circe._
import java.io.File
import scala.collection.JavaConverters._
import com.typesafe.config._
Expand All @@ -30,7 +30,7 @@ import com.typesafe.config._
* @example
* {{{
* scala> import com.typesafe.config.ConfigFactory
* scala> import io.github.jonas.circe.config.parser
* scala> import io.circe.config.parser
* scala> val config = ConfigFactory.parseString("server { host = localhost, port = 8080 }")
*
* scala> val json: Either[io.circe.ParsingFailure, io.circe.Json] = parser.parse(config)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.jonas.circe.config
package io.circe
package config

import io.circe._
import com.typesafe.config._

/**
Expand All @@ -24,7 +24,7 @@ import com.typesafe.config._
* @example
* {{{
* scala> import io.circe.Json
* scala> import io.github.jonas.circe.config.printer
* scala> import io.circe.config.printer
*
* scala> val options = printer.DefaultOptions.setFormatted(false)
* scala> val json = Json.obj("server" -> Json.obj("host" -> Json.fromString("localhost"), "port" -> Json.fromInt(8080)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.jonas.circe.config
package io.circe
package config

import com.typesafe.config._
import io.circe._
import cats.syntax.either._
import scala.concurrent.duration._

Expand All @@ -31,7 +31,7 @@ import scala.concurrent.duration._
* @example
* {{{
* scala> import io.circe.generic.auto._
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
* scala> import scala.concurrent.duration.FiniteDuration
* scala> case class ServerSettings(port: Int, host: String, timeout: FiniteDuration)
* scala> val config = com.typesafe.config.ConfigFactory.parseString("port = 7357, host = localhost, timeout = 5 s")
Expand All @@ -47,7 +47,7 @@ object syntax {
* @example
* {{{
* scala> import io.circe.Json
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
* scala> import scala.concurrent.duration.FiniteDuration
*
* scala> durationDecoder.decodeJson(Json.fromString("5 seconds"))
Expand Down Expand Up @@ -75,7 +75,7 @@ object syntax {
* @example
* {{{
* scala> import io.circe.Json
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
* scala> import com.typesafe.config.ConfigMemorySize
*
* scala> memorySizeDecoder.decodeJson(Json.fromString("128M"))
Expand Down Expand Up @@ -103,7 +103,7 @@ object syntax {
* {{{
* scala> import io.circe.Json
* scala> import com.typesafe.config.ConfigValue
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
*
* scala> val hostJson = Json.fromString("localhost")
* scala> val portJson = Json.fromInt(8080)
Expand Down Expand Up @@ -135,7 +135,7 @@ object syntax {
* {{{
* scala> import io.circe.Json
* scala> import com.typesafe.config.Config
* scala> import io.github.jonas.circe.config.syntax._
* scala> import io.circe.config.syntax._
*
* scala> val hostJson = Json.fromString("localhost")
* scala> val portJson = Json.fromInt(8080)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.jonas.circe.config
package io.circe.config

import cats.instances.either._
import cats.laws._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.github.jonas.circe.config
package io.circe.config

import org.scalatest.{ FlatSpec, Matchers }
import com.typesafe.config._
Expand Down

0 comments on commit 8e74928

Please sign in to comment.