Merge pull request #161 from ThoughtWorksInc/optional

Atry · web-flow · commit 9a722279e566 · 2018-05-10T01:23:45.000+08:00
Set platform dependency as Optional instead of Test
diff --git a/OpenCL/build.sbt b/OpenCL/build.sbt
@@ -1,4 +1,4 @@
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
@@ -11,6 +11,8 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier
   }
 }
 
+libraryDependencies += "org.lwjgl" % "lwjgl" % "3.1.6"
+
 libraryDependencies += "org.lwjgl" % "lwjgl-opencl" % "3.1.6"
 
 libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "3.0.0-M11"
diff --git a/Tensors/build.sbt b/Tensors/build.sbt
@@ -4,7 +4,7 @@ libraryDependencies += "com.google.guava" % "guava" % "23.6-jre"
 
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % Test
 
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/cpu/build.sbt b/cpu/build.sbt
@@ -10,7 +10,7 @@ exampleSuperTypes := exampleSuperTypes.value.map {
 
 exampleSuperTypes += ctor"_root_.org.scalatest.Inside"
 
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"
diff --git a/gpu/build.sbt b/gpu/build.sbt
@@ -8,7 +8,7 @@ exampleSuperTypes := exampleSuperTypes.value.map {
     otherTrait
 }
 
-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {
+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {
   import scala.util.Properties._
   if (isMac) {
     "natives-macos"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {`
	`1`	`+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {`
`2`	`2`	`import scala.util.Properties._`
`3`	`3`	`if (isMac) {`
`4`	`4`	`"natives-macos"`
`@@ -11,6 +11,8 @@ libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
	`14`	`+libraryDependencies += "org.lwjgl" % "lwjgl" % "3.1.6"`
	`15`	`+`
`14`	`16`	`libraryDependencies += "org.lwjgl" % "lwjgl-opencl" % "3.1.6"`
`15`	`17`
`16`	`18`	`libraryDependencies += "com.thoughtworks.raii" %% "asynchronous" % "3.0.0-M11"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ exampleSuperTypes := exampleSuperTypes.value.map {`
`8`	`8`	`otherTrait`
`9`	`9`	`}`
`10`	`10`
`11`		`-libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Test).jar().classifier {`
	`11`	`+libraryDependencies += ("org.lwjgl" % "lwjgl" % "3.1.6" % Optional).jar().classifier {`
`12`	`12`	`import scala.util.Properties._`
`13`	`13`	`if (isMac) {`
`14`	`14`	`"natives-macos"`