Fix Tooling API compatibility

buildSrc/subprojects/jvm/src/main/kotlin/gradlebuild/unittest-and-compile.gradle.kts

@@ -45,6 +45,8 @@ configureJarTasks()
 configureTests()
 failOnEmptySourceFolder()
 
+tasks.registerCITestDistributionLifecycleTasks()
+
 fun configureCompile() {
     java.targetCompatibility = JavaVersion.VERSION_1_8
     java.sourceCompatibility = JavaVersion.VERSION_1_8
@@ -259,3 +261,60 @@ fun failOnEmptySourceFolder() {
         }
     }
 }
+
+/**
+ * Test lifecycle tasks that correspond to CIBuildModel.TestType (see .teamcity/Gradle_Check/model/CIBuildModel.kt).
+ */
+fun TaskContainer.registerCITestDistributionLifecycleTasks() {
+    val ciGroup = "CI Lifecycle"
+
+    register("quickTest") {
+        description = "Run all unit, integration and cross-version (against latest release) tests in embedded execution mode"
+        group = ciGroup
+    }
+
+    register("platformTest") {
+        description = "Run all unit, integration and cross-version (against latest release) tests in forking execution mode"
+        group = ciGroup
+    }
+
+    register("quickFeedbackCrossVersionTest") {
+        description = "Run cross-version tests against a limited set of versions"
+        group = ciGroup
+    }
+
+    register("allVersionsCrossVersionTest") {
+        description = "Run cross-version tests against all released versions (latest patch release of each)"
+        group = ciGroup
+    }
+
+    register("allVersionsIntegMultiVersionTest") {
+        description = "Run all multi-version integration tests with all version to cover"
+        group = ciGroup
+    }
+
+    register("parallelTest") {
+        description = "Run all integration tests in parallel execution mode: each Gradle execution started in a test run with --parallel"
+        group = ciGroup
+    }
+
+    register("noDaemonTest") {
+        description = "Run all integration tests in no-daemon execution mode: each Gradle execution started in a test forks a new daemon"
+        group = ciGroup
+    }
+
+    register("configCacheTest") {
+        description = "Run all integration tests with instant execution"
+        group = ciGroup
+    }
+
+    register("watchFsTest") {
+        description = "Run all integration tests with file system watching enabled"
+        group = ciGroup
+    }
+
+    register("forceRealizeDependencyManagementTest") {
+        description = "Runs all integration tests with the dependency management engine in 'force component realization' mode"
+        group = ciGroup
+    }
+}

buildSrc/subprojects/lifecycle/src/main/kotlin/gradlebuild/lifecycle.gradle.kts

@@ -17,8 +17,8 @@
 package gradlebuild
 
 import gradlebuild.basics.BuildEnvironment
+import java.time.Duration
 import java.util.Timer
-import java.util.concurrent.TimeUnit
 import kotlin.concurrent.timerTask
 
 // Lifecycle tasks used to to fan out the build into multiple builds in a CI pipeline.
@@ -33,58 +33,19 @@ val quickTest = "quickTest"
 
 val platformTest = "platformTest"
 
-val quickFeedbackCrossVersionTest = "quickFeedbackCrossVersionTest"
-
 val allVersionsCrossVersionTest = "allVersionsCrossVersionTest"
 
 val allVersionsIntegMultiVersionTest = "allVersionsIntegMultiVersionTest"
 
-val parallelTest = "parallelTest"
-
-val noDaemonTest = "noDaemonTest"
-
-val configCacheTest = "configCacheTest"
-
-val watchFsTest = "watchFsTest"
-
 val soakTest = "soakTest"
 
-val ignoredSubprojects = listOf(
-    "soak", // soak test
-    "distributions-integ-tests", // test build distributions
-    "architecture-test" // sanity check
-)
-
-val forceRealizeDependencyManagementTest = "forceRealizeDependencyManagementTest"
-
 
 setupTimeoutMonitorOnCI()
 setupGlobalState()
 
-subprojects.filter { it.name !in ignoredSubprojects }.forEach { it.registerLifecycleTasks() }
-
-
 tasks.registerDistributionsPromotionTasks()
 
-
-fun Project.registerLifecycleTasks() {
-    tasks.registerCITestDistributionLifecycleTasks()
-    plugins.withId("gradlebuild.java-library") {
-        tasks.registerEarlyFeedbackLifecycleTasks()
-        tasks.named(quickTest) {
-            dependsOn("test")
-        }
-        tasks.named(platformTest) {
-            dependsOn("test")
-        }
-    }
-    plugins.withId("gradlebuild.integration-tests") {
-        tasks.configureCIIntegrationTestDistributionLifecycleTasks()
-    }
-    plugins.withId("gradlebuild.cross-version-tests") {
-        tasks.configureCICrossVersionTestDistributionLifecycleTasks()
-    }
-}
+tasks.registerEarlyFeedbackRootLifecycleTasks()
 
 /**
  * Print all stacktraces of running JVMs on the machine upon timeout. Helps us diagnose deadlock issues.
@@ -107,9 +68,9 @@ fun setupTimeoutMonitorOnCI() {
 
 fun determineTimeoutMillis() =
     if (isRequestedTask(compileAllBuild) || isRequestedTask(sanityCheck) || isRequestedTask(quickTest)) {
-        TimeUnit.MINUTES.toMillis(30)
+        Duration.ofMinutes(30).toMillis()
     } else {
-        TimeUnit.MINUTES.toMillis(165) // 2h45m
+        Duration.ofHours(2).plusMinutes(45).toMillis()
     }
 
 fun setupGlobalState() {
@@ -127,21 +88,18 @@ fun needsToUseTestVersionsAll() = isRequestedTask(allVersionsCrossVersionTest)
     || isRequestedTask(allVersionsIntegMultiVersionTest)
     || isRequestedTask(soakTest)
 
-/**
- * Basic compile and check lifecycle tasks.
- */
-fun TaskContainer.registerEarlyFeedbackLifecycleTasks() {
+fun TaskContainer.registerEarlyFeedbackRootLifecycleTasks() {
     register(compileAllBuild) {
         description = "Initialize CI Pipeline by priming the cache before fanning out"
         group = ciGroup
-        dependsOn(":base-services:createBuildReceipt", "compileAll")
+        dependsOn(":base-services:createBuildReceipt")
     }
 
     register(sanityCheck) {
         description = "Run all basic checks (without tests) - to be run locally and on CI for early feedback"
         group = "verification"
         dependsOn(
-            "compileAll", ":docs:checkstyleApi", "codeQuality", ":internal-build-reports:allIncubationReportsZip",
+            ":docs:checkstyleApi", ":internal-build-reports:allIncubationReportsZip",
             ":architecture-test:checkBinaryCompatibility", ":docs:javadocAll",
             ":architecture-test:test", ":tooling-api:toolingApiShadedJar")
     }
@@ -159,115 +117,6 @@ fun TaskContainer.registerDistributionsPromotionTasks() {
     }
 }
 
-/**
- * Test lifecycle tasks that correspond to CIBuildModel.TestType (see .teamcity/Gradle_Check/model/CIBuildModel.kt).
- */
-fun TaskContainer.registerCITestDistributionLifecycleTasks() {
-    register(quickTest) {
-        description = "Run all unit, integration and cross-version (against latest release) tests in embedded execution mode"
-        group = ciGroup
-    }
-
-    register(platformTest) {
-        description = "Run all unit, integration and cross-version (against latest release) tests in forking execution mode"
-        group = ciGroup
-    }
-
-    register(quickFeedbackCrossVersionTest) {
-        description = "Run cross-version tests against a limited set of versions"
-        group = ciGroup
-    }
-
-    register(allVersionsCrossVersionTest) {
-        description = "Run cross-version tests against all released versions (latest patch release of each)"
-        group = ciGroup
-    }
-
-    register(allVersionsIntegMultiVersionTest) {
-        description = "Run all multi-version integration tests with all version to cover"
-        group = ciGroup
-    }
-
-    register(parallelTest) {
-        description = "Run all integration tests in parallel execution mode: each Gradle execution started in a test run with --parallel"
-        group = ciGroup
-    }
-
-    register(noDaemonTest) {
-        description = "Run all integration tests in no-daemon execution mode: each Gradle execution started in a test forks a new daemon"
-        group = ciGroup
-    }
-
-    register(configCacheTest) {
-        description = "Run all integration tests with instant execution"
-        group = ciGroup
-    }
-
-    register(watchFsTest) {
-        description = "Run all integration tests with file system watching enabled"
-        group = ciGroup
-    }
-
-    register(forceRealizeDependencyManagementTest) {
-        description = "Runs all integration tests with the dependency management engine in 'force component realization' mode"
-        group = ciGroup
-    }
-}
-
-fun TaskContainer.configureCIIntegrationTestDistributionLifecycleTasks() {
-    named(quickTest) {
-        dependsOn("embeddedIntegTest")
-    }
-
-    named(platformTest) {
-        dependsOn("forkingIntegTest")
-    }
-
-    named(allVersionsIntegMultiVersionTest) {
-        dependsOn("integMultiVersionTest")
-    }
-
-    named(parallelTest) {
-        dependsOn("parallelIntegTest")
-    }
-
-    named(noDaemonTest) {
-        description = "Run all integration tests in no-daemon execution mode: each Gradle execution started in a test forks a new daemon"
-        group = ciGroup
-        dependsOn("noDaemonIntegTest")
-    }
-
-    named(configCacheTest) {
-        dependsOn("configCacheIntegTest")
-    }
-
-    named(watchFsTest) {
-        dependsOn("watchFsIntegTest")
-    }
-
-    named(forceRealizeDependencyManagementTest) {
-        dependsOn("integForceRealizeTest")
-    }
-}
-
-fun TaskContainer.configureCICrossVersionTestDistributionLifecycleTasks() {
-    named(quickTest) {
-        dependsOn("embeddedCrossVersionTest")
-    }
-
-    named(platformTest) {
-        dependsOn("forkingCrossVersionTest")
-    }
-
-    named(quickFeedbackCrossVersionTest) {
-        dependsOn("quickFeedbackCrossVersionTests")
-    }
-
-    named(allVersionsCrossVersionTest) {
-        dependsOn("allVersionsCrossVersionTests")
-    }
-}
-
 fun globalProperty(pair: Pair<String, Any>) {
     val propertyName = pair.first
     val value = pair.second

buildSrc/subprojects/uber-plugins/src/main/kotlin/gradlebuild/ci-lifecycle.gradle.kts

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gradlebuild
+
+tasks.registerEarlyFeedbackLifecycleTasks()
+tasks.named("quickTest") {
+    dependsOn("test")
+}
+tasks.named("platformTest") {
+    dependsOn("test")
+}
+tasks.configureCIIntegrationTestDistributionLifecycleTasks()
+tasks.configureCICrossVersionTestDistributionLifecycleTasks()
+
+val ciGroup = "CI Lifecycle"
+
+/**
+ * Basic compile and check lifecycle tasks.
+ */
+fun TaskContainer.registerEarlyFeedbackLifecycleTasks() {
+    register("compileAllBuild") {
+        description = "Initialize CI Pipeline by priming the cache before fanning out"
+        group = ciGroup
+        dependsOn("compileAll")
+    }
+
+    register("sanityCheck") {
+        description = "Run all basic checks (without tests) - to be run locally and on CI for early feedback"
+        group = "verification"
+        dependsOn("compileAll", "codeQuality")
+    }
+}
+
+fun TaskContainer.configureCIIntegrationTestDistributionLifecycleTasks() {
+    named("quickTest") {
+        dependsOn("embeddedIntegTest")
+    }
+
+    named("platformTest") {
+        dependsOn("forkingIntegTest")
+    }
+
+    named("allVersionsIntegMultiVersionTest") {
+        dependsOn("integMultiVersionTest")
+    }
+
+    named("parallelTest") {
+        dependsOn("parallelIntegTest")
+    }
+
+    named("noDaemonTest") {
+        dependsOn("noDaemonIntegTest")
+    }
+
+    named("configCacheTest") {
+        dependsOn("configCacheIntegTest")
+    }
+
+    named("watchFsTest") {
+        dependsOn("watchFsIntegTest")
+    }
+
+    named("forceRealizeDependencyManagementTest") {
+        dependsOn("integForceRealizeTest")
+    }
+}
+
+fun TaskContainer.configureCICrossVersionTestDistributionLifecycleTasks() {
+    named("quickTest") {
+        dependsOn("embeddedCrossVersionTest")
+    }
+
+    named("platformTest") {
+        dependsOn("forkingCrossVersionTest")
+    }
+
+    named("quickFeedbackCrossVersionTest") {
+        dependsOn("quickFeedbackCrossVersionTests")
+    }
+
+    named("allVersionsCrossVersionTest") {
+        dependsOn("allVersionsCrossVersionTests")
+    }
+}