Update Gradle Distribution url, added CI checks for yarn and npm distros

Kotlin · Sep 23, 2024 · 9a7cea8 · 9a7cea8
1 parent c709ffa
commit 9a7cea8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -101,10 +101,15 @@ val executeNpmLogin by tasks.registering {
     outputs.file(buildYarnYmlConfigFile).withPropertyName("buildOutputYarnYmlFile")
 }
 
+val isCI = System.getenv("TEAMCITY_VERSION") != null
+
 plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class.java).configureEach {
     rootProject.extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) {
         download = true
-        downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+
+        if (isCI) {
+            downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+        }
     }
 
     tasks.named("kotlinNpmInstall").configure {
@@ -117,6 +122,9 @@ rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlu
     rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {
         ignoreScripts = false
         download = true
-        downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+
+        if (isCI) {
+            downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+        }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,6 +4,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists