azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Update gradle enterprise and test distribution plugins

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2021-06-23 17:17:29 +03:00
parent 6e1fce6b8b
commit aff9d96e8a
5 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/build.gradle.kts
+1 -1
View File
@@ -158,7 +158,7 @@ dependencies {
implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
implementation("com.gradle.enterprise:test-distribution-gradle-plugin:1.2.1")
implementation("com.gradle.enterprise:test-distribution-gradle-plugin:2.1")
compileOnly(gradleApi())
buildSrc/src/main/kotlin/testDistribution.kt
+3 -3
View File
@@ -9,13 +9,13 @@ import org.gradle.internal.os.OperatingSystem
fun Test.configureTestDistribution(configure: TestDistributionExtension.() -> Unit = {}) {
if (extensions.findByType(TestDistributionExtension::class.java) == null) return
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
val testDistributionEnabled =
project.findProperty("kotlin.build.test.distribution.enabled")?.toString()?.toBoolean() ?: false
useJUnitPlatform()
extensions.configure(TestDistributionExtension::class.java) {
enabled.set(true)
enabled.set(testDistributionEnabled)
maxRemoteExecutors.set(20)
if (isTeamcityBuild) {
requirements.set(setOf("os=${OperatingSystem.current().familyName}"))
gradle/verification-metadata.xml
+9 -13
View File
@@ -1947,21 +1947,17 @@
<sha256 value="a73e8f03882d7e83f51972882d4283de298e6fbcea4757e06059cf594adabbb4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.6.2">
<artifact name="gradle-enterprise-gradle-plugin-3.6.2.jar">
<md5 value="03c38ad6ea5b967bb1c51d1d72285b8c" origin="https://plugins.gradle.org/m2/com/gradle/gradle-enterprise-gradle-plugin/3.6.2/"/>
<sha1 value="e0af7265179adba6ac6a9fabe334a19057997a3a" origin="https://plugins.gradle.org/m2/com/gradle/gradle-enterprise-gradle-plugin/3.6.2/"/>
<sha256 value="ebbe7fe22460da274b2765623dde44a942d9de7d9b6cd9410bf250dae19d71a0" origin="Generated by Gradle"/>
<component group="com.gradle" name="gradle-enterprise-gradle-plugin" version="3.6.3">
<artifact name="gradle-enterprise-gradle-plugin-3.6.3.jar">
<md5 value="680b8913e65b28a1fe378e277d81877f" origin="https://plugins.gradle.org/m2/com/gradle/gradle-enterprise-gradle-plugin/3.6.2/"/>
<sha1 value="415ea1284e690c0573376eccf8e7d7542499a3ef" origin="https://plugins.gradle.org/m2/com/gradle/gradle-enterprise-gradle-plugin/3.6.2/"/>
<sha256 value="23148e8925cf140a6d5fe6c0b58368580ca1b93400d73031286a5b14b356d9b0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.gradle.enterprise" name="test-distribution-gradle-plugin" version="1.2.1">
<artifact name="test-distribution-gradle-plugin-1.2.1.jar">
<md5 value="0f09fba5ab5b7428fc0234ebd72318f1" origin="Generated by Gradle"/>
<sha256 value="5eb820e466f22a1a00ffaea699cac3da396f4b86428d7332216612254e269d94" origin="Generated by Gradle"/>
</artifact>
<artifact name="test-distribution-gradle-plugin-1.2.1.pom">
<md5 value="9125a18551d51ce5a7a52a6f13480a99" origin="Generated by Gradle"/>
<sha256 value="102f23691cf8d3b03f343030986bf055ec1a983bccab78ab14de746b06f383cb" origin="Generated by Gradle"/>
<component group="com.gradle.enterprise" name="test-distribution-gradle-plugin" version="2.1">
<artifact name="test-distribution-gradle-plugin-2.1.jar">
<md5 value="d8198138d6ac31b37e6e8c35b9e8ac47" origin="Generated by Gradle"/>
<sha256 value="8e80896b5816499d7245ee384d77f0d152614d8520274fb9b043e59bd33349ea" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.gradle.publish" name="plugin-publish-plugin" version="0.14.0">
js/js.tests/build.gradle.kts
-9
View File
@@ -10,15 +10,6 @@ plugins {
id("jps-compatible")
id("com.github.node-gradle.node") version "3.0.1"
id("de.undercouch.download")
id("com.gradle.enterprise.test-distribution") apply false
}
val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
val testDistributionEnabled = project.findProperty("kotlin.build.test.distribution.enabled")?.toString()?.toBoolean()
?: isTeamcityBuild
if (testDistributionEnabled) {
apply<com.gradle.enterprise.gradleplugin.testdistribution.TestDistributionPlugin>()
}
node {
settings.gradle
+2 -2
View File
@@ -33,12 +33,12 @@ buildscript {
}
plugins {
id "com.gradle.enterprise" version "3.6.2"
id "com.gradle.enterprise" version "3.6.3"
id "com.gradle.enterprise.test-distribution" version "2.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "1.4" apply false
}
def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
def projectVersions = file("./gradle/versions.properties").text
if (buildProperties.buildScanServer != null) {
apply plugin: com.gradle.CommonCustomUserDataGradlePlugin