Cleanup build configuration (#6717)

* ./gradlew build now passes out of the box
* remove cross-project configuration
* remove checking modified files in CI
* ./gradlew ctng is kept as a shorthand during development

Author: martinbonnin

.github/workflows/build-pull-request.yml

@@ -16,7 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  tests-gradle:
+  tests-no-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
     runs-on: macos-15
     steps:
@@ -25,9 +25,9 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
       - run: |
-          ./gradlew ciTestsGradle
+          ./gradlew build -x :apollo-gradle-plugin:test
 
-  tests-no-gradle:
+  tests-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
     runs-on: macos-15
     steps:
@@ -36,7 +36,7 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
       - run: |
-          ./gradlew ciTestsNoGradle --stacktrace
+          ./gradlew :apollo-gradle-plugin:test
 
   tests-integration:
     if: "!startsWith(github.head_ref, 'release-')"
@@ -48,7 +48,6 @@ jobs:
           gradle-home-cache-cleanup: true
       - run: |
           ./gradlew -p tests build 
-          ./gradlew -p tests checkGitStatus
 
   swift-tests:
     runs-on: macos-15

build-logic/build.gradle.kts

@@ -55,7 +55,6 @@ dependencies {
   runtimeOnly(libs.atomicfu.plugin)
 
   runtimeOnly(libs.sqldelight.plugin)
-  runtimeOnly(libs.benmanes.versions)
   runtimeOnly(libs.gratatouille)
   runtimeOnly(libs.kotlinx.binarycompatibilityvalidator)
 }

build-logic/src/main/kotlin/GitStatus.kt

@@ -23,12 +23,13 @@ fun Project.rootSetup() {
     }
   }
 
-  allprojects.forEach {
-    dependencies.add("apolloTestAggregationConsumer", it)
+  allprojects {
+    val rootProject = this@rootSetup
+    rootProject.dependencies.add("apolloTestAggregationConsumer", rootProject.dependencies.project(mapOf("path" to path)))
   }
 
   val task = tasks.register("apolloTestAggregation", GenerateApolloTestAggregation::class.java) {
-    binaryTestResults.from(apolloTestAggregationConsumer)
+    binaryTestResults.from(apolloTestAggregationConsumer.incoming.artifactView { lenient(true) }.files)
 
     output = file("build/apolloTestAggregation.txt")
   }

build-logic/src/main/kotlin/RootProject.kt

@@ -3,11 +3,16 @@ import app.cash.licensee.UnusedAction
 import com.gradleup.librarian.gradle.Librarian
 import nmcp.NmcpAggregationExtension
 import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.plugin.ExecutionTaskHolder
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
+import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
+import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.toJavaDuration
@@ -31,6 +36,8 @@ fun Project.apolloLibrary(
     androidOptions: AndroidOptions? = null,
     publish: Boolean = true,
     kotlinCompilerOptions: KotlinCompilerOptions = KotlinCompilerOptions(),
+    contributesCtng: Boolean = true,
+    enableWasmJsTests: Boolean = true
 ) {
   group = property("GROUP")!!
   version = version()
@@ -73,6 +80,61 @@ fun Project.apolloLibrary(
   }
 
   configureTesting()
+  project.kotlinTargets.forEach { target ->
+    /**
+     * Disable every native test except the KotlinNativeTargetWithHostTests to save some time
+     */
+    if (target is KotlinNativeTargetWithSimulatorTests || target is KotlinNativeTargetWithTests<*>) {
+      target.testRuns.configureEach {
+        this as ExecutionTaskHolder<*>
+        executionTask.configure {
+          enabled = false
+        }
+      }
+      target.binaries.configureEach {
+        if (outputKind == NativeOutputKind.TEST) {
+          linkTaskProvider.configure {
+            enabled = false
+          }
+          compilation.compileTaskProvider.configure {
+            enabled = false
+          }
+        }
+      }
+    }
+    /**
+     * Disable wasmJs tests because they are not ready yet
+     */
+    if (!enableWasmJsTests && target is KotlinJsIrTarget && target.wasmTargetType != null) {
+      target.subTargets.configureEach {
+        testRuns.configureEach {
+          executionTask.configure {
+            enabled = false
+          }
+        }
+      }
+      target.testRuns.configureEach {
+        executionTask.configure {
+          enabled = false
+        }
+      }
+      target.binaries.configureEach {
+        compilation.compileTaskProvider.configure {
+          enabled = false
+        }
+      }
+    }
+  }
+  /**
+   * `ctng` is short for CiTestNoGradle. It's a shorthand task that runs all the `build`
+   * tasks except the Gradle plugin one because it is slow.
+   * the name is for historical reasons.
+   */
+  tasks.register("ctng") {
+    if (contributesCtng) {
+      dependsOn("build")
+    }
+  }
 
   tasks.withType(Jar::class.java).configureEach {
     manifest {
@@ -98,6 +160,15 @@ fun Project.apolloLibrary(
   }
 }
 
+private val Project.kotlinTargets: Collection<KotlinTarget>
+  get() {
+    when (val kotlin = extensions.getByName("kotlin")) {
+      is KotlinJvmExtension -> return listOf(kotlin.target)
+      is KotlinMultiplatformExtension -> return kotlin.targets
+      else -> return emptyList()
+    }
+  }
+
 fun Project.apolloLibrary(
     namespace: String,
     jvmTarget: Int? = null,
@@ -109,6 +180,8 @@ fun Project.apolloLibrary(
     androidOptions: AndroidOptions? = null,
     publish: Boolean = true,
     kotlinCompilerOptions: KotlinCompilerOptions = KotlinCompilerOptions(),
+    contributesCtng: Boolean = true,
+    enableWasmJsTests: Boolean = true,
 ) {
   val defaultTargets = defaultTargets(
       withJvm = withJvm,
@@ -120,12 +193,14 @@ fun Project.apolloLibrary(
   )
 
   apolloLibrary(
-      namespace,
-      jvmTarget,
-      defaultTargets,
-      androidOptions,
-      publish,
-      kotlinCompilerOptions
+      namespace = namespace,
+      jvmTarget = jvmTarget,
+      defaultTargets = defaultTargets,
+      androidOptions = androidOptions,
+      publish = publish,
+      kotlinCompilerOptions = kotlinCompilerOptions,
+      contributesCtng = contributesCtng,
+      enableWasmJsTests = enableWasmJsTests
   )
 }
 
@@ -134,7 +209,7 @@ fun Project.apolloTest(
     withJvm: Boolean = true,
     appleTargets: Set<String> = setOf(hostTarget),
     kotlinCompilerOptions: KotlinCompilerOptions = KotlinCompilerOptions(),
-    jvmTarget: Int? = null
+    jvmTarget: Int? = null,
 ) {
   apolloTest(
       kotlinCompilerOptions = kotlinCompilerOptions,

build-logic/src/main/kotlin/TestConventionPlugin.kt

@@ -1,5 +1,4 @@
 import kotlinx.validation.ExperimentalBCVApi
-import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeHostTest
 
 plugins {
   id("base")
@@ -11,70 +10,10 @@ buildscript {
   }
 }
 
-apply(plugin = "com.github.ben-manes.versions")
 apply(plugin = "org.jetbrains.kotlinx.binary-compatibility-validator")
 
 version = property("VERSION_NAME")!!
 
-fun subprojectTasks(name: String): List<Task> {
-  return subprojects.flatMap { subproject ->
-    subproject.tasks.matching { it.name == name }
-  }
-}
-
-tasks.register("ciTestsGradle") {
-  description = "Execute the Gradle tests (slow)"
-  dependsOn(":apollo-gradle-plugin:test")
-}
-
-tasks.register("ciTestsNoGradle") {
-  description = """Execute all tests from the root project except: 
-    | - the Gradle ones
-    | - most of the Apple tests. Instead it just executes macosX64 tests to save time
-    | - the IntelliJ plugin tests - they are run in a dedicated job
-  """.trimMargin()
-
-
-  subprojects {
-    if (name !in setOf("apollo-gradle-plugin")) {
-      dependsOn(tasks.matching { it.name == "test" })
-    }
-    dependsOn(tasks.matching { it.name == "jvmTest" })
-    dependsOn(tasks.matching { it.name == "jsNodeTest" })
-    dependsOn(tasks.withType(KotlinNativeHostTest::class.java))
-    dependsOn(tasks.matching { it.name == "apiCheck" })
-    dependsOn(tasks.matching { it.name == "licensee" })
-  }
-
-  /**
-   * Update the database schemas in CI
-   */
-  dependsOn(":apollo-normalized-cache-sqlite:generateCommonMainJsonDatabaseSchema")
-
-  doLast {
-    if (isCIBuild()) {
-      checkGitStatus()
-    }
-  }
-}
-
-/**
- * Shorthands for less typing during development
- */
-tasks.register("ctng") {
-  dependsOn("ciTestsNoGradle")
-}
-tasks.register("ctg") {
-  dependsOn("ciTestsGradle")
-}
-
-tasks.named("dependencyUpdates").configure {
-  (this as com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask)
-  rejectVersionIf {
-    listOf("alpha", "beta", "rc").any { candidate.version.lowercase().contains(it) }
-  }
-}
-
 configure<kotlinx.validation.ApiValidationExtension> {
   @OptIn(ExperimentalBCVApi::class)
   klib.enabled = true

build-logic/src/main/kotlin/api.kt

@@ -90,7 +90,6 @@ assertj = { group = "org.assertj", name = "assertj-core", version = "3.27.4" }
 atomicfu-library = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "atomicfu" }
 atomicfu-plugin = { group = "org.jetbrains.kotlinx", name = "atomicfu-gradle-plugin", version.ref = "atomicfu" }
 
-benmanes-versions = { group = "com.github.ben-manes", name = "gradle-versions-plugin", version = "0.33.0" }
 compat-patrouille = { module = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin", version.ref = "compat-patrouille" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
 compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }

build.gradle.kts

@@ -50,7 +50,6 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
         forRepository(::gradlePluginPortal)
         filter {
           includeModule("org.jetbrains.kotlinx", "kotlinx-benchmark-plugin")
-          includeModule("com.github.ben-manes", "gradle-versions-plugin")
           includeModule("com.gradle", "develocity-gradle-plugin")
         }
       }

gradle/libraries.toml

@@ -9,6 +9,7 @@ plugins {
 
 apolloLibrary(
     namespace = "com.apollographql.apollo.ast",
+    enableWasmJsTests = false
 )
 
 kotlin {