Fixed rest of tests

NetLogo · Feb 4, 2025 · 59cd7c7 · 59cd7c7
1 parent 656c85d
commit 59cd7c7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Sample Models/Social Science/Taxi Cabs.nlogox b/Sample Models/Social Science/Taxi Cabs.nlogox
@@ -1213,7 +1213,7 @@ Normal Distribution Parameters</note>
     <note x="1262" y="633" height="19" color="0.0" transparent="true" fontSize="15" width="150">CBD</note>
     <note x="1242" y="668" height="19" color="0.0" transparent="true" fontSize="15" width="150">Commercial</note>
     <note x="1244" y="700" height="19" color="0.0" transparent="true" fontSize="15" width="150">Commercial</note>
-    <note x="1243" y="734" height="19" color="0.0" transparent="true" fontSize="15" width="150">Commercial	</note>
+    <note x="1243" y="734" height="19" color="0.0" transparent="true" fontSize="15" width="150">Commercial</note>
     <note x="1247" y="772" height="19" color="0.0" transparent="true" fontSize="15" width="150">Residential</note>
     <note x="1248" y="803" height="19" color="0.0" transparent="true" fontSize="15" width="150">Residential</note>
     <note x="1247" y="835" height="19" color="0.0" transparent="true" fontSize="15" width="150">Residential</note>

diff --git a/Sample Models/System Dynamics/Unverified/Tabonuco Yagrumo.nlogox b/Sample Models/System Dynamics/Unverified/Tabonuco Yagrumo.nlogox
@@ -917,8 +917,8 @@ Commercial licenses are also available. To inquire about commercial licenses, pl
   </experiments>
   <systemDynamics dt="1.0">
     <stock name="gaps" allowNegative="false" x="435" y="33">;; since we don't know what order
-;; stocks are initialized in, we have 
-;; to explicitly maintain a unity 
+;; stocks are initialized in, we have
+;; to explicitly maintain a unity
 ;; between gaps/tabonuco/yagrumo
 0.6</stock>
     <stock name="tabonuco" allowNegative="false" x="46" y="345">;; if you change this, be sure to update

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 lazy val netLogoVersion = "7.0.0"
 
-scalaVersion := "2.12.12"
+scalaVersion := "2.12.18"
 
 scalacOptions ++= Seq("-feature", "-unchecked", "-deprecation")
 

diff --git a/src/main/scala/org/nlogo/models/Info.scala b/src/main/scala/org/nlogo/models/Info.scala
@@ -50,7 +50,7 @@ object InfoTabParts {
     val content = sections
       .map { case (title, text) => s"## $title\n\n$text" }
       .mkString("", "\n\n", "\n\n") +
-      legalSnippet.getOrElse("") + "\n"
+      legalSnippet.getOrElse("")
     InfoTabParts(content, sections, legalSnippet)
   }
 }

diff --git a/src/main/scala/org/nlogo/models/LegalInfo.scala b/src/main/scala/org/nlogo/models/LegalInfo.scala
@@ -87,7 +87,7 @@ case class LegalInfo(model: Model) {
     .dropWhile(_.startsWith(";"))
     .dropWhile(_.isEmpty)
     .reverse
-    .mkString("\n") + "\n\n\n" + codeCopyright + "\n"
+    .mkString("\n") + "\n\n\n" + codeCopyright
 
   def modelCitation: String = {
     val builder = new StringBuilder