Skip to content

Commit ae172a6

Browse files
authored
Merge pull request #3 from battermann/feature/refactorings
Feature/refactorings
2 parents 0793746 + c9268c0 commit ae172a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+468
-462
lines changed

build.sbt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
resolvers ++= Seq(
2+
Resolver.sonatypeRepo("releases"),
3+
Resolver.sonatypeRepo("snapshots")
4+
)
15

26
lazy val root = (project in file("."))
37
.settings(
@@ -11,11 +15,14 @@ lazy val root = (project in file("."))
1115
Resolver.sonatypeRepo("releases"),
1216
Resolver.sonatypeRepo("snapshots")
1317
),
14-
libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.2",
1518
libraryDependencies += compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
1619
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1",
1720
libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.0",
18-
libraryDependencies += "org.typelevel" %% "cats" % "0.9.0"
21+
libraryDependencies += "org.typelevel" %% "cats-core" % "1.0.0-MF",
22+
libraryDependencies ++= Seq(
23+
"com.chuusai" %% "shapeless" % "2.3.2",
24+
compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
25+
)
1926
)
2027

2128
lazy val mavenPublishingSettings: Seq[Def.Setting[_]] = Seq(
@@ -25,7 +32,7 @@ lazy val mavenPublishingSettings: Seq[Def.Setting[_]] = Seq(
2532
if (isSnapshot.value)
2633
Some("snapshots" at nexus + "content/repositories/snapshots")
2734
else
28-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
35+
Some("releases" at nexus + "service/local/staging/deploy/maven2")
2936
},
3037
licenses += ("MIT License", url("https://github.com/battermann/sbt-json/blob/master/LICENSE")),
3138
publishArtifact in Test := false,
@@ -38,6 +45,8 @@ lazy val mavenPublishingSettings: Seq[Def.Setting[_]] = Seq(
3845
)
3946
),
4047
developers := List(
41-
Developer(id="battermann", name="Leif Battermann", email="leifbattermann@gmail.com", url=url("https://github.com/battermann"))
48+
Developer(
49+
id = "battermann", name = "Leif Battermann", email = "leifbattermann@gmail.com",
50+
url = url("https://github.com/battermann"))
4251
)
4352
)

project/plugins.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
2-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
2+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
3+
addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")

src/main/scala/j2cgen/CaseClassGenerator.scala

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/main/scala/j2cgen/CaseClassNameGenerator.scala

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/scala/j2cgen/SchemaExtractor.scala

Lines changed: 0 additions & 125 deletions
This file was deleted.

src/main/scala/j2cgen/SchemaExtractorOptions.scala

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/scala/j2cgen/models/CaseClass.scala

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/scala/j2cgen/models/Interpreter.scala

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/scala/j2cgen/models/ScalaType.scala

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/scala/j2cgen/models/SchemaNameGenerator.scala

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)