Skip to content

Honor kotlin.stdlib.default.dependency in non-root gradle.properties #102

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

Open
OliverO2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Honor kotlin.stdlib.default.dependency in non-root gradle.properties #102

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions tapmoc-gradle-plugin/src/kgp/kotlin/tapmoc/internal/KgpImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private val compilerOptionsMethod by lazy {
}
}

private class KgpImpl(private val dependencyHandler: DependencyHandler, extension: Any, private val providers: ProviderFactory, private val kgpVersion: String) : Kgp {
private class KgpImpl(private val project: Project, private val dependencyHandler: DependencyHandler, extension: Any, private val providers: ProviderFactory, private val kgpVersion: String) : Kgp {
private val kotlinProjectExtension: KotlinProjectExtension = extension as KotlinProjectExtension

override fun javaCompatibility(version: Int) {
Expand Down Expand Up @@ -102,9 +102,7 @@ private class KgpImpl(private val dependencyHandler: DependencyHandler, extensio
* See https://youtrack.jetbrains.com/issue/KT-66755/
*/
val isStdlibDefaultDependencyEnabled =
providers.gradleProperty("kotlin.stdlib.default.dependency")
.map { it.toBooleanStrictOrNull() != false }
.getOrElse(true)
project.findProperty("kotlin.stdlib.default.dependency")?.toString()?.toBooleanStrictOrNull() != false

if (isStdlibDefaultDependencyEnabled) {
/**
Expand Down Expand Up @@ -226,7 +224,7 @@ internal fun Project.onKgp(block: (Kgp) -> Unit) {
plugins.withType(KotlinBasePlugin::class.java).configureEach {
if(!hasKgp) {
hasKgp = true
block(KgpImpl(this.dependencies, extensions.getByName("kotlin"), providers, getKotlinPluginVersion()))
block(KgpImpl(this, this.dependencies, extensions.getByName("kotlin"), providers, getKotlinPluginVersion()))
}
}
}