Merge pull request deeplearning4j#84 from izhangzhihao/RemoveGitSubMo…

…dule Drop submodule RAII.scala in favor of libraryDepenencies (close deeplearning4j#60)
nightscape · May 10, 2017 · d166617 · d166617
2 parents e0a856c + 18a1ddd
commit d166617
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Lift/build.sbt b/Lift/build.sbt
@@ -1,2 +1,3 @@
 libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.2"
+libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "1.0.0-M3"
 addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)
diff --git a/RAII.scala b/RAII.scala
diff --git a/Tape/build.sbt b/Tape/build.sbt
@@ -1 +1,2 @@
 libraryDependencies += "org.scalaz" %% "scalaz-concurrent" % "7.2.11"
+libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "1.0.0-M3"
diff --git a/build.sbt b/build.sbt
@@ -1,8 +1,8 @@
 parallelExecution in Global := false
 
-lazy val Tape = project.dependsOn(logs, ProjectRef(file("RAII.scala"), "asynchronous"))
+lazy val Tape = project.dependsOn(logs)
 
-lazy val tapefactories = project.dependsOn(Tape, ProjectRef(file("RAII.scala"), "asynchronous"), Caller)
+lazy val tapefactories = project.dependsOn(Tape, Caller)
 
 lazy val Caller = project
 
@@ -37,11 +37,11 @@ lazy val `differentiable-Double` = project
     }
   }.taskValue)
 
-lazy val Lift = project.dependsOn(Tape, ProjectRef(file("RAII.scala"), "asynchronous"))
+lazy val Lift = project.dependsOn(Tape)
 
 lazy val math = project.dependsOn(Lift)
 
-lazy val `differentiable-Any` = project.dependsOn(Tape, ProjectRef(file("RAII.scala"), "asynchronous"))
+lazy val `differentiable-Any` = project.dependsOn(Tape)
 
 lazy val logs = project.dependsOn(Caller)
 

diff --git a/differentiable-Any/build.sbt b/differentiable-Any/build.sbt
@@ -1 +1,2 @@
-libraryDependencies += "org.scalaz" %% "scalaz-effect" % "7.2.11"
+libraryDependencies += "org.scalaz" %% "scalaz-effect" % "7.2.11"
+libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "1.0.0-M3"
diff --git a/tapefactories/build.sbt b/tapefactories/build.sbt
@@ -1,2 +1,3 @@
 scalacOptions += "-Xexperimental"
-addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3")
+addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3")
+libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "1.0.0-M3"