From 18a1ddd0e9e202563071920b03e1009456331d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E8=B1=AA?= Date: Wed, 10 May 2017 16:36:46 +0800 Subject: [PATCH] Drop submodule RAII.scala in favor of libraryDepenencies (close #60) --- .gitmodules | 3 --- Lift/build.sbt | 1 + RAII.scala | 1 - Tape/build.sbt | 1 + build.sbt | 8 ++++---- differentiable-Any/build.sbt | 3 ++- tapefactories/build.sbt | 3 ++- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 .gitmodules delete mode 160000 RAII.scala diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b7446627775..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "RAII.scala"] - path = RAII.scala - url = https://github.com/ThoughtWorksInc/RAII.scala.git diff --git a/Lift/build.sbt b/Lift/build.sbt index 280a6f0cfdb..84849189c5f 100644 --- 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 deleted file mode 160000 index a1670a15db0..00000000000 --- a/RAII.scala +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a1670a15db00101a6548bc320f575f5c61c84c50 diff --git a/Tape/build.sbt b/Tape/build.sbt index 7d149a2493a..65b9d38ee5d 100644 --- 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 index 4ef1df87fd2..3dc6f5d0f3f 100644 --- 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 index 98679f6e661..52641346874 100644 --- a/differentiable-Any/build.sbt +++ b/differentiable-Any/build.sbt @@ -1 +1,2 @@ -libraryDependencies += "org.scalaz" %% "scalaz-effect" % "7.2.11" \ No newline at end of file +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 index fe632d61e54..d3e47958a1f 100644 --- a/tapefactories/build.sbt +++ b/tapefactories/build.sbt @@ -1,2 +1,3 @@ scalacOptions += "-Xexperimental" -addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3") \ No newline at end of file +addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3") +libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "1.0.0-M3"