@@ -8,10 +8,10 @@ name := "scala-console"
88organization := " net.sf.ij-plugins"
99
1010// Current version
11- version := " 1.1.1 "
11+ version := " 1.1.2 "
1212
1313// Version of scala to use
14- crossScalaVersions := Seq (" 2.9 .3" , " 2.10 .3" )
14+ crossScalaVersions := Seq (" 2.10 .3" , " 2.9 .3" )
1515
1616scalaVersion <<= crossScalaVersions {versions => versions.head}
1717
@@ -30,20 +30,27 @@ libraryDependencies <+= scalaVersion { "org.scala-lang" % "scala-compiler" % _ }
3030libraryDependencies <+= scalaVersion { " org.scala-lang" % " scala-swing" % _ }
3131
3232// Test dependencies
33- libraryDependencies += " junit" % " junit" % " 4.11" % " test"
33+ libraryDependencies ++= Seq (
34+ " net.imagej" % " ij" % " 1.47v" ,
35+ " com.fifesoft" % " rsyntaxtextarea" % " 2.0.6" ,
36+ " junit" % " junit" % " 4.11" % " test"
37+ )
3438
3539//
3640// Use ScalaCL compiler plugin
3741//
38- resolvers += " Sonatype OSS Snapshots Repository" at " http://oss.sonatype.org/content/groups/public/"
42+ resolvers ++= Seq (
43+ " Sonatype OSS Snapshots Repository" at " http://oss.sonatype.org/content/groups/public/" ,
44+ " ImageJ Releases" at " http://maven.imagej.net/content/repositories/releases/"
45+ )
3946
40- resolvers += " NativeLibs4Java Repository" at " http://nativelibs4java.sourceforge.net/maven/"
47+ // resolvers += "NativeLibs4Java Repository" at "http://nativelibs4java.sourceforge.net/maven/"
4148
4249// libraryDependencies += "com.nativelibs4java" % "scalacl" % "0.2"
4350
44- autoCompilerPlugins := true
51+ // autoCompilerPlugins := true
4552
46- addCompilerPlugin(" com.nativelibs4java" % " scalacl-compiler-plugin" % " 0.2" )
53+ // addCompilerPlugin("com.nativelibs4java" % "scalacl-compiler-plugin" % "0.2")
4754
4855// fork a new JVM for 'run' and 'test:run'
4956fork := true
@@ -55,10 +62,12 @@ javaOptions += "-Xmx2G"
5562shellPrompt in ThisBuild := { state => " sbt:" + Project .extract(state).currentRef.project + " > " }
5663
5764// sbt-imagej plugin
58- imageJSettings
65+ ijSettings
5966
60- imageJRuntimeDir := " sandbox"
67+ ijRuntimeSubDir := " sandbox"
6168
62- imageJPluginsSubDir := " ij-plugins"
69+ ijPluginsSubDir := " ij-plugins"
6370
64- imageJExclusions += """ nativelibs4java\S*"""
71+ ijExclusions += """ nativelibs4java\S*"""
72+
73+ cleanFiles += ijPluginsDir.value
0 commit comments