Upgrade to java 1.8, sbt 0.13.9

Author: mrerrormessage

.gitignore

@@ -3,3 +3,6 @@
 /array.jar
 /array.jar.pack.gz
 /array.zip
+/target
+/project/target
+/project/project

Makefile

@@ -8,7 +8,9 @@ This extension is pre-installed in NetLogo. For instructions on using it, or for
 
 ## Building
 
-Run `make`.
+Use the netlogo.jar.url environment variable to tell sbt which NetLogo.jar to compile against (defaults to NetLogo 5.3). For example:
+
+    sbt -Dnetlogo.jar.url=file:///path/to/NetLogo/target/NetLogo.jar package
 
 If compilation succeeds, `array.jar` will be created.
 

README.md

@@ -0,0 +1,35 @@
+enablePlugins(org.nlogo.build.NetLogoExtension)
+
+javaSource in Compile <<= baseDirectory(_ / "src")
+
+name := "array"
+
+netLogoClassManager := "org.nlogo.extensions.array.ArrayExtension"
+
+javacOptions ++= Seq("-g", "-deprecation", "-Xlint:all", "-Xlint:-serial", "-Xlint:-path",
+  "-encoding", "us-ascii")
+
+val netLogoJarURL =
+    Option(System.getProperty("netlogo.jar.url")).getOrElse("http://ccl.northwestern.edu/netlogo/5.3.0/NetLogo.jar")
+
+val netLogoJarOrDependency =
+  Option(System.getProperty("netlogo.jar.url"))
+    .orElse(Some("http://ccl.northwestern.edu/netlogo/5.3.0/NetLogo.jar"))
+    .map { url =>
+      import java.io.File
+      import java.net.URI
+      if (url.startsWith("file:"))
+        (Seq(new File(new URI(url))), Seq())
+      else
+        (Seq(), Seq("org.nlogo" % "NetLogo" % "5.3.0" from url))
+    }.get
+
+unmanagedJars in Compile ++= netLogoJarOrDependency._1
+
+libraryDependencies      ++= netLogoJarOrDependency._2
+
+packageBin in Compile := {
+  val jar = (packageBin in Compile).value
+  IO.copyFile(jar, baseDirectory.value / jar.getName)
+  jar
+}

build.sbt

@@ -0,0 +1 @@
+sbt.version=0.13.9

manifest.txt

@@ -0,0 +1,2 @@
+addSbtPlugin("org.nlogo" % "netlogo-extension-plugin" % "2.2_5.3.x-M2" from
+  "https://github.com/NetLogo/NetLogo-Extension-Plugin/releases/download/v2.2_5.3-M2/netlogo-extension-plugin-2.2_5.3.x.jar")

project/build.properties

@@ -67,7 +67,7 @@ public String dump(boolean readable, boolean exporting, boolean reference) {
       }
       if (!(reference && exporting)) {
         boolean first = true;
-        for (Iterator it = iterator(); it.hasNext();) {
+        for (Iterator<Object> it = iterator(); it.hasNext();) {
           if (!first) {
             buf.append(" ");
           }
@@ -98,8 +98,8 @@ public boolean recursivelyEqual(Object o) {
       if (size() != otherArray.size()) {
         return false;
       }
-      Iterator iter1 = iterator();
-      Iterator iter2 = otherArray.iterator();
+      Iterator<Object> iter1 = iterator();
+      Iterator<Object> iter2 = otherArray.iterator();
       while (iter1.hasNext()) {
         if (!org.nlogo.api.Equality.equals
             (iter1.next(), iter2.next())) {