Skip to content

Commit 42c4a12

Browse files
authored
Merge pull request fwcd#584 from fwcd/fix-maven-repo-optional
Make maven repository optional again
2 parents b490bce + bb7b8f0 commit 42c4a12

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

shared/src/main/kotlin/org/javacs/kt/classpath/Home.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ private val possibleMavenRepositoryPaths =
1717
)
1818
.filterNotNull()
1919

20-
internal val mavenRepository =
20+
internal val mavenRepository: Path? =
2121
possibleMavenRepositoryPaths.firstOrNull { Files.exists(it) }
22-
?: throw KotlinLSException(
23-
"No repositories found at \$MAVEN_REPOSITORY, \$MAVEN_HOME, \$M2_HOME or \$HOME/.m2"
24-
)
2522

2623
internal val gradleHome = createPathOrNull("GRADLE_USER_HOME") ?: userHome.resolve(".gradle")

shared/src/main/kotlin/org/javacs/kt/classpath/MavenClassPathResolver.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ private fun readMavenDependencyListWithSources(artifacts: Set<Artifact>, sources
8888

8989
private fun findMavenArtifact(a: Artifact, source: Boolean): Path? {
9090
val result = mavenRepository
91-
.resolve(a.group.replace('.', File.separatorChar))
92-
.resolve(a.artifact)
93-
.resolve(a.version)
94-
.resolve(mavenJarName(a, source))
91+
?.resolve(a.group.replace('.', File.separatorChar))
92+
?.resolve(a.artifact)
93+
?.resolve(a.version)
94+
?.resolve(mavenJarName(a, source))
9595

9696
return if (Files.exists(result))
9797
result

0 commit comments

Comments
 (0)