Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
classes
arduino.jar*
/project/project
/project/target
/arduino.jar*
/arduino.zip*
/jss*.jar
/target
Binary file removed arduino.zip
Binary file not shown.
36 changes: 36 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
scalaVersion := "2.11.7"

enablePlugins(org.nlogo.build.NetLogoExtension)

javaSource in Compile := baseDirectory.value / "src"

name := "arduino"

scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xlint", "-Xfatal-warnings",
"-encoding", "us-ascii")

javacOptions ++= Seq("-g", "-deprecation", "-Xlint:all", "-Xlint:-serial", "-Xlint:-path",
"-encoding", "us-ascii")

netLogoZipSources := false

val netLogoJarOrDependency =
Option(System.getProperty("netlogo.jar.url"))
.orElse(Some("http://ccl.northwestern.edu/devel/NetLogo-5.3-LevelSpace-3a6b9b4.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-SNAPSHOT" from url))
}.get

unmanagedJars in Compile ++= netLogoJarOrDependency._1

libraryDependencies ++= netLogoJarOrDependency._2

netLogoClassManager := "arduino.ArduinoExtension"

netLogoTarget :=
org.nlogo.build.NetLogoExtension.directoryTarget(baseDirectory.value)
File renamed without changes.
1 change: 1 addition & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=0.13.9
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
addSbtPlugin("org.nlogo" % "netlogo-extension-plugin" % "2.4_5.3-M1" from
"https://github.com/NetLogo/NetLogo-Extension-Plugin/releases/download/v2.4-M1_5.3.x/netlogo-extension-plugin-2.4-M1_5.3.x.jar")
5 changes: 2 additions & 3 deletions src/arduino/ArduinoExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,9 @@ public void unload( ExtensionManager em) {
field.setAccessible(true);
@SuppressWarnings("unchecked")
Vector<Object> libs = (Vector<Object>) (field.get(classLoader)) ;
for ( Object o : libs )
for ( Object o : libs )
{
java.lang.reflect.Method finalize = o.getClass().getDeclaredMethod( "finalize" , new Class[0] ) ;
java.lang.reflect.Method finalize = o.getClass().getDeclaredMethod( "finalize" , new Class<?>[0] ) ;
finalize.setAccessible( true ) ;
finalize.invoke( o , new Object[0] ) ;
}
Expand All @@ -288,6 +288,5 @@ public void unload( ExtensionManager em) {
System.err.println( e.getMessage() ) ;
}
}


}