diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bca17f365..d435ce29d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 7894f43f9..ff8b13351 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -8,7 +8,7 @@ import java.time.format.DateTimeFormatter plugins { java - maven + //maven `maven-publish` application id("com.github.johnrengelman.shadow") version "6.0.0" @@ -35,10 +35,10 @@ val date: String = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy- val applicationName = "meghanada" val junitVersion = "5.6.2" -val gradleVersion = "6.6" -val log4jVersion = "2.13.3" +val gradleVersion = "7.0.1" +val log4jVersion = "2.14.1" val xodusVersion = "1.3.232" -val opencensusVersion = "0.27.0" +val opencensusVersion = "0.28.3" base { archivesBaseName = applicationName @@ -55,18 +55,18 @@ dependencies { val toolsJar = files("$javaHome/../lib/tools.jar") implementation(toolsJar) implementation("com.google.googlejavaformat:google-java-format:1.7") - implementation("org.apache.maven:maven-model-builder:3.6.3") + implementation("org.apache.maven:maven-model-builder:3.8.1") implementation("com.leacox.motif:motif:0.1") implementation("com.leacox.motif:motif-hamcrest:0.1") - implementation("com.github.javaparser:javaparser-core:3.16.1") + implementation("com.github.javaparser:javaparser-core:3.22.0") implementation("org.apache.logging.log4j:log4j-core:$log4jVersion") implementation("org.apache.logging.log4j:log4j-api:$log4jVersion") implementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion") implementation("commons-cli:commons-cli:1.4") implementation("org.gradle:gradle-tooling-api:$gradleVersion") - implementation("com.google.guava:guava:29.0-jre") - implementation("org.ow2.asm:asm:8.0.1") - implementation("com.typesafe:config:1.4.0") + implementation("com.google.guava:guava:30.1.1-jre") + implementation("org.ow2.asm:asm:9.1") + implementation("com.typesafe:config:1.4.1") implementation("org.atteo:evo-inflector:1.2.2") implementation("org.junit.jupiter:junit-jupiter-api:$junitVersion") @@ -80,7 +80,7 @@ dependencies { implementation("org.jboss.windup.decompiler:decompiler-api:4.2.1.Final") implementation("org.jboss.windup.decompiler:decompiler-fernflower:4.3.1.Final") implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation("org.eclipse.jdt:org.eclipse.jdt.core:3.22.0") + implementation("org.eclipse.jdt:org.eclipse.jdt.core:3.25.0") implementation("de.ruedigermoeller:fst:2.56") implementation("org.jetbrains.xodus:xodus-query:$xodusVersion") diff --git a/server/src/test/java/meghanada/location/LocationSearcherTest.java b/server/src/test/java/meghanada/location/LocationSearcherTest.java index 63d4b2d93..8856b530b 100644 --- a/server/src/test/java/meghanada/location/LocationSearcherTest.java +++ b/server/src/test/java/meghanada/location/LocationSearcherTest.java @@ -392,7 +392,7 @@ public void testJumpClass04() throws Exception { Location result = searcher.searchDeclarationLocation(f, 57, 40, "LogManager").orElse(null); assertNotNull(result); assertTrue(result.getPath().contains(".java")); - assertEquals(21, result.getLine()); + assertEquals(22, result.getLine()); assertEquals(14, result.getColumn()); } diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index b2388b855..79f4edf4e 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -8,7 +8,7 @@ import java.time.format.DateTimeFormatter plugins { java - maven +// maven `maven-publish` application id("com.github.johnrengelman.shadow") version "6.0.0"