Removes the IDL core Dependency (#254)

* Removes the idl core dep from the project plugin * Fixes scripted tests
higherkindness · Apr 26, 2018 · 4c6331a · 4c6331a
1 parent 7101e7d
commit 4c6331a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/modules/idlgen/plugin/src/main/scala/IdlGenPlugin.scala b/modules/idlgen/plugin/src/main/scala/IdlGenPlugin.scala
@@ -207,7 +207,5 @@ object IdlGenPlugin extends AutoPlugin {
   }
 
   override def projectSettings: Seq[Def.Setting[_]] =
-    defaultSettings ++ taskSettings ++ packagingSettings ++ Seq(
-      libraryDependencies += "io.frees" %% "frees-rpc-idlgen-core" % freestyle.rpc.idlgen.BuildInfo.version
-    )
+    defaultSettings ++ taskSettings ++ packagingSettings
 }
diff --git a/modules/idlgen/plugin/src/sbt-test/sbt-frees-rpc-idlgen/srcGenFromDirs/build.sbt b/modules/idlgen/plugin/src/sbt-test/sbt-frees-rpc-idlgen/srcGenFromDirs/build.sbt
@@ -1,17 +1,18 @@
 lazy val root = project
   .in(file("."))
   .settings(name := "root")
-    .settings(version := "1.0.0")
-    .settings(Seq(
-      publishMavenStyle := true,
-      mappings in (Compile, packageBin) ~= { _.filter(!_._1.getName.endsWith(".class")) },
-      idlType := "avro",
-      srcGenSourceDirs := Seq((Compile / resourceDirectory).value / "domain",
-        (Compile / resourceDirectory).value / "protocol"),
-      srcGenTargetDir := (Compile / sourceManaged).value / "compiled_avro",
-      sourceGenerators in Compile += (Compile / srcGen).taskValue,
-      libraryDependencies ++= Seq(
-        "com.chuusai" %% "shapeless" % "2.3.2"
-      )
-    ))
-
+  .settings(version := "1.0.0")
+  .settings(Seq(
+    publishMavenStyle := true,
+    mappings in (Compile, packageBin) ~= { _.filter(!_._1.getName.endsWith(".class")) },
+    idlType := "avro",
+    srcGenSourceDirs := Seq(
+      (Compile / resourceDirectory).value / "domain",
+      (Compile / resourceDirectory).value / "protocol"),
+    srcGenTargetDir := (Compile / sourceManaged).value / "compiled_avro",
+    sourceGenerators in Compile += (Compile / srcGen).taskValue,
+    libraryDependencies ++= Seq(
+      "io.frees"    %% "frees-rpc-client-core" % sys.props("version"),
+      "com.chuusai" %% "shapeless"        % "2.3.2"
+    )
+  ))
diff --git a/modules/idlgen/plugin/src/sbt-test/sbt-frees-rpc-idlgen/srcGenFromJars/build.sbt b/modules/idlgen/plugin/src/sbt-test/sbt-frees-rpc-idlgen/srcGenFromJars/build.sbt
@@ -12,10 +12,11 @@ lazy val domain = project
     publishMavenStyle := true,
     mappings in (Compile, packageBin) ~= { _.filter(!_._1.getName.endsWith(".class")) },
     idlType := "avro",
-    srcGenSourceDir := (Compile / resourceDirectory).value,
+    srcGenSourceDirs := Seq((Compile / resourceDirectory).value),
     srcGenTargetDir := (Compile / sourceManaged).value / "compiled_avro",
     sourceGenerators in Compile += (Compile / srcGen).taskValue,
     libraryDependencies ++= Seq(
+      "io.frees"    %% "frees-rpc-client-core" % sys.props("version"),
       "com.chuusai" %% "shapeless" % "2.3.2"
     )
   ))