Skip to content

Commit 763e1a1

Browse files
authored
chore: Change compliance to Java 11 (#76)
1 parent 89ce9ee commit 763e1a1

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

cmd/index.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ set randomPath=%TEMP%\%RANDOM%%RANDOM%
88
:Main
99

1010
java ^
11+
--add-modules=ALL-SYSTEM ^
1112
-Dlog.level=ALL ^
1213
%input% ^
1314
-noverify ^
14-
-jar %basePath%\plugins\org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar ^
15+
-jar %basePath%\plugins\org.eclipse.equinox.launcher_1.6.100.v20201223-0822.jar ^
1516
-configuration %basePath%\config_win ^
1617
-data %randomPath%
1718

com.microsoft.java.lsif.core/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry exported="true" kind="lib" path="lib/rxjava-2.2.8.jar"/>
66
<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.0.jar"/>

com.microsoft.java.lsif.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1010
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1111
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1212
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
13-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
13+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
1414
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
15-
org.eclipse.jdt.core.compiler.compliance=1.8
15+
org.eclipse.jdt.core.compiler.compliance=11
1616
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1717
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1818
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
2727
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
2828
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
2929
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
30+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
3031
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
3132
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
3233
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -72,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
7273
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
7374
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
7475
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
76+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
7577
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
7678
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
7779
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -109,8 +111,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
109111
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
110112
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
111113
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
112-
org.eclipse.jdt.core.compiler.release=disabled
113-
org.eclipse.jdt.core.compiler.source=1.8
114+
org.eclipse.jdt.core.compiler.release=enabled
115+
org.eclipse.jdt.core.compiler.source=11
114116
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
115117
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
116118
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

com.microsoft.java.lsif.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: com.microsoft.java.lsif.core;singleton:=true
55
Bundle-Version: 0.4.1
66
Bundle-Activator: com.microsoft.java.lsif.core.internal.LanguageServerIndexerPlugin
7-
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
7+
Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Bundle-Localization: plugin
99
Import-Package: org.osgi.framework;version="1.3.0"
1010
Bundle-ActivationPolicy: lazy

com.microsoft.java.lsif.product/languageServer.product

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323

2424
<plugins>
25+
<plugin id="org.apache.felix.scr"/>
2526
<plugin id="com.microsoft.java.lsif.core"/>
26-
<plugin id="javax.xml"/>
2727
<plugin id="org.eclipse.ant.core"/>
2828
<plugin id="org.eclipse.buildship.core"/>
2929
<plugin id="org.eclipse.compare.core"/>
@@ -65,8 +65,10 @@
6565
</plugins>
6666

6767
<configurations>
68+
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
6869
<plugin id="com.microsoft.java.lsif.core" autoStart="true" startLevel="0" />
6970
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
71+
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
7072
<plugin id="org.eclipse.jdt.core" autoStart="false" startLevel="0" />
7173
<plugin id="org.eclipse.jdt.launching" autoStart="false" startLevel="0" />
7274
</configurations>

com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@
2929
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
3030
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
3131
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
32-
<repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
33-
</location>
34-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
3532
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
3633
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
37-
<repository location="https://download.eclipse.org/releases/2020-12/202012161000/"/>
34+
<repository location="https://download.eclipse.org/releases/2021-03/202103171000/"/>
3835
</location>
3936
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4037
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.9.0/"/>
@@ -49,5 +46,5 @@
4946
<repository location="https://download.eclipse.org/jdtls/snapshots/repository/0.71.0.202103161929/"/>
5047
</location>
5148
</locations>
52-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
53-
</target>
49+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
50+
</target>

mvnw

100644100755
File mode changed.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<properties>
1212
<base.name>Java Language Server Indexer</base.name>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<tycho-version>1.4.0</tycho-version>
14+
<tycho-version>2.0.0</tycho-version>
1515
<tycho-extras-version>${tycho-version}</tycho-extras-version>
1616
<tycho.scmUrl>scm:git:https://github.com/eclipse/eclipse.jdt.ls.git</tycho.scmUrl>
1717
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>

0 commit comments

Comments
 (0)