Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Let Kotlin DSL IJ script resolver return given Java home #10350

Merged
merged 1 commit into from Aug 28, 2019
Merged

Let Kotlin DSL IJ script resolver return given Java home #10350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...c/integTest/kotlin/org/gradle/kotlin/dsl/resolver/KotlinScriptDependenciesResolverTest.kt
View file
Open in desktop
Expand Up @@ -58,6 +58,18 @@ class KotlinScriptDependenciesResolverTest : AbstractKotlinIntegrationTest() {
assertSucceeds()
}

@Test
fun `returns given Java home`() {

val javaHome = System.getProperty("java.home")
val env = arrayOf("gradleJavaHome" to javaHome)
assertThat(
resolvedScriptDependencies(env = *env)?.javaHome,
equalTo(javaHome)
)
}


@Test
fun `succeeds on init script`() {

Expand Down
20 changes: 11 additions & 9 deletions ...l/src/main/kotlin/org/gradle/kotlin/dsl/resolver/KotlinBuildScriptDependenciesResolver.kt
View file
Open in desktop
Expand Up @@ -134,12 +134,12 @@ class KotlinBuildScriptDependenciesResolver @VisibleForTesting constructor(
previousDependencies: KotlinScriptExternalDependencies?
): KotlinScriptExternalDependencies? {

val scriptModelRequest = scriptModelRequestFrom(scriptFile, environment, cid)
log(SubmittedModelRequest(cid, scriptFile, scriptModelRequest))
val request = scriptModelRequestFrom(scriptFile, environment, cid)
log(SubmittedModelRequest(cid, scriptFile, request))

val response = DefaultKotlinBuildScriptModelRepository.scriptModelFor(scriptModelRequest)
val response = DefaultKotlinBuildScriptModelRepository.scriptModelFor(request)
if (response == null) {
log(RequestCancelled(cid, scriptFile, scriptModelRequest))
log(RequestCancelled(cid, scriptFile, request))
return null
}
log(ReceivedModelResponse(cid, scriptFile, response))
Expand All @@ -150,15 +150,15 @@ class KotlinBuildScriptDependenciesResolver @VisibleForTesting constructor(

return when {
response.exceptions.isEmpty() ->
dependenciesFrom(response).also {
dependenciesFrom(request, response).also {
log(ResolvedDependencies(cid, scriptFile, it))
}
previousDependencies != null && previousDependencies.classpath.count() > response.classPath.size ->
previousDependencies.also {
log(ResolvedToPreviousWithErrors(cid, scriptFile, previousDependencies, response.exceptions))
}
else ->
dependenciesFrom(response).also {
dependenciesFrom(request, response).also {
log(ResolvedDependenciesWithErrors(cid, scriptFile, it, response.exceptions))
}
}
Expand Down Expand Up @@ -193,11 +193,12 @@ class KotlinBuildScriptDependenciesResolver @VisibleForTesting constructor(
?: GradleInstallation.Wrapper

private
fun dependenciesFrom(response: KotlinBuildScriptModel) =
fun dependenciesFrom(request: KotlinBuildScriptModelRequest, response: KotlinBuildScriptModel) =
KotlinBuildScriptDependencies(
response.classPath,
response.sourcePath,
response.implicitImports
response.implicitImports,
request.javaHome?.path
)
}

Expand All @@ -206,7 +207,8 @@ internal
class KotlinBuildScriptDependencies(
override val classpath: Iterable<File>,
override val sources: Iterable<File>,
override val imports: Iterable<String>
override val imports: Iterable<String>,
override val javaHome: String? = null
) : KotlinScriptExternalDependencies


Expand Down