Skip to content

Commit 574793a

Browse files
Update NetLogo extension plugin
1 parent 6d2bf7a commit 574793a

2 files changed

Lines changed: 17 additions & 24 deletions

File tree

build.sbt

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,23 @@ name := "array"
66

77
netLogoClassManager := "org.nlogo.extensions.array.ArrayExtension"
88

9+
netLogoTarget :=
10+
org.nlogo.build.NetLogoExtension.directoryTarget(baseDirectory.value)
11+
912
javacOptions ++= Seq("-g", "-deprecation", "-Xlint:all", "-Xlint:-serial", "-Xlint:-path",
1013
"-encoding", "us-ascii")
1114

1215
val netLogoJarURL =
13-
Option(System.getProperty("netlogo.jar.url")).getOrElse("http://ccl.northwestern.edu/netlogo/5.3.0/NetLogo.jar")
14-
15-
val netLogoJarOrDependency =
16-
Option(System.getProperty("netlogo.jar.url"))
17-
.orElse(Some("http://ccl.northwestern.edu/netlogo/5.3.0/NetLogo.jar"))
18-
.map { url =>
19-
import java.io.File
20-
import java.net.URI
21-
if (url.startsWith("file:"))
22-
(Seq(new File(new URI(url))), Seq())
23-
else
24-
(Seq(), Seq("org.nlogo" % "NetLogo" % "5.3.0" from url))
25-
}.get
26-
27-
unmanagedJars in Compile ++= netLogoJarOrDependency._1
28-
29-
libraryDependencies ++= netLogoJarOrDependency._2
30-
31-
packageBin in Compile := {
32-
val jar = (packageBin in Compile).value
33-
IO.copyFile(jar, baseDirectory.value / jar.getName)
34-
jar
16+
Option(System.getProperty("netlogo.jar.url")).getOrElse("http://ccl.northwestern.edu/netlogo/5.3.0/NetLogo.jar")
17+
18+
val netLogoJarOrDependency: Seq[Def.Setting[_]] = {
19+
import java.io.File
20+
import java.net.URI
21+
if (netLogoJarURL.startsWith("file:"))
22+
Seq(unmanagedJars in Compile += new File(new URI(netLogoJarURL)))
23+
else
24+
Seq(libraryDependencies += "org.nlogo" % "NetLogo" % "5.3.0" from netLogoJarURL)
3525
}
26+
27+
netLogoJarOrDependency
28+

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.nlogo" % "netlogo-extension-plugin" % "2.2_5.3.x-M2" from
2-
"https://github.com/NetLogo/NetLogo-Extension-Plugin/releases/download/v2.2_5.3-M2/netlogo-extension-plugin-2.2_5.3.x.jar")
1+
addSbtPlugin("org.nlogo" % "netlogo-extension-plugin" % "2.4_5.3-M1" from
2+
"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")

0 commit comments

Comments
 (0)