diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-29 18:40:29 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-29 18:40:29 +0000 |
commit | 46897927575bf25e8d2a1816b0e084bd3ceaf09f (patch) | |
tree | aad8af3c19d01a98b0e46a9435a1b9aec284d293 /src/jline/project | |
parent | 3adaa37cd2fc40deeb58ce9da9015f329d9c254e (diff) | |
download | scala-46897927575bf25e8d2a1816b0e084bd3ceaf09f.tar.gz scala-46897927575bf25e8d2a1816b0e084bd3ceaf09f.tar.bz2 scala-46897927575bf25e8d2a1816b0e084bd3ceaf09f.zip |
Updated jline build to use xsbt 0.9.9 and rebui...
Updated jline build to use xsbt 0.9.9 and rebuilt, no review.
Diffstat (limited to 'src/jline/project')
-rw-r--r-- | src/jline/project/build.properties | 8 | ||||
-rw-r--r-- | src/jline/project/build/JlineProject.scala | 35 | ||||
-rw-r--r-- | src/jline/project/plugins/Plugins.scala | 5 | ||||
-rw-r--r-- | src/jline/project/plugins/build.sbt | 5 | ||||
-rw-r--r-- | src/jline/project/plugins/project/build.properties | 3 |
5 files changed, 5 insertions, 51 deletions
diff --git a/src/jline/project/build.properties b/src/jline/project/build.properties deleted file mode 100644 index 0c2795bca5..0000000000 --- a/src/jline/project/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -#Project properties -#Wed Mar 23 21:05:24 PDT 2011 -project.organization=org.improving -project.name=jline -sbt.version=0.7.7 -project.version=0.99-SNAPSHOT -build.scala.versions=2.9.0 -project.initialize=false diff --git a/src/jline/project/build/JlineProject.scala b/src/jline/project/build/JlineProject.scala deleted file mode 100644 index ef1b30c008..0000000000 --- a/src/jline/project/build/JlineProject.scala +++ /dev/null @@ -1,35 +0,0 @@ -import sbt._ - -/** I'm sure much of this is done the hard way, but it's done! - */ -class JlineProject(info: ProjectInfo) extends DefaultProject(info) with ProguardProject { - val snapShots = "Snapshots" at "http://scala-tools.org/repo-snapshots/" - val jansi = "org.fusesource.jansi" % "jansi" % "1.4" - val junitInterface = "com.novocode" % "junit-interface" % "0.5" % "test->default" - - // val junit = "junit" % "junit" % "4.8.1" % "test" - // lazy val jansiPath = (managedDependencyPath / "compile" ** "jansi*").get.toList.head.absolutePath - - override def javaCompileOptions = super.javaCompileOptions ++ javaCompileOptions("-target", "1.5") - - override def makeInJarFilter(file: String) = { - if (!file.startsWith("jansi")) super.makeInJarFilter(file) - else List( - "!META-INF/MANIFEST.MF", - "org/fusesource/hawtjni/runtime", - "org/fusesource/hawtjni/runtime/Callback.class", - "org/fusesource/hawtjni/runtime/Library.class", - "!org/fusesource/hawtjni/**", - "!META-INF/maven/org.fusesource.hawtjni", - "!META-INF/maven/org.fusesource.jansi", - "!META-INF/maven/org.fusesource.hawtjni/**", - "!META-INF/maven/org.fusesource.jansi/**" - ) mkString ", " - } - - override def proguardOptions = List( - "-dontshrink", - "-keep class *", - "-keepdirectories" - ) -} diff --git a/src/jline/project/plugins/Plugins.scala b/src/jline/project/plugins/Plugins.scala deleted file mode 100644 index 8c336f0abf..0000000000 --- a/src/jline/project/plugins/Plugins.scala +++ /dev/null @@ -1,5 +0,0 @@ -import sbt._ - -class Plugins(info: ProjectInfo) extends PluginDefinition(info) { - val proguard = "org.scala-tools.sbt" % "sbt-proguard-plugin" % "0.0.5" -} diff --git a/src/jline/project/plugins/build.sbt b/src/jline/project/plugins/build.sbt new file mode 100644 index 0000000000..0e0f27b1eb --- /dev/null +++ b/src/jline/project/plugins/build.sbt @@ -0,0 +1,5 @@ +resolvers += "Proguard plugin repo" at "http://siasia.github.com/maven2" + +libraryDependencies <<= (libraryDependencies, appConfiguration) { (deps, app) => + deps :+ "com.github.siasia" %% "xsbt-proguard-plugin" % app.provider.id.version +} diff --git a/src/jline/project/plugins/project/build.properties b/src/jline/project/plugins/project/build.properties deleted file mode 100644 index 7a06683cda..0000000000 --- a/src/jline/project/plugins/project/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Project properties -#Wed May 25 15:08:22 PDT 2011 -plugin.uptodate=true |