Skip to content

Commit 9a7cea8

Browse files
committed
Update Gradle Distribution url, added CI checks for yarn and npm distros
1 parent c709ffa commit 9a7cea8

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

build.gradle.kts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,15 @@ val executeNpmLogin by tasks.registering {
101101
outputs.file(buildYarnYmlConfigFile).withPropertyName("buildOutputYarnYmlFile")
102102
}
103103

104+
val isCI = System.getenv("TEAMCITY_VERSION") != null
105+
104106
plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class.java).configureEach {
105107
rootProject.extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) {
106108
download = true
107-
downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
109+
110+
if (isCI) {
111+
downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
112+
}
108113
}
109114

110115
tasks.named("kotlinNpmInstall").configure {
@@ -117,6 +122,9 @@ rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlu
117122
rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {
118123
ignoreScripts = false
119124
download = true
120-
downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
125+
126+
if (isCI) {
127+
downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
128+
}
121129
}
122130
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
distributionBase=GRADLE_USER_HOME
66
distributionPath=wrapper/dists
7-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
7+
distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.7-bin.zip
88
zipStoreBase=GRADLE_USER_HOME
99
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)