Permalink
Browse files

Rename module

Didn't like the sound of the former name
  • Loading branch information...
alexarchambault committed Jan 4, 2017
1 parent 906698e commit a4c246d906edfd79d22a6a1d3eb38cbbcbb69516
Showing with 30 additions and 30 deletions.
  1. +6 −6 build.sbt
  2. +0 −5 circe-alt-generic/shared/src/main/scala/io/circe/altgeneric/package.scala
  3. 0 {circe-alt-generic → circe-simple-generic}/README.md
  4. +1 −1 ... circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric}/derive/DerivedInstances.scala
  5. +1 −1 ... circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric}/derive/JsonProductCodec.scala
  6. +1 −1 ...ic → circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric}/derive/JsonSumCodec.scala
  7. +1 −1 ...neric → circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric}/derive/MkDecoder.scala
  8. +2 −2 ...neric → circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric}/derive/MkEncoder.scala
  9. +5 −0 circe-simple-generic/shared/src/main/scala/io/circe/simplegeneric/package.scala
  10. +1 −1 ...ltgeneric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/DefaultTests.scala
  11. +1 −1 ...altgeneric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/Definitions.scala
  12. +1 −1 ...neric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/LowPriorityTests.scala
  13. +1 −1 ...tgeneric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/PriorityTests.scala
  14. +1 −1 ...eric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/PriorityTestsDefn.scala
  15. +2 −2 ...ric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/ProductEncodeTests.scala
  16. +1 −1 ...generic → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/ShapelessTests.scala
  17. +1 −1 ...generic → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/SumEncodeTests.scala
  18. +1 −1 .../circe/altgeneric → circe-simple-generic/shared/src/test/scala/io/circe/simplegeneric}/Util.scala
  19. +2 −2 render/shared/src/main/scala/plotly/Codecs.scala
  20. +1 −1 tests/src/test/scala/plotly/doc/SchemaTests.scala
View
@@ -22,10 +22,10 @@ lazy val `joda-time` = project
)
)
lazy val `circe-alt-generic` = crossProject
lazy val `circe-simple-generic` = crossProject
.settings(commonSettings: _*)
.settings(
name := "circe-alt-generic",
name := "circe-simple-generic",
libraryDependencies ++= Seq(
"io.circe" %%% "circe-core" % circeVersion,
"io.circe" %%% "circe-parser" % circeVersion,
@@ -41,11 +41,11 @@ lazy val `circe-alt-generic` = crossProject
scalaJSUseRhino in Global := false
)
lazy val circeAltGenericJvm = `circe-alt-generic`.jvm
lazy val circeAltGenericJs = `circe-alt-generic`.js
lazy val circeSimpleGenericJvm = `circe-simple-generic`.jvm
lazy val circeSimpleGenericJs = `circe-simple-generic`.js
lazy val render = crossProject
.dependsOn(core, `circe-alt-generic`)
.dependsOn(core, `circe-simple-generic`)
.settings(commonSettings: _*)
.settings(
name := "plotly-render"
@@ -191,7 +191,7 @@ lazy val `jupyter-scala` = project
lazy val `plotly-scala` = project
.in(file("."))
.aggregate(coreJvm, coreJs, `joda-time`, circeAltGenericJvm, circeAltGenericJs, renderJvm, renderJs, demo, tests, `jupyter-scala`)
.aggregate(coreJvm, coreJs, `joda-time`, circeSimpleGenericJvm, circeSimpleGenericJs, renderJvm, renderJs, demo, tests, `jupyter-scala`)
.settings(commonSettings)
.settings(noPublishSettings)
@@ -1,5 +0,0 @@
package io.circe
import io.circe.altgeneric.derive.DerivedInstances
package object altgeneric extends DerivedInstances
File renamed without changes.
@@ -1,4 +1,4 @@
package io.circe.altgeneric.derive
package io.circe.simplegeneric.derive
import shapeless.{ LowPriority, Strict }
import io.circe.{ Decoder, Encoder }
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
package derive
import io.circe.{ ACursor, Decoder, HCursor, Json }
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
package derive
import io.circe._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
package derive
import shapeless._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
package derive
import io.circe.Encoder
@@ -178,4 +178,4 @@ object CoproductSumEncoder {
tailEncode0(r)
}
}
}
}
@@ -0,0 +1,5 @@
package io.circe
import io.circe.simplegeneric.derive.DerivedInstances
package object simplegeneric extends DerivedInstances
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import io.circe.{ Decoder, Encoder, Json }
import utest._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import io.circe.Json
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import shapeless._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import io.circe.Decoder
import utest._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import io.circe.{Decoder, HCursor}
@@ -1,10 +1,10 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import utest._
import org.scalacheck.{ Arbitrary, Prop }
import org.scalacheck.Shapeless._
import shapeless._
import io.circe.altgeneric.derive.{ HListProductEncoder, JsonProductCodecFor, MkEncoder, ProductEncoder }
import io.circe.simplegeneric.derive.{ HListProductEncoder, JsonProductCodecFor, MkEncoder, ProductEncoder }
import io.circe.{ Encoder, Json, KeyEncoder }
import io.circe.syntax._
import Util._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import org.scalacheck.{ Arbitrary, Prop }
import shapeless.test.illTyped
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import utest._
import org.scalacheck.Shapeless._
@@ -1,4 +1,4 @@
package io.circe.altgeneric
package io.circe.simplegeneric
import org.scalacheck.{ Prop, Test }
import utest._
@@ -3,8 +3,8 @@ package plotly
import java.math.BigInteger
import io.circe.{ Error => _, _ }
import io.circe.altgeneric._
import io.circe.altgeneric.derive._
import io.circe.simplegeneric._
import io.circe.simplegeneric.derive._
import io.circe.syntax._
import shapeless._
@@ -7,7 +7,7 @@ import java.nio.file.Files
import org.scalatest.{ FlatSpec, Matchers }
import io.circe.{ Decoder, Json, parser => Parser }
import io.circe.altgeneric._
import io.circe.simplegeneric._
import io.circe.literal._
import shapeless.Witness

0 comments on commit a4c246d

Please sign in to comment.