Use 4.0.1 version of the swim backend

Update Copyright
swimos · Jul 26, 2022 · b1544b4 · b1544b4
1 parent dd8de72
commit b1544b4
Show file tree

Hide file tree

Showing 34 changed files with 55 additions and 55 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -22,8 +22,8 @@ ext.compilerArgs = ['-Xlint:all']
 
 // Build with `gradle -Pno-modules` to force compatibility with legacy JVMs.
 def javaVersion = System.getProperty('java.version').split('\\.')
-ext.jvmVersion = 9//(javaVersion[0] as Integer) > 1 ? javaVersion[0] as Integer : javaVersion[1] as Integer
-ext.useModules = jvmVersion >= 9 && !hasProperty('no-modules')
+ext.jvmVersion = 11
+ext.useModules = !hasProperty('no-modules')
 ext.moduleArgs = []
 
 repositories {
@@ -40,8 +40,8 @@ dependencies {
 afterEvaluate {
   configurations {
     apiElements {
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
     }
   }
 
@@ -59,9 +59,9 @@ afterEvaluate {
       options.encoding = 'UTF-8'
       classpath = files()
       source = sourceSets.main.allJava
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
-      destinationDir = compileJava.destinationDir
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
+      destinationDirectory = compileJava.destinationDirectory
       include '*module-info*'
     }
     classes.dependsOn compileModuleInfoJava
@@ -79,8 +79,8 @@ afterEvaluate {
   compileJava {
     options.compilerArgs += compilerArgs
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_9
-    targetCompatibility = JavaVersion.VERSION_1_9
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     exclude '*module-info*'
   }
 
@@ -89,7 +89,7 @@ afterEvaluate {
     manifest {
       attributes(
         'Implementation-Title': moduleName,
-        'Implementation-Version': version,
+        'Implementation-Version': archiveVersion,
         'Main-Class': mainClassName)
     }
   }

diff --git a/server/gradle.properties b/server/gradle.properties
@@ -1 +1 @@
-application.version=3.11.0
+application.version=4.0.1
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/NextBusHttpAPI.java b/server/src/main/java/swim/transit/NextBusHttpAPI.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
-import swim.api.ref.SwimRef;
+import swim.api.ref.WarpRef;
 import swim.codec.Utf8;
 import swim.structure.Form;
 import swim.structure.Item;
@@ -37,25 +37,25 @@ public class NextBusHttpAPI {
 
   private NextBusHttpAPI() { }
 
-  public static void sendRoutes(List<Agency> agencies, SwimRef swim) {
+  public static void sendRoutes(List<Agency> agencies, WarpRef warp) {
     for (Agency agency: agencies) {
-      sendRoutes(agency, swim);
+      sendRoutes(agency, warp);
     }
   }
 
-  public static void sendVehicleInfo(String pollUrl, Agency ag, SwimRef swim) {
+  public static void sendVehicleInfo(String pollUrl, Agency ag, WarpRef warp) {
     final Vehicles vehicles = getVehicleLocations(pollUrl, ag);
     if (vehicles != null && vehicles.getVehicles().size() > 0) {
       final Value value = Form.forClass(Vehicles.class).mold(vehicles).toValue();
-      swim.command(ag.getUri(), "addVehicles", value);
+      warp.command(ag.getUri(), "addVehicles", value);
     }
   }
 
-  private static void sendRoutes(Agency agency, SwimRef swim) {
+  private static void sendRoutes(Agency agency, WarpRef warp) {
     final Routes routes = getRoutes(agency);
     if (routes != null && !routes.getRoutes().isEmpty()) {
       final Value value = Form.forClass(Routes.class).mold(routes).toValue();
-      swim.command(agency.getUri(), "addRoutes", value);
+      warp.command(agency.getUri(), "addRoutes", value);
     }
   }
 
@@ -157,7 +157,7 @@ private static Value parse(URL url) {
       urlConnection = (HttpURLConnection) url.openConnection();
       urlConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
       final InputStream stream = new GZIPInputStream(urlConnection.getInputStream());
-      final Value configValue = Utf8.read(Xml.structureParser().documentParser(), stream);
+      final Value configValue = Utf8.read(stream, Xml.structureParser().documentParser());
       return configValue;
     } catch (Throwable e) {
       e.printStackTrace();

diff --git a/server/src/main/java/swim/transit/TransitPlane.java b/server/src/main/java/swim/transit/TransitPlane.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 import swim.api.SwimRoute;
 import swim.api.agent.AgentRoute;
 import swim.api.plane.AbstractPlane;
-import swim.api.ref.SwimRef;
+import swim.api.ref.WarpRef;
 import swim.api.space.Space;
 import swim.kernel.Kernel;
 import swim.server.ServerLoader;
@@ -62,17 +62,17 @@ public static void main(String[] args) {
     kernel.run(); // blocks until termination
   }
 
-  private static void startAgencies(SwimRef swim) {
+  private static void startAgencies(WarpRef warp) {
     final List<Agency> agencies = loadAgencies();
     for (Agency agency : agencies) {
-      swim.command(agency.getUri(), "addInfo", agency.toValue());
+      warp.command(agency.getUri(), "addInfo", agency.toValue());
     }
     try {
       Thread.sleep(3000);
     } catch (InterruptedException e) {
 
     }
-    NextBusHttpAPI.sendRoutes(agencies, swim);
+    NextBusHttpAPI.sendRoutes(agencies, warp);
   }
 
   private static List<Agency> loadAgencies() {

diff --git a/server/src/main/java/swim/transit/agent/AgencyAgent.java b/server/src/main/java/swim/transit/agent/AgencyAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/agent/CountryAgent.java b/server/src/main/java/swim/transit/agent/CountryAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/agent/StateAgent.java b/server/src/main/java/swim/transit/agent/StateAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/agent/VehicleAgent.java b/server/src/main/java/swim/transit/agent/VehicleAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/Agency.java b/server/src/main/java/swim/transit/model/Agency.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/BoundingBox.java b/server/src/main/java/swim/transit/model/BoundingBox.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/Route.java b/server/src/main/java/swim/transit/model/Route.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/Routes.java b/server/src/main/java/swim/transit/model/Routes.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/Vehicle.java b/server/src/main/java/swim/transit/model/Vehicle.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/server/src/main/java/swim/transit/model/Vehicles.java b/server/src/main/java/swim/transit/model/Vehicles.java
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/TransitViewController.ts b/ui/main/TransitViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/index.ts b/ui/main/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/Kpi1ViewController.ts b/ui/main/kpi/Kpi1ViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/Kpi2ViewController.ts b/ui/main/kpi/Kpi2ViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/Kpi3ViewController.ts b/ui/main/kpi/Kpi3ViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/KpiViewController.ts b/ui/main/kpi/KpiViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/kpi/index.ts b/ui/main/kpi/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/AgencyMapView.ts b/ui/main/map/AgencyMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/AgencyMapViewController.ts b/ui/main/map/AgencyMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/AgencyModel.ts b/ui/main/map/AgencyModel.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/AgencyPopoverViewController.ts b/ui/main/map/AgencyPopoverViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/TransitMapView.ts b/ui/main/map/TransitMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/TransitMapViewController.ts b/ui/main/map/TransitMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/VehicleMapView.ts b/ui/main/map/VehicleMapView.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/VehicleMapViewController.ts b/ui/main/map/VehicleMapViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/VehicleModel.ts b/ui/main/map/VehicleModel.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/VehiclePopoverViewController.ts b/ui/main/map/VehiclePopoverViewController.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/main/map/index.ts b/ui/main/map/index.ts
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 SWIM.AI inc.
+// Copyright 2015-2022 Swim.inc
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/ui/package.json b/ui/package.json
@@ -4,7 +4,7 @@
   "description": "Swim Transit Web UI",
   "homepage": "https://github.com/swimos/transit",
   "author": "Chris Sachs <[email protected]>",
-  "copyright": "2015-2019 SWIM.AI inc.",
+  "copyright": "2015-2022 Swim.inc",
   "license": "Apache-2.0",
   "repository": "https://github.com/swimos/transit.git",
   "private": true,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		application.version=3.11.0
		application.version=4.0.1