From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 22 Apr 2020 12:14:59 +0000 (+0300)
Subject: Switch r master to JavaSE-11
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;ds=inline;p=simantics%2Fr.git

Switch r master to JavaSE-11

gitlab simantics/platform#524
---

diff --git a/bundles/org.simantics.r.fileimport/.classpath b/bundles/org.simantics.r.fileimport/.classpath
index b862a29..ca3785c 100644
--- a/bundles/org.simantics.r.fileimport/.classpath
+++ b/bundles/org.simantics.r.fileimport/.classpath
@@ -1,6 +1,6 @@
 <?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.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"/>
diff --git a/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/bundles/org.simantics.r.fileimport/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.fileimport/.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/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF b/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
index 714ad72..3e00a94 100644
--- a/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.fileimport/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.simantics.r;bundle-version="0.1.0",
  org.simantics.db,
  org.simantics
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.simantics.r.ontology/.classpath b/bundles/org.simantics.r.ontology/.classpath
index b862a29..ca3785c 100644
--- a/bundles/org.simantics.r.ontology/.classpath
+++ b/bundles/org.simantics.r.ontology/.classpath
@@ -1,6 +1,6 @@
 <?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.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"/>
diff --git a/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/bundles/org.simantics.r.ontology/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.ontology/.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/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
index db09daf..9989653 100644
--- a/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.ontology/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: http://www.simantics.org/R
 Bundle-SymbolicName: org.simantics.r.ontology
 Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.layer0;bundle-version="1.1.0",
  org.simantics.simulation.ontology;bundle-version="1.1.0",
  org.simantics.selectionview.ontology;bundle-version="1.2.0",
diff --git a/bundles/org.simantics.r.scl/.classpath b/bundles/org.simantics.r.scl/.classpath
index b862a29..ca3785c 100644
--- a/bundles/org.simantics.r.scl/.classpath
+++ b/bundles/org.simantics.r.scl/.classpath
@@ -1,6 +1,6 @@
 <?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.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"/>
diff --git a/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
index 62b7e4d..10e1e29 100644
--- a/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r.scl/.settings/org.eclipse.jdt.core.prefs
@@ -6,8 +6,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 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.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +18,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +62,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +94,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF b/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
index 5676aa6..e2cb1db 100644
--- a/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r.scl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: RServe connectivity
 Bundle-SymbolicName: org.simantics.r.scl;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.scl.runtime;bundle-version="0.4.0",
  gnu.trove3;bundle-version="3.0.3",
  org.simantics.simulator.variable;bundle-version="1.0.0",
diff --git a/bundles/org.simantics.r/.classpath b/bundles/org.simantics.r/.classpath
index b862a29..ca3785c 100644
--- a/bundles/org.simantics.r/.classpath
+++ b/bundles/org.simantics.r/.classpath
@@ -1,6 +1,6 @@
 <?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.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"/>
diff --git a/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs
index 295926d..7adc0fb 100644
--- a/bundles/org.simantics.r/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.simantics.r/.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/bundles/org.simantics.r/META-INF/MANIFEST.MF b/bundles/org.simantics.r/META-INF/MANIFEST.MF
index 9d0c091..8f69b05 100644
--- a/bundles/org.simantics.r/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.r/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: R Variable for Simantics
 Bundle-SymbolicName: org.simantics.r;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.simantics.r.ontology;bundle-version="1.0.0",
  org.simantics.r.scl;bundle-version="0.0.1",
  org.simantics.scl.runtime;bundle-version="0.4.0",
diff --git a/releng/org.simantics.r.tycho.configuration/pom.xml b/releng/org.simantics.r.tycho.configuration/pom.xml
index 1af1b61..d7f36a8 100644
--- a/releng/org.simantics.r.tycho.configuration/pom.xml
+++ b/releng/org.simantics.r.tycho.configuration/pom.xml
@@ -8,8 +8,10 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<tycho.version>1.0.0</tycho.version>
-		<tycho.extras.version>1.0.0</tycho.extras.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<tycho.version>1.7.0</tycho.version>
+		<tycho.extras.version>1.7.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<branch-spec>master</branch-spec>
 		<simantics-download-site>http://www.simantics.org/download</simantics-download-site>