data: update Java dependencies to add support for Java 13, 14 and 15 (#1152)

* updated java indexer dependencies
* replaced old gradle tooling jar that is shipped with Sourcetrail because it is not working for new JRE versions anymore
* fixed crash in Java indexer
* added language standard sleection for Java 13, 14 and 15
* fixed console logging for recent jdk versions
This commit is contained in:
Malte Langkabel
2021-02-25 18:28:17 +01:00
committed by GitHub
parent 7cb232af86
commit 220ac82681
40 changed files with 84 additions and 62 deletions
@@ -4,7 +4,7 @@
std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandardStatic()
{
return L"12";
return L"15";
}
std::wstring SourceGroupSettingsWithJavaStandard::getJavaStandard() const
@@ -23,7 +23,22 @@ void SourceGroupSettingsWithJavaStandard::setJavaStandard(const std::wstring& st
std::vector<std::wstring> SourceGroupSettingsWithJavaStandard::getAvailableJavaStandards() const
{
return {L"12", L"11", L"10", L"9", L"8", L"7", L"6", L"5", L"4", L"3", L"2", L"1"};
return {
L"15",
L"14",
L"13",
L"12",
L"11",
L"10",
L"9",
L"8",
L"7",
L"6",
L"5",
L"4",
L"3",
L"2",
L"1"};
}
bool SourceGroupSettingsWithJavaStandard::equals(const SourceGroupSettingsBase* other) const
+3 -2
View File
@@ -2,6 +2,8 @@
#include <iostream>
#include "utilityString.h"
ConsoleLogger::ConsoleLogger(): Logger("ConsoleLogger") {}
void ConsoleLogger::logInfo(const LogMessage& message)
@@ -29,6 +31,5 @@ void ConsoleLogger::logMessage(const std::string& type, const LogMessage& messag
<< "() | ";
}
std::cout << type << ": ";
std::wcout << message.message << std::endl;
std::cout << type << ": " << utility::encodeToUtf8(message.message) << std::endl;
}
+17 -17
View File
@@ -18,24 +18,24 @@ namespace utility
std::vector<std::wstring> getRequiredJarNames()
{
return {
L"gradle-tooling-api-4.2.jar",
L"gradle-tooling-api-6.7.1.jar",
L"java-indexer.jar",
L"org.eclipse.core.commands-3.9.500.jar",
L"org.eclipse.core.contenttype-3.7.400.jar",
L"org.eclipse.core.expressions-3.6.500.jar",
L"org.eclipse.core.filesystem-1.7.500.jar",
L"org.eclipse.core.jobs-3.10.500.jar",
L"org.eclipse.core.resources-3.13.500.jar",
L"org.eclipse.core.runtime-3.16.0.jar",
L"org.eclipse.equinox.app-1.4.300.jar",
L"org.eclipse.equinox.common-3.10.500.jar",
L"org.eclipse.equinox.preferences-3.7.500.jar",
L"org.eclipse.equinox.registry-3.8.500.jar",
L"org.eclipse.jdt.core-3.19.0.jar",
L"org.eclipse.osgi-3.15.0.jar",
L"org.eclipse.text-3.9.0.jar",
L"slf4j-api-1.7.10.jar",
L"slf4j-simple-1.7.10.jar"};
L"org.eclipse.core.commands-3.9.800.jar",
L"org.eclipse.core.contenttype-3.7.800.jar",
L"org.eclipse.core.expressions-3.7.0.jar",
L"org.eclipse.core.filesystem-1.7.700.jar",
L"org.eclipse.core.jobs-3.10.1000.jar",
L"org.eclipse.core.resources-3.13.900.jar",
L"org.eclipse.core.runtime-3.20.0.jar",
L"org.eclipse.equinox.app-1.5.0.jar",
L"org.eclipse.equinox.common-3.14.0.jar",
L"org.eclipse.equinox.preferences-3.8.100.jar",
L"org.eclipse.equinox.registry-3.10.0.jar",
L"org.eclipse.jdt.core-3.24.0.jar",
L"org.eclipse.osgi-3.16.100.jar",
L"org.eclipse.text-3.10.400.jar",
L"slf4j-api-1.7.28.jar",
L"slf4j-simple-1.7.30.jar"};
}
std::string prepareJavaEnvironment()
+1 -1
View File
@@ -1655,7 +1655,7 @@ TEST_CASE("java parser finds bound type of type parameter")
client->typeUses, L"A<T>.T -> java.lang.Void <1:27 1:30>"));
}
TEST_CASE("java parsersupports java 12 switch expression")
TEST_CASE("java parsersupports java 14 switch expression")
{
std::shared_ptr<TestStorage> client = parseCode(
"package foo;\n"