From 9aa54afcf25b720526cd8c660bcadcea3afff3c2 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 22 Apr 2020 15:04:14 +0300 Subject: [PATCH] Switch matlab master to JavaSE-11 gitlab simantics/platform#524 --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- .../META-INF/MANIFEST.MF | 2 +- org.simantics.matlablink/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 17 ++++++++++------- org.simantics.matlablink/META-INF/MANIFEST.MF | 2 +- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/org.simantics.matlablink.win32.x86_64/.classpath b/org.simantics.matlablink.win32.x86_64/.classpath index b862a29..ca3785c 100644 --- a/org.simantics.matlablink.win32.x86_64/.classpath +++ b/org.simantics.matlablink.win32.x86_64/.classpath @@ -1,6 +1,6 @@ - + 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 295926d..7adc0fb 100644 --- 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 -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.matlablink.win32.x86_64/META-INF/MANIFEST.MF b/org.simantics.matlablink.win32.x86_64/META-INF/MANIFEST.MF index 83b191a..88a6444 100644 --- 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-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.simantics.matlablink/.classpath b/org.simantics.matlablink/.classpath index 069739a..de253e8 100644 --- a/org.simantics.matlablink/.classpath +++ b/org.simantics.matlablink/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs b/org.simantics.matlablink/.settings/org.eclipse.jdt.core.prefs index 295926d..7adc0fb 100644 --- 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 -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.matlablink/META-INF/MANIFEST.MF b/org.simantics.matlablink/META-INF/MANIFEST.MF index d013e1c..8178b84 100644 --- 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-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit, org.eclipse.osgi, org.simantics.scl.runtime, -- 2.47.1