Switch matlab master to JavaSE-11

gitlab simantics/platform#524

diff --git a/org.simantics.matlablink.win32.x86_64/.classpath b/org.simantics.matlablink.win32.x86_64/.classpath
index b862a296d38fe04269faeee6c9d77d11ff77380d..ca3785c4168d1473f960c28e5d73e53857b83013 100644 (file)
--- a/org.simantics.matlablink.win32.x86_64/.classpath
+++ b/org.simantics.matlablink.win32.x86_64/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r

-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r

        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r

diff --git a/org.simantics.matlablink.win32.x86_64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.matlablink.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.matlablink.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.matlablink.win32.x86_64/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+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.matlablink.win32.x86_64/META-INF/MANIFEST.MF b/org.simantics.matlablink.win32.x86_64/META-INF/MANIFEST.MF
index 83b191a758fa4dbe28f91c641f3b1a95864e2b5c..88a6444683cf0553523c37c1b126b26c41aa1546 100644 (file)
--- a/org.simantics.matlablink.win32.x86_64/META-INF/MANIFEST.MF
+++ b/org.simantics.matlablink.win32.x86_64/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@ Bundle-SymbolicName: org.simantics.matlablink.win32.x86_64
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VTT Technical Research Centre of Finland
 Fragment-Host: org.simantics.matlablink;bundle-version="1.0.0"
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VTT Technical Research Centre of Finland
 Fragment-Host: org.simantics.matlablink;bundle-version="1.0.0"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/org.simantics.matlablink/.classpath b/org.simantics.matlablink/.classpath
index 069739a58169f13cbea8308e8bf833abacf01b1b..de253e8576d1ba092cbf9cf4cb5fae312adc39fd 100644 (file)
--- a/org.simantics.matlablink/.classpath
+++ b/org.simantics.matlablink/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r

-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r

        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="test"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="src" path="test"/>\r

diff --git a/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs b/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs
index 295926d964165896ea8aa7c1b1b3c9d3d3caa77e..7adc0fb9a0d32bd6b4e3ce6f305ab7165208865c 100644 (file)
--- a/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs
+++ b/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
-org.eclipse.jdt.core.compiler.compliance=1.8\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.8\r
+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.matlablink/META-INF/MANIFEST.MF b/org.simantics.matlablink/META-INF/MANIFEST.MF
index d013e1c9523d84417ed2c831d8ae3eb83bfd8cc0..8178b84bf45f1f4ce3c033826835afe2a77004b4 100644 (file)
--- a/org.simantics.matlablink/META-INF/MANIFEST.MF
+++ b/org.simantics.matlablink/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Matlablink
 Bundle-SymbolicName: org.simantics.matlablink
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: Matlablink
 Bundle-SymbolicName: org.simantics.matlablink
 Bundle-Version: 1.0.0.qualifier

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11

 Require-Bundle: org.junit,
  org.eclipse.osgi,
  org.simantics.scl.runtime,
 Require-Bundle: org.junit,
  org.eclipse.osgi,
  org.simantics.scl.runtime,