Use 4.0.1 version of the swim backend

Update Copyright
swimos · Jul 26, 2022 · 1878bb7 · 1878bb7
1 parent 63868ec
commit 1878bb7
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ See [Ripple in action](http://www.swim.ai/showcase/ripple).
 
 ## Prerequisites
 
-* [Install JDK 9+](https://www.oracle.com/technetwork/java/javase/downloads/index.html).
+* [Install JDK 11+](https://www.oracle.com/technetwork/java/javase/downloads/index.html).
   * Ensure that your `JAVA_HOME` environment variable is pointed to your Java installation location.
   * Ensure that your `PATH` includes `$JAVA_HOME`.
 

diff --git a/server/build.gradle b/server/build.gradle
@@ -23,7 +23,7 @@ ext.compilerArgs = ['-Xlint:all']
 // Build with `gradle -Pno-modules` to force compatibility with legacy JVMs.
 def javaVersion = System.getProperty('java.version').split('\\.')
 ext.jvmVersion = (javaVersion[0] as Integer) > 1 ? javaVersion[0] as Integer : javaVersion[1] as Integer
-ext.useModules = jvmVersion >= 9 && !hasProperty('no-modules')
+ext.useModules = !hasProperty('no-modules')
 ext.moduleArgs = []
 
 repositories {
@@ -39,8 +39,8 @@ dependencies {
 afterEvaluate {
   configurations {
     apiElements {
-      sourceCompatibility = JavaVersion.VERSION_1_9
-      targetCompatibility = JavaVersion.VERSION_1_9
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
     }
   }
 
@@ -58,9 +58,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
@@ -78,8 +78,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*'
   }
 
@@ -88,7 +88,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,3 +1,17 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 open module swim.ripple {
   requires swim.recon;
   requires transitive swim.api;

diff --git a/server/src/main/java/swim/ripple/MirrorAgent.java b/server/src/main/java/swim/ripple/MirrorAgent.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/ripple/RipplePlane.java b/server/src/main/java/swim/ripple/RipplePlane.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/ChargeView.ts b/ui/main/ChargeView.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/MirrorView.ts b/ui/main/MirrorView.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/MirrorViewController.ts b/ui/main/MirrorViewController.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/MirrorViewObserver.ts b/ui/main/MirrorViewObserver.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/SwimMirrorViewController.ts b/ui/main/SwimMirrorViewController.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/package.json b/ui/package.json
@@ -4,7 +4,7 @@
   "description": "Swim Ripple Web UI",
   "homepage": "https://github.com/swimos/ripple",
   "author": "Chris Sachs <chris@swim.ai>",
-  "copyright": "2015-2019 SWIM.AI inc.",
+  "copyright": "2015-2022 Swim.inc",
   "license": "Apache-2.0",
   "repository": "https://github.com/swimos/ripple.git",
   "main": "dist/main/swim-ripple.js",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		application.version=3.11.0
		application.version=4.0.1