diff --git a/cmd/index.bat b/cmd/index.bat index 8df3559..b878fc2 100644 --- a/cmd/index.bat +++ b/cmd/index.bat @@ -8,10 +8,11 @@ set randomPath=%TEMP%\%RANDOM%%RANDOM% :Main java ^ +--add-modules=ALL-SYSTEM ^ -Dlog.level=ALL ^ %input% ^ -noverify ^ --jar %basePath%\plugins\org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar ^ +-jar %basePath%\plugins\org.eclipse.equinox.launcher_1.6.100.v20201223-0822.jar ^ -configuration %basePath%\config_win ^ -data %randomPath% diff --git a/com.microsoft.java.lsif.core/.classpath b/com.microsoft.java.lsif.core/.classpath index 290134b..644cc15 100644 --- a/com.microsoft.java.lsif.core/.classpath +++ b/com.microsoft.java.lsif.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.microsoft.java.lsif.core/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.java.lsif.core/.settings/org.eclipse.jdt.core.prefs index 9828c94..9fb8fad 100644 --- a/com.microsoft.java.lsif.core/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.java.lsif.core/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore 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 @@ -72,6 +73,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 @@ -109,8 +111,8 @@ 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.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF b/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF index 483a7ec..4c7ecae 100644 --- a/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF +++ b/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.microsoft.java.lsif.core;singleton:=true Bundle-Version: 0.4.1 Bundle-Activator: com.microsoft.java.lsif.core.internal.LanguageServerIndexerPlugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Import-Package: org.osgi.framework;version="1.3.0" Bundle-ActivationPolicy: lazy diff --git a/com.microsoft.java.lsif.product/languageServer.product b/com.microsoft.java.lsif.product/languageServer.product index ed0aa0e..1efc1c9 100644 --- a/com.microsoft.java.lsif.product/languageServer.product +++ b/com.microsoft.java.lsif.product/languageServer.product @@ -22,8 +22,8 @@ + - @@ -65,8 +65,10 @@ + + diff --git a/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target b/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target index 8488a6b..9f366b5 100644 --- a/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target +++ b/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target @@ -29,12 +29,9 @@ - - - - + @@ -49,5 +46,5 @@ - - \ No newline at end of file + + diff --git a/mvnw b/mvnw old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml index 9245650..da01ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ Java Language Server Indexer UTF-8 - 1.4.0 + 2.0.0 ${tycho-version} scm:git:https://github.com/eclipse/eclipse.jdt.ls.git reuseReports