From 3b590bc34c5dfad00f512632060d0176ee95d96b Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 22 Apr 2020 14:27:34 +0300
Subject: [PATCH] Switch to full JavaSE-11+ compatibility

---
 org.simantics.fmil.core/.classpath              | 14 +++++++-------
 .../.settings/org.eclipse.jdt.core.prefs        | 17 ++++++++++-------
 org.simantics.fmil.core/META-INF/MANIFEST.MF    |  2 +-
 org.simantics.fmil.linux64/.classpath           | 10 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs        | 17 ++++++++++-------
 org.simantics.fmil.linux64/META-INF/MANIFEST.MF |  2 +-
 org.simantics.fmil.win32/.classpath             | 10 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs        | 17 ++++++++++-------
 org.simantics.fmil.win32/META-INF/MANIFEST.MF   |  2 +-
 org.simantics.fmil.win64/.classpath             | 10 +++++-----
 .../.settings/org.eclipse.jdt.core.prefs        | 17 ++++++++++-------
 org.simantics.fmil.win64/META-INF/MANIFEST.MF   |  2 +-
 12 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/org.simantics.fmil.core/.classpath b/org.simantics.fmil.core/.classpath
index b862a29..e801ebf 100644
--- a/org.simantics.fmil.core/.classpath
+++ b/org.simantics.fmil.core/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.fmil.core/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmil.core/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/org.simantics.fmil.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmil.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.simantics.fmil.core/META-INF/MANIFEST.MF b/org.simantics.fmil.core/META-INF/MANIFEST.MF
index ba74f08..22ffe32 100644
--- a/org.simantics.fmil.core/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: FMI Library
 Bundle-SymbolicName: org.simantics.fmil.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.simantics.utils;bundle-version="1.1.0",
  org.slf4j.api,
diff --git a/org.simantics.fmil.linux64/.classpath b/org.simantics.fmil.linux64/.classpath
index bdaeff6..19ef143 100644
--- a/org.simantics.fmil.linux64/.classpath
+++ b/org.simantics.fmil.linux64/.classpath
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+</classpath>
diff --git a/org.simantics.fmil.linux64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmil.linux64/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/org.simantics.fmil.linux64/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmil.linux64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.simantics.fmil.linux64/META-INF/MANIFEST.MF b/org.simantics.fmil.linux64/META-INF/MANIFEST.MF
index 316f569..dce4fda 100644
--- a/org.simantics.fmil.linux64/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.linux64/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.simantics.fmil.linux64
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
 Fragment-Host: org.simantics.fmil.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
 Eclipse-BundleShape: dir
diff --git a/org.simantics.fmil.win32/.classpath b/org.simantics.fmil.win32/.classpath
index bdaeff6..19ef143 100644
--- a/org.simantics.fmil.win32/.classpath
+++ b/org.simantics.fmil.win32/.classpath
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+</classpath>
diff --git a/org.simantics.fmil.win32/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmil.win32/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/org.simantics.fmil.win32/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmil.win32/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.simantics.fmil.win32/META-INF/MANIFEST.MF b/org.simantics.fmil.win32/META-INF/MANIFEST.MF
index 4d71f7e..6208cd9 100644
--- a/org.simantics.fmil.win32/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.win32/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: FMI Library 32-bit Windows Fragment
 Bundle-SymbolicName: org.simantics.fmil.win32
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.simantics.fmil.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
 Bundle-Vendor: Semantum Oy
 Eclipse-BundleShape: dir
diff --git a/org.simantics.fmil.win64/.classpath b/org.simantics.fmil.win64/.classpath
index bdaeff6..19ef143 100644
--- a/org.simantics.fmil.win64/.classpath
+++ b/org.simantics.fmil.win64/.classpath
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+</classpath>
diff --git a/org.simantics.fmil.win64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmil.win64/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/org.simantics.fmil.win64/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.fmil.win64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.simantics.fmil.win64/META-INF/MANIFEST.MF b/org.simantics.fmil.win64/META-INF/MANIFEST.MF
index 884cbce..3c4d566 100644
--- a/org.simantics.fmil.win64/META-INF/MANIFEST.MF
+++ b/org.simantics.fmil.win64/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.simantics.fmil.win64
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Semantum Oy
 Fragment-Host: org.simantics.fmil.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
 Eclipse-BundleShape: dir
-- 
2.45.2