Skip to content

Commit 1b2cda9

Browse files
committed
Remove build work-around for older KGP versions
1 parent ae34e10 commit 1b2cda9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

gradle/build-logic/src/main/kotlin/net/kautler/node.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.gradle.accessors.dm.LibrariesForLibs
2222
import org.gradle.accessors.dm.LibrariesForKotlinWrappers
2323
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
2424
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
25+
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
2526
import org.jetbrains.kotlin.gradle.tasks.IncrementalSyncTask
2627
import org.yaml.snakeyaml.Yaml
2728

@@ -114,6 +115,11 @@ tasks.withType<NodeJsExec>().configureEach {
114115

115116
configure<NodeJsRootExtension> {
116117
version = libs.versions.build.node.get()
118+
downloadBaseUrl = null
119+
}
120+
121+
configure<YarnRootExtension> {
122+
downloadBaseUrl = null
117123
}
118124

119125
val executable by configurations.registering {

settings.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import de.fayard.refreshVersions.core.FeatureFlag.GRADLE_UPDATES
1818
import net.kautler.conditionalRefreshVersions
19-
import org.gradle.api.initialization.resolve.RepositoriesMode.PREFER_SETTINGS
19+
import org.gradle.api.initialization.resolve.RepositoriesMode.FAIL_ON_PROJECT_REPOS
2020

2121
pluginManagement {
2222
require(JavaVersion.current().isJava11Compatible) {
@@ -96,9 +96,7 @@ dependencyResolutionManagement {
9696
}
9797
mavenCentral()
9898
}
99-
// work-around for https://youtrack.jetbrains.com/issue/KT-56300
100-
//repositoriesMode.set(FAIL_ON_PROJECT_REPOS)
101-
repositoriesMode.set(PREFER_SETTINGS)
99+
repositoriesMode.set(FAIL_ON_PROJECT_REPOS)
102100

103101
versionCatalogs {
104102
val kotlinWrappers by registering {

0 commit comments

Comments
 (0)