Migrated to sbt 1.x.x with cross building.

battermann · May 19, 2018 · 61cdc56 · 61cdc56
1 parent d0b034e
commit 61cdc56
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ lazy val root = (project in file("."))
   .settings(
     version in ThisBuild := "0.4.0",
     organization in ThisBuild := "com.github.battermann",
-    scalaVersion := "2.10.6",
+    crossSbtVersions := List("0.13.17", "1.1.5"),
     sbtPlugin := true,
     name := "sbt-json",
     mavenPublishingSettings,
@@ -19,11 +19,11 @@ lazy val root = (project in file("."))
     libraryDependencies += compilerPlugin(
       "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1",
-    libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.0",
-    libraryDependencies += "org.typelevel" %% "cats-core" % "1.0.0-MF",
-    libraryDependencies += "com.lihaoyi" % "pprint_2.10" % "0.5.3",
+    libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.7",
+    libraryDependencies += "org.typelevel" %% "cats-core" % "1.1.0",
+    libraryDependencies += "com.lihaoyi" %% "pprint" % "0.5.3",
     libraryDependencies ++= Seq(
-      "com.chuusai" %% "shapeless" % "2.3.2",
+      "com.chuusai" %% "shapeless" % "2.3.3",
       compilerPlugin(
         "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
     )

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.5
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,4 @@
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.1")
diff --git a/src/main/scala/json2caseclass/implementation/SchemaExtractor.scala b/src/main/scala/json2caseclass/implementation/SchemaExtractor.scala
@@ -11,6 +11,7 @@ import json2caseclass.model.Types.{
 }
 import json2caseclass.model._
 import play.api.libs.json._
+import scala.language.existentials
 
 object SchemaExtractor {
 

diff --git a/src/main/scala/json2caseclass/model/?.scala → ...a/json2caseclass/model/Questionmark.scala b/src/main/scala/json2caseclass/model/?.scala → ...a/json2caseclass/model/Questionmark.scala
@@ -6,5 +6,5 @@ import json2caseclass.model.Types.{ErrorOr, ErrorRWSOr}
 
 object ? {
   def <~[A](x: Either[CaseClassGenerationFailure, A]): ErrorRWSOr[A] =
-    ReaderWriterStateT.lift[ErrorOr, Environment, Unit, Int, A](x)
+    ReaderWriterStateT.liftF[ErrorOr, Environment, Unit, Int, A](x)
 }
diff --git a/src/main/scala/sbtjson/SbtJsonPlugin.scala b/src/main/scala/sbtjson/SbtJsonPlugin.scala
@@ -151,7 +151,7 @@ object SbtJsonPlugin extends AutoPlugin {
     packageNameForJsonModels := "jsonmodels",
     scalaSourceDir := sourceManaged.value / "compiled_json",
     printJsonModels := {
-
+      val sLog = streams.value.log
       val optionals = toOptionalsMap(jsonOptionals.value)
       val env = Config(
         jsValueFilter = jsValueFilter.value,
@@ -173,7 +173,7 @@ object SbtJsonPlugin extends AutoPlugin {
         )
       } yield fromFiles ++ fromUrls
 
-      result.fold(err => streams.value.log.error(mkMessage(err)), _.foreach(s => streams.value.log.info(s._2)))
+      result.fold(err => sLog.error(mkMessage(err)), _.foreach(s => sLog.info(s._2)))
     },
     generateJsonModels := {
 

diff --git a/test-project/build.sbt b/test-project/build.sbt
@@ -1,9 +1,9 @@
 enablePlugins(SbtJsonPlugin)
 name := "test-project"
-scalaVersion := "2.12.2"
+scalaVersion := "2.12.6"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1"
-libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.0"
+libraryDependencies += "com.typesafe.play" %% "play-json" % "2.6.7"
 // jsonUrls += "https://www.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=en-US"
 jsValueFilter := allJsValues.exceptNullValues.exceptEmptyArrays
 jsonInterpreter := plainCaseClasses.withPlayJsonFormats

diff --git a/test-project/project/build.properties b/test-project/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.5
diff --git a/test-project/project/plugins.sbt b/test-project/project/plugins.sbt
@@ -1,3 +1,3 @@
 lazy val root = Project("plugins", file(".")) dependsOn sbtJson
 
-lazy val sbtJson = file("..").getAbsoluteFile.toURI
+lazy val sbtJson = ClasspathDependency(RootProject(file("..").getAbsoluteFile.toURI), None)
diff --git a/...resources/json/strange-file$.,§"name.json → .../resources/json/strange-file$.,§name.json b/...resources/json/strange-file$.,§"name.json → .../resources/json/strange-file$.,§name.json