Skip to content

Commit 1e48712

Browse files
authored
Merge pull request #395 from themkat/gradle_settings_script_issue
Make settings.gradle.kts scripts use the KotlinSettingsScript template
2 parents a2b68ab + 1c0fb5d commit 1e48712

File tree

1 file changed

+9
-0
lines changed
  • server/src/main/kotlin/org/javacs/kt/compiler

1 file changed

+9
-0
lines changed

server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,15 @@ private class CompilationEnvironment(
142142
scriptClassLoader.loadClass(it).kotlin,
143143
scriptHostConfig[ScriptingHostConfiguration.getEnvironment]?.invoke()
144144
) {
145+
override fun isScript(fileName: String): Boolean {
146+
// The pattern for KotlinSettingsScript doesn't seem to work well, so kinda "forcing it" for settings.gradle.kts files
147+
if (this.template.simpleName == "KotlinSettingsScript" && fileName.endsWith("settings.gradle.kts")) {
148+
return true
149+
}
150+
151+
return super.isScript(fileName)
152+
}
153+
145154
override val dependencyResolver: DependenciesResolver = object : DependenciesResolver {
146155
override fun resolve(scriptContents: ScriptContents, environment: Environment) = ResolveResult.Success(ScriptDependencies(
147156
imports = listOf(

0 commit comments

Comments
 (0)