From 81ae9ea8f0431f2aa0ed0f8bc9fb047b5af88ce8 Mon Sep 17 00:00:00 2001 From: mochizuki shinya Date: Mon, 10 Sep 2012 13:18:53 +0900 Subject: [PATCH] prevent other projects are broken by GlobalScope --- src/main/scala/PlainJavaProject.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/PlainJavaProject.scala b/src/main/scala/PlainJavaProject.scala index dd44cea..225e37a 100644 --- a/src/main/scala/PlainJavaProject.scala +++ b/src/main/scala/PlainJavaProject.scala @@ -6,12 +6,13 @@ import AndroidKeys._ object PlainJavaProject { lazy val settings: Seq[Setting[_]] = inConfig(Android) (Seq( useProguard := false, - autoScalaLibrary in GlobalScope := false, manifestPath <<= (baseDirectory, manifestName) map((s,m) => Seq(s / m)) map (x=>x), proguardOptimizations := Seq.empty, mainResPath <<= (baseDirectory, resDirectoryName) (_ / _) map (x=>x), mainAssetsPath <<= (baseDirectory, assetsDirectoryName) (_ / _), javaSource in Compile <<= (baseDirectory) (_ / "src") ) + ) ++ Seq( + autoScalaLibrary := false ) }