From e69e282960d04d68ad89ae6af3a968f142b85e10 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 25 Nov 2024 12:28:01 -0500 Subject: [PATCH] feat(core): add gradle plugin --- e2e/gradle/src/utils/create-gradle-project.ts | 38 +- .../gradle/native}/.gitattributes | 0 packages/gradle/native/.gitignore | 5 + packages/gradle/native/gradle.properties | 6 + .../gradle/native}/gradle/libs.versions.toml | 3 + .../native}/gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 +- .../gradle => packages/gradle/native}/gradlew | 6 +- .../gradle/native}/gradlew.bat | 22 +- .../gradle/native/plugin/build.gradle.kts | 33 ++ .../io/nx/gradle/plugin/CreateNodesTask.kt | 192 ++++++++ .../main/kotlin/io/nx/gradle/plugin/Nodes.kt | 21 + packages/gradle/native/settings.gradle.kts | 10 + packages/gradle/package.json | 1 + .../{plugin.spec.ts => plugin-v1.spec.ts} | 56 +-- packages/gradle/plugin-v1.ts | 2 + packages/gradle/plugin.ts | 2 +- packages/gradle/project.json | 5 + packages/gradle/src/generators/init/init.ts | 51 +- .../20-2-0/add-include-subprojects-tasks.ts | 2 +- .../dependencies.spec.ts | 2 - packages/gradle/src/plugin-v1/dependencies.ts | 144 ++++++ .../src/{plugin => plugin-v1}/nodes.spec.ts | 4 +- packages/gradle/src/plugin-v1/nodes.ts | 435 ++++++++++++++++++ .../gradle-composite-dependencies.txt | 0 .../utils/__mocks__/gradle-dependencies.txt | 0 .../gradle-project-report-println.txt | 0 .../utils/__mocks__/gradle-project-report.txt | 0 ...radle-properties-report-child-projects.txt | 0 ...le-properties-report-no-child-projects.txt | 0 .../utils/get-gradle-report.spec.ts | 0 .../utils/get-gradle-report.ts | 9 +- .../utils/get-project-report-lines.ts | 10 +- packages/gradle/src/plugin/dependencies.ts | 165 ++----- packages/gradle/src/plugin/nodes.ts | 372 ++------------- .../plugin/utils/get-create-nodes-lines.ts | 47 ++ .../utils/get-nodes-from-gradle-plugin.ts | 164 +++++++ packages/gradle/src/utils/exec-gradle.ts | 8 + packages/gradle/src/utils/versions.ts | 9 + 39 files changed, 1222 insertions(+), 607 deletions(-) rename {e2e/gradle => packages/gradle/native}/.gitattributes (100%) create mode 100644 packages/gradle/native/.gitignore create mode 100644 packages/gradle/native/gradle.properties rename {e2e/gradle => packages/gradle/native}/gradle/libs.versions.toml (66%) rename {e2e/gradle => packages/gradle/native}/gradle/wrapper/gradle-wrapper.jar (69%) rename {e2e/gradle => packages/gradle/native}/gradle/wrapper/gradle-wrapper.properties (74%) rename {e2e/gradle => packages/gradle/native}/gradlew (96%) rename {e2e/gradle => packages/gradle/native}/gradlew.bat (91%) create mode 100644 packages/gradle/native/plugin/build.gradle.kts create mode 100644 packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/CreateNodesTask.kt create mode 100644 packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/Nodes.kt create mode 100644 packages/gradle/native/settings.gradle.kts rename packages/gradle/{plugin.spec.ts => plugin-v1.spec.ts} (58%) create mode 100644 packages/gradle/plugin-v1.ts rename packages/gradle/src/{plugin => plugin-v1}/dependencies.spec.ts (99%) create mode 100644 packages/gradle/src/plugin-v1/dependencies.ts rename packages/gradle/src/{plugin => plugin-v1}/nodes.spec.ts (99%) create mode 100644 packages/gradle/src/plugin-v1/nodes.ts rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-composite-dependencies.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-dependencies.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-project-report-println.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-project-report.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-properties-report-child-projects.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/__mocks__/gradle-properties-report-no-child-projects.txt (100%) rename packages/gradle/src/{ => plugin-v1}/utils/get-gradle-report.spec.ts (100%) rename packages/gradle/src/{ => plugin-v1}/utils/get-gradle-report.ts (98%) rename packages/gradle/src/{ => plugin-v1}/utils/get-project-report-lines.ts (88%) create mode 100644 packages/gradle/src/plugin/utils/get-create-nodes-lines.ts create mode 100644 packages/gradle/src/plugin/utils/get-nodes-from-gradle-plugin.ts diff --git a/e2e/gradle/src/utils/create-gradle-project.ts b/e2e/gradle/src/utils/create-gradle-project.ts index 1e4755082e1b7..3cdfe94b23fa0 100644 --- a/e2e/gradle/src/utils/create-gradle-project.ts +++ b/e2e/gradle/src/utils/create-gradle-project.ts @@ -3,6 +3,7 @@ import { isWindows, runCommand, tmpProjPath, + updateFile, } from '@nx/e2e/utils'; import { execSync } from 'child_process'; import { createFileSync, writeFileSync } from 'fs-extra'; @@ -15,14 +16,10 @@ export function createGradleProject( packageName: string = 'gradleProject', addProjectJsonNamePrefix: string = '' ) { - e2eConsoleLogger( - `Using java version: ${execSync('java -version')} ${execSync( - 'echo $JAVA_HOME' - )}` - ); + e2eConsoleLogger(`Using java version: ${execSync('java -version')}`); const gradleCommand = isWindows() - ? resolve(`${__dirname}/../../gradlew.bat`) - : resolve(`${__dirname}/../../gradlew`); + ? resolve(`${__dirname}/../../../../packages/gradle/native/gradlew.bat`) + : resolve(`${__dirname}/../../../../packages/gradle/native/gradlew`); e2eConsoleLogger( 'Using gradle version: ' + execSync(`${gradleCommand} --version`, { @@ -60,4 +57,31 @@ export function createGradleProject( `{"name": "${addProjectJsonNamePrefix}utilities"}` ); } + + addLocalPluginManagement(`settings.gradle${type === 'kotlin' ? '.kts' : ''}`); + addLocalPluginManagement( + `buildSrc/settings.gradle${type === 'kotlin' ? '.kts' : ''}` + ); + + e2eConsoleLogger( + execSync(`${gradleCommand} publishToMavenLocal`, { + cwd: `${__dirname}/../../../../packages/gradle/native`, + }).toString() + ); +} + +function addLocalPluginManagement(file: string) { + updateFile( + file, + (content) => + `pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + mavenCentral() + // Add other repositories if needed + } +} +` + content + ); } diff --git a/e2e/gradle/.gitattributes b/packages/gradle/native/.gitattributes similarity index 100% rename from e2e/gradle/.gitattributes rename to packages/gradle/native/.gitattributes diff --git a/packages/gradle/native/.gitignore b/packages/gradle/native/.gitignore new file mode 100644 index 0000000000000..1b6985c0094c8 --- /dev/null +++ b/packages/gradle/native/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/packages/gradle/native/gradle.properties b/packages/gradle/native/gradle.properties new file mode 100644 index 0000000000000..f7583eca2985b --- /dev/null +++ b/packages/gradle/native/gradle.properties @@ -0,0 +1,6 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true +version=0.0.1 diff --git a/e2e/gradle/gradle/libs.versions.toml b/packages/gradle/native/gradle/libs.versions.toml similarity index 66% rename from e2e/gradle/gradle/libs.versions.toml rename to packages/gradle/native/gradle/libs.versions.toml index 4ac3234a6a7c3..387b04dd62a65 100644 --- a/e2e/gradle/gradle/libs.versions.toml +++ b/packages/gradle/native/gradle/libs.versions.toml @@ -1,2 +1,5 @@ # This file was generated by the Gradle 'init' task. # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[plugins] +jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.20" } diff --git a/e2e/gradle/gradle/wrapper/gradle-wrapper.jar b/packages/gradle/native/gradle/wrapper/gradle-wrapper.jar similarity index 69% rename from e2e/gradle/gradle/wrapper/gradle-wrapper.jar rename to packages/gradle/native/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/e2e/gradle/gradle/wrapper/gradle-wrapper.properties b/packages/gradle/native/gradle/wrapper/gradle-wrapper.properties similarity index 74% rename from e2e/gradle/gradle/wrapper/gradle-wrapper.properties rename to packages/gradle/native/gradle/wrapper/gradle-wrapper.properties index a0777a32ceeb7..cea7a793a84b4 100644 --- a/e2e/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/packages/gradle/native/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip -validateDistributionUrl=false +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/e2e/gradle/gradlew b/packages/gradle/native/gradlew similarity index 96% rename from e2e/gradle/gradlew rename to packages/gradle/native/gradlew index 1aa94a4269074..f3b75f3b0d4fa 100755 --- a/e2e/gradle/gradlew +++ b/packages/gradle/native/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/e2e/gradle/gradlew.bat b/packages/gradle/native/gradlew.bat similarity index 91% rename from e2e/gradle/gradlew.bat rename to packages/gradle/native/gradlew.bat index 93e3f59f135dd..9d21a21834d51 100644 --- a/e2e/gradle/gradlew.bat +++ b/packages/gradle/native/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/packages/gradle/native/plugin/build.gradle.kts b/packages/gradle/native/plugin/build.gradle.kts new file mode 100644 index 0000000000000..57475b238ae26 --- /dev/null +++ b/packages/gradle/native/plugin/build.gradle.kts @@ -0,0 +1,33 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Gradle plugin project to get you started. + * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.5/userguide/custom_plugins.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins + `java-gradle-plugin` + `maven-publish` + + // Apply the Kotlin JVM plugin to add support for Kotlin. + alias(libs.plugins.jvm) +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +gradlePlugin { + // Define the plugin + val Nodes by plugins.creating { + id = "io.nx.gradle.plugin.Nodes" + implementationClass = "io.nx.gradle.plugin.Nodes" + } +} + +dependencies { + implementation("com.google.code.gson:gson:2.11.0") +} diff --git a/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/CreateNodesTask.kt b/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/CreateNodesTask.kt new file mode 100644 index 0000000000000..be98ac8f43d21 --- /dev/null +++ b/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/CreateNodesTask.kt @@ -0,0 +1,192 @@ +package io.nx.gradle.plugin + +import org.gradle.api.DefaultTask +import org.gradle.api.Project +import java.io.File +import org.gradle.api.tasks.options.Option +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.TaskAction +import org.gradle.api.artifacts.ProjectDependency +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import java.lang.Error +import java.nio.file.Path + +data class GradleTargets(val targets: MutableMap, val targetGroups: MutableMap>) +data class Metadata(val targetGroups: MutableMap>, val technologies: Array, val description: String?) +data class ProjectConfiguration(val targets: MutableMap, val metadata: Metadata, val name: String) +data class Dependency(val source: String, val target: String, val sourceFile: String) +data class Node(val project: ProjectConfiguration, val dependencies: MutableSet) + +abstract class CreateNodesTask : DefaultTask() { + @Option(option = "outputDirectory", description = "Output directory, default to {workspaceRoot}/.nx/cache") + @Input + var outputDirectory: String = "" + + @Option(option = "workspaceRoot", description = "Workspace root, default to cwd") + @Input + var workspaceRoot: String = "" + + @TaskAction + fun action() { + val rootProjectDirectory = project.getProjectDir() + if (workspaceRoot == "") { + // assign the workspace root to root project's path + workspaceRoot = System.getProperty("user.dir") + } + if (outputDirectory == "") { + outputDirectory = File(workspaceRoot, ".nx/cache").getPath() + } + + val projectNodes = mutableMapOf() + project.getAllprojects().forEach { project -> + try { + // get dependencies of project + val dependencies = getDependenciesForProject(project) + + val gradleTargets = this.processTargetsForProject(project, workspaceRoot, rootProjectDirectory) + var projectRoot = project.getProjectDir().getPath() + val projectConfig = ProjectConfiguration( + gradleTargets.targets, + Metadata(gradleTargets.targetGroups, arrayOf("Gradle"), project.getDescription()), + project.getName() + ) + projectNodes.put(projectRoot, Node(projectConfig, dependencies)) + } catch (e: Error) { + } // ignore errors + } + val gson = Gson() + val json = gson.toJson(projectNodes) + val file = File(outputDirectory, "${project.name}.json") + file.writeText(json) + println(file) + } + + fun processTargetsForProject( + project: Project, + workspaceRoot: String, + rootProjectDirectory: File + ): GradleTargets { + val targets = mutableMapOf(); + val targetGroups = mutableMapOf>(); + val projectRoot = project.getProjectDir().getPath() + + var command: String; + val operSys = System.getProperty("os.name").lowercase(); + if (operSys.contains("win")) { + command = ".\\gradlew.bat " + } else { + command = "./gradlew " + } + command += project.getBuildTreePath() + if (!command.endsWith(":")) { + command += ":" + } + + project.getTasks().forEach { task -> + val target = mutableMapOf() + val metadata = mutableMapOf() + var taskCommand = command.toString() + metadata.put("description", task.getDescription()) + metadata.put("technologies", arrayOf("Gradle")) + val group: String? = task.getGroup(); + if (!group.isNullOrBlank()) { + if (targetGroups.contains(group)) { + targetGroups.get(group)?.add(task.name) + } else { + targetGroups.set(group, mutableListOf(task.name)) + } + } + + var inputs = task.getInputs().getSourceFiles() + if (!inputs.isEmpty()) { + target.put("inputs", inputs.mapNotNull { file -> + val path: String = file.getPath() + replaceRootInPath(path, projectRoot, workspaceRoot) + }) + } + val outputs = task.getOutputs().getFiles() + if (!outputs.isEmpty()) { + target.put("outputs", outputs.mapNotNull { file -> + val path: String = file.getPath() + replaceRootInPath(path, projectRoot, workspaceRoot) + }) + } + target.put("cache", true) + + val dependsOn = task.getTaskDependencies().getDependencies(task) + if (!dependsOn.isEmpty()) { + target.put("dependsOn", dependsOn.map { depTask -> + val depProject = depTask.getProject() + if (depProject == project) { + depTask.name + } + "${depProject.name}:${depTask.name}" + }) + } + target.put("metadata", metadata) + + taskCommand += task.name + target.put("command", taskCommand) + target.put("options", mapOf("cwd" to rootProjectDirectory.getPath())) + + targets.put(task.name, target) + } + + return GradleTargets( + targets, + targetGroups + ); + } +} + +fun replaceRootInPath(p: String, projectRoot: String, workspaceRoot: String): String? { + var path = p + if (path.startsWith(projectRoot)) { + path = path.replace(projectRoot, "{projectRoot}") + return path + } else if (path.startsWith(workspaceRoot)) { + path = path.replace(workspaceRoot, "{workspaceRoot}") + return path + } + return null +} + +fun getDependenciesForProject(project: Project): MutableSet { + var dependencies = mutableSetOf(); + project.getConfigurations().filter { config -> + val configName = config.name + configName == "compileClasspath" || configName == "implementationDependenciesMetadata" + }.forEach { + it.getAllDependencies().filter { + it is ProjectDependency + }.forEach { + dependencies.add( + Dependency( + project.getProjectDir().getPath(), + it.getName(), + project.getBuildFile().getPath() + ) + ) + } + } + project.getSubprojects().forEach { childProject -> + dependencies.add( + Dependency( + project.getProjectDir().getPath(), + childProject.getProjectDir().getPath(), + project.getBuildFile().getPath() + ) + ) + } + project.getGradle().includedBuilds.forEach { includedBuild -> + dependencies.add( + Dependency( + project.getProjectDir().getPath(), + includedBuild.getProjectDir().getPath(), + project.getBuildFile().getPath() + ) + ) + } + return dependencies +} diff --git a/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/Nodes.kt b/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/Nodes.kt new file mode 100644 index 0000000000000..58be693af8fa7 --- /dev/null +++ b/packages/gradle/native/plugin/src/main/kotlin/io/nx/gradle/plugin/Nodes.kt @@ -0,0 +1,21 @@ +package io.nx.gradle.plugin + +import org.gradle.api.Project +import org.gradle.api.Plugin + +/** + * A plugin to create nx targets + */ +class Nodes: Plugin { + override fun apply(project: Project) { + // Register a task + project.tasks.register("createNodes", CreateNodesTask::class.java) { task -> + task.setDescription("Create nodes and dependencies for Nx") + task.setGroup("Nx Custom") + // Run task for composite builds + project.getGradle().includedBuilds.forEach { includedBuild -> + task.dependsOn(includedBuild.task(":createNodes")) + } + } + } +} diff --git a/packages/gradle/native/settings.gradle.kts b/packages/gradle/native/settings.gradle.kts new file mode 100644 index 0000000000000..76010820c37a3 --- /dev/null +++ b/packages/gradle/native/settings.gradle.kts @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.5/userguide/building_swift_projects.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +rootProject.name = "plugin" +include("plugin") diff --git a/packages/gradle/package.json b/packages/gradle/package.json index 14f5ebf31c8b5..9b0dcc785710d 100644 --- a/packages/gradle/package.json +++ b/packages/gradle/package.json @@ -26,6 +26,7 @@ "generators": "./generators.json", "exports": { ".": "./index.js", + "./plugin-v1": "./plugin-v1.js", "./package.json": "./package.json", "./migrations.json": "./migrations.json", "./generators.json": "./generators.json" diff --git a/packages/gradle/plugin.spec.ts b/packages/gradle/plugin-v1.spec.ts similarity index 58% rename from packages/gradle/plugin.spec.ts rename to packages/gradle/plugin-v1.spec.ts index 78dc8efe8bb1d..615baea5a50ef 100644 --- a/packages/gradle/plugin.spec.ts +++ b/packages/gradle/plugin-v1.spec.ts @@ -1,10 +1,10 @@ import { CreateNodesContext } from '@nx/devkit'; import { TempFs } from '@nx/devkit/internal-testing-utils'; import { createNodesV2 } from './plugin'; -import { type GradleReport } from './src/utils/get-gradle-report'; +import { type GradleReport } from './src/plugin-v1/utils/get-gradle-report'; let gradleReport: GradleReport; -jest.mock('./src/utils/get-gradle-report', () => { +jest.mock('./src/plugin-v1/utils/get-gradle-report', () => { return { GRADLE_BUILD_FILES: new Set(['build.gradle', 'build.gradle.kts']), populateGradleReport: jest.fn().mockImplementation(() => void 0), @@ -12,7 +12,7 @@ jest.mock('./src/utils/get-gradle-report', () => { }; }); -describe('@nx/gradle/plugin', () => { +describe('@nx/gradle/plugin-v1', () => { let createNodesFunction = createNodesV2[1]; let context: CreateNodesContext; let tempFs: TempFs; @@ -75,55 +75,7 @@ describe('@nx/gradle/plugin', () => { [ [ "proj/build.gradle", - { - "projects": { - "proj": { - "metadata": { - "targetGroups": { - "Verification": [ - "test", - ], - }, - "technologies": [ - "gradle", - ], - }, - "name": "proj", - "projectType": "application", - "targets": { - "test": { - "cache": true, - "command": "./gradlew proj:test", - "dependsOn": [ - "testClasses", - ], - "inputs": [ - "default", - "^production", - ], - "metadata": { - "help": { - "command": "./gradlew help --task proj:test", - "example": { - "options": { - "args": [ - "--rerun", - ], - }, - }, - }, - "technologies": [ - "gradle", - ], - }, - "options": { - "cwd": ".", - }, - }, - }, - }, - }, - }, + {}, ], ] `); diff --git a/packages/gradle/plugin-v1.ts b/packages/gradle/plugin-v1.ts new file mode 100644 index 0000000000000..35195059db7a4 --- /dev/null +++ b/packages/gradle/plugin-v1.ts @@ -0,0 +1,2 @@ +export { createDependencies } from './src/plugin-v1/dependencies'; +export { createNodes, createNodesV2 } from './src/plugin-v1/nodes'; diff --git a/packages/gradle/plugin.ts b/packages/gradle/plugin.ts index c6345f3ebd7c4..f1b3829f076d4 100644 --- a/packages/gradle/plugin.ts +++ b/packages/gradle/plugin.ts @@ -1,2 +1,2 @@ export { createDependencies } from './src/plugin/dependencies'; -export { createNodes, createNodesV2 } from './src/plugin/nodes'; +export { createNodesV2 } from './src/plugin/nodes'; diff --git a/packages/gradle/project.json b/packages/gradle/project.json index 720187647d20e..7b2ffcd5f492d 100644 --- a/packages/gradle/project.json +++ b/packages/gradle/project.json @@ -42,6 +42,11 @@ "glob": "**/*.d.ts", "output": "/" }, + { + "input": "packages/gradle", + "glob": "**/gradle.properties", + "output": "/" + }, { "input": "", "glob": "LICENSE", diff --git a/packages/gradle/src/generators/init/init.ts b/packages/gradle/src/generators/init/init.ts index 2a7f9028ec457..d395508504670 100644 --- a/packages/gradle/src/generators/init/init.ts +++ b/packages/gradle/src/generators/init/init.ts @@ -3,13 +3,12 @@ import { formatFiles, GeneratorCallback, globAsync, - logger, readNxJson, runTasksInSerial, Tree, updateNxJson, } from '@nx/devkit'; -import { nxVersion } from '../../utils/versions'; +import { gradlePluginVersion, nxVersion } from '../../utils/versions'; import { InitGeneratorSchema } from './schema'; import { hasGradlePlugin } from '../../utils/has-gradle-plugin'; import { dirname, join, basename } from 'path'; @@ -90,50 +89,20 @@ function addProjectReportToBuildGradle(settingsGradleFile: string, tree: Tree) { buildGradleContent = tree.read(gradleFilePath).toString(); } - if (buildGradleContent.includes('allprojects')) { - if (!buildGradleContent.includes('"project-report"')) { - logger.warn(`Please add the project-report plugin to your ${gradleFilePath}: -allprojects { - apply { - plugin("project-report") - } -}`); + if (buildGradleContent.includes('plugins {')) { + if (!buildGradleContent.includes('"io.nx.gradle.plugin.Nodes"')) { + buildGradleContent = buildGradleContent.replace( + 'plugins {', + `plugins { + id("io.nx.gradle.plugin.Nodes") version("${gradlePluginVersion}")` + ); } } else { - buildGradleContent += `\n\rallprojects { - apply { - plugin("project-report") - } + buildGradleContent += `\n\rplugins { + id("io.nx.gradle.plugin.Nodes") version("${gradlePluginVersion}") }`; } - if (!buildGradleContent.includes(`tasks.register("projectReportAll")`)) { - if (gradleFilePath.endsWith('.kts')) { - buildGradleContent += `\n\rtasks.register("projectReportAll") { - // All project reports of subprojects - allprojects.forEach { - dependsOn(it.tasks.get("projectReport")) - } - - // All projectReportAll of included builds - gradle.includedBuilds.forEach { - dependsOn(it.task(":projectReportAll")) - } -}`; - } else { - buildGradleContent += `\n\rtasks.register("projectReportAll") { - // All project reports of subprojects - allprojects.forEach { - dependsOn(it.tasks.getAt("projectReport")) - } - - // All projectReportAll of included builds - gradle.includedBuilds.forEach { - dependsOn(it.task(":projectReportAll")) - } - }`; - } - } if (buildGradleContent) { tree.write(gradleFilePath, buildGradleContent); } diff --git a/packages/gradle/src/migrations/20-2-0/add-include-subprojects-tasks.ts b/packages/gradle/src/migrations/20-2-0/add-include-subprojects-tasks.ts index b81506bbdf62c..216edef9bb170 100644 --- a/packages/gradle/src/migrations/20-2-0/add-include-subprojects-tasks.ts +++ b/packages/gradle/src/migrations/20-2-0/add-include-subprojects-tasks.ts @@ -1,6 +1,6 @@ import { Tree, readNxJson, updateNxJson } from '@nx/devkit'; import { hasGradlePlugin } from '../../utils/has-gradle-plugin'; -import { GradlePluginOptions } from '../../plugin/nodes'; +import { GradlePluginOptions } from '../../plugin-v1/nodes'; // This function add options includeSubprojectsTasks as true in nx.json for gradle plugin export default function update(tree: Tree) { diff --git a/packages/gradle/src/plugin/dependencies.spec.ts b/packages/gradle/src/plugin-v1/dependencies.spec.ts similarity index 99% rename from packages/gradle/src/plugin/dependencies.spec.ts rename to packages/gradle/src/plugin-v1/dependencies.spec.ts index 6b79e4616351c..8ca4074bc920d 100644 --- a/packages/gradle/src/plugin/dependencies.spec.ts +++ b/packages/gradle/src/plugin-v1/dependencies.spec.ts @@ -10,7 +10,6 @@ describe('processGradleDependencies', () => { it('should process gradle dependencies with composite build', () => { const depFilePath = join( __dirname, - '..', 'utils/__mocks__/gradle-composite-dependencies.txt' ); const dependencies = new Set([]); @@ -59,7 +58,6 @@ describe('processGradleDependencies', () => { it('should process gradle dependencies with regular build', () => { const depFilePath = join( __dirname, - '..', 'utils/__mocks__/gradle-dependencies.txt' ); const dependencies = new Set([]); diff --git a/packages/gradle/src/plugin-v1/dependencies.ts b/packages/gradle/src/plugin-v1/dependencies.ts new file mode 100644 index 0000000000000..a723f2a215948 --- /dev/null +++ b/packages/gradle/src/plugin-v1/dependencies.ts @@ -0,0 +1,144 @@ +import { + CreateDependencies, + CreateDependenciesContext, + DependencyType, + FileMap, + RawProjectGraphDependency, + validateDependency, +} from '@nx/devkit'; +import { readFileSync } from 'node:fs'; +import { basename, dirname } from 'node:path'; + +import { getCurrentGradleReport } from './utils/get-gradle-report'; +import { GRADLE_BUILD_FILES } from '../utils/split-config-files'; +import { newLineSeparator } from '../utils/exec-gradle'; + +export const createDependencies: CreateDependencies = async ( + _, + context: CreateDependenciesContext +) => { + const gradleFiles: string[] = findGradleFiles(context.filesToProcess); + if (gradleFiles.length === 0) { + return []; + } + + const gradleDependenciesStart = performance.mark('gradleDependencies:start'); + const { + gradleFileToGradleProjectMap, + gradleProjectNameToProjectRootMap, + buildFileToDepsMap, + gradleProjectToChildProjects, + } = getCurrentGradleReport(); + const dependencies: Set = new Set(); + + for (const gradleFile of gradleFiles) { + const gradleProject = gradleFileToGradleProjectMap.get(gradleFile); + const projectName = Object.values(context.projects).find( + (project) => project.root === dirname(gradleFile) + )?.name; + const depsFile = buildFileToDepsMap.get(gradleFile); + + if (projectName && depsFile) { + processGradleDependencies( + depsFile, + gradleProjectNameToProjectRootMap, + projectName, + gradleFile, + context, + dependencies + ); + } + gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => { + if (childProject) { + const dependency: RawProjectGraphDependency = { + source: projectName as string, + target: childProject, + type: DependencyType.static, + sourceFile: gradleFile, + }; + validateDependency(dependency, context); + dependencies.add(dependency); + } + }); + } + + const gradleDependenciesEnd = performance.mark('gradleDependencies:end'); + performance.measure( + 'gradleDependencies', + gradleDependenciesStart.name, + gradleDependenciesEnd.name + ); + + return Array.from(dependencies); +}; + +function findGradleFiles(fileMap: FileMap): string[] { + const gradleFiles: string[] = []; + + for (const [_, files] of Object.entries(fileMap.projectFileMap)) { + for (const file of files) { + if (GRADLE_BUILD_FILES.has(basename(file.file))) { + gradleFiles.push(file.file); + } + } + } + + return gradleFiles; +} + +export function processGradleDependencies( + depsFile: string, + gradleProjectNameToProjectRoot: Map, + sourceProjectName: string, + gradleFile: string, + context: CreateDependenciesContext, + dependencies: Set +): void { + const lines = readFileSync(depsFile).toString().split(newLineSeparator); + let inDeps = false; + for (const line of lines) { + if ( + line.startsWith('implementationDependenciesMetadata') || + line.startsWith('compileClasspath') + ) { + inDeps = true; + continue; + } + + if (inDeps) { + if (line === '') { + inDeps = false; + continue; + } + const [indents, dep] = line.split('--- '); + if (indents === '\\' || indents === '+') { + let gradleProjectName: string | undefined; + if (dep.startsWith('project ')) { + gradleProjectName = dep + .substring('project '.length) + .replace(/ \(n\)$/, '') + .trim(); + } else if (dep.includes('-> project')) { + const [_, projectName] = dep.split('-> project'); + gradleProjectName = projectName.trim(); + } + const targetProjectRoot = gradleProjectNameToProjectRoot.get( + gradleProjectName + ) as string; + const targetProjectName = Object.values(context.projects).find( + (project) => project.root === targetProjectRoot + )?.name; + if (targetProjectName) { + const dependency: RawProjectGraphDependency = { + source: sourceProjectName, + target: targetProjectName, + type: DependencyType.static, + sourceFile: gradleFile, + }; + validateDependency(dependency, context); + dependencies.add(dependency); + } + } + } + } +} diff --git a/packages/gradle/src/plugin/nodes.spec.ts b/packages/gradle/src/plugin-v1/nodes.spec.ts similarity index 99% rename from packages/gradle/src/plugin/nodes.spec.ts rename to packages/gradle/src/plugin-v1/nodes.spec.ts index 2860777af9a02..580d0e4ba0f3b 100644 --- a/packages/gradle/src/plugin/nodes.spec.ts +++ b/packages/gradle/src/plugin-v1/nodes.spec.ts @@ -1,10 +1,10 @@ import { CreateNodesContext } from '@nx/devkit'; import { TempFs } from 'nx/src/internal-testing-utils/temp-fs'; -import { type GradleReport } from '../utils/get-gradle-report'; +import { type GradleReport } from './utils/get-gradle-report'; let gradleReport: GradleReport; -jest.mock('../utils/get-gradle-report', () => { +jest.mock('./utils/get-gradle-report', () => { return { GRADLE_BUILD_FILES: new Set(['build.gradle', 'build.gradle.kts']), populateGradleReport: jest.fn().mockImplementation(() => void 0), diff --git a/packages/gradle/src/plugin-v1/nodes.ts b/packages/gradle/src/plugin-v1/nodes.ts new file mode 100644 index 0000000000000..7c087df75a42e --- /dev/null +++ b/packages/gradle/src/plugin-v1/nodes.ts @@ -0,0 +1,435 @@ +import { + CreateNodes, + CreateNodesV2, + CreateNodesContext, + ProjectConfiguration, + TargetConfiguration, + createNodesFromFiles, + readJsonFile, + writeJsonFile, + CreateNodesFunction, + logger, +} from '@nx/devkit'; +import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; +import { existsSync } from 'node:fs'; +import { basename, dirname, join } from 'node:path'; +import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; +import { findProjectForPath } from 'nx/src/devkit-internals'; + +import { + populateGradleReport, + getCurrentGradleReport, + GradleReport, +} from './utils/get-gradle-report'; +import { hashObject } from 'nx/src/hasher/file-hasher'; +import { + gradleConfigAndTestGlob, + gradleConfigGlob, + splitConfigFiles, +} from '../utils/split-config-files'; +import { getGradleExecFile, findGraldewFile } from '../utils/exec-gradle'; + +const cacheableTaskType = new Set(['Build', 'Verification']); +const dependsOnMap = { + build: ['^build', 'classes', 'test'], + testClasses: ['classes'], + test: ['testClasses'], + classes: ['^classes'], +}; + +interface GradleTask { + type: string; + name: string; +} + +export interface GradlePluginOptions { + includeSubprojectsTasks?: boolean; // default is false, show all gradle tasks in the project + ciTargetName?: string; + testTargetName?: string; + classesTargetName?: string; + buildTargetName?: string; + [taskTargetName: string]: string | undefined | boolean; +} + +function normalizeOptions(options: GradlePluginOptions): GradlePluginOptions { + options ??= {}; + options.testTargetName ??= 'test'; + options.classesTargetName ??= 'classes'; + options.buildTargetName ??= 'build'; + return options; +} + +type GradleTargets = Record>; + +function readTargetsCache(cachePath: string): GradleTargets { + return existsSync(cachePath) ? readJsonFile(cachePath) : {}; +} + +export function writeTargetsToCache(cachePath: string, results: GradleTargets) { + writeJsonFile(cachePath, results); +} + +export const createNodesV2: CreateNodesV2 = [ + gradleConfigAndTestGlob, + async (files, options, context) => { + const { buildFiles, projectRoots, gradlewFiles, testFiles } = + splitConfigFiles(files); + const optionsHash = hashObject(options); + const cachePath = join( + workspaceDataDirectory, + `gradle-${optionsHash}.hash` + ); + const targetsCache = readTargetsCache(cachePath); + + await populateGradleReport( + context.workspaceRoot, + gradlewFiles.map((f) => join(context.workspaceRoot, f)) + ); + const gradleReport = getCurrentGradleReport(); + const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap( + testFiles, + projectRoots + ); + + try { + return createNodesFromFiles( + makeCreateNodesForGradleConfigFile( + gradleReport, + targetsCache, + gradleProjectRootToTestFilesMap + ), + buildFiles, + options, + context + ); + } finally { + writeTargetsToCache(cachePath, targetsCache); + } + }, +]; + +export const makeCreateNodesForGradleConfigFile = + ( + gradleReport: GradleReport, + targetsCache: GradleTargets = {}, + gradleProjectRootToTestFilesMap: Record = {} + ): CreateNodesFunction => + async ( + gradleFilePath, + options: GradlePluginOptions | undefined, + context: CreateNodesContext + ) => { + const projectRoot = dirname(gradleFilePath); + options = normalizeOptions(options); + + const hash = await calculateHashForCreateNodes( + projectRoot, + options ?? {}, + context + ); + targetsCache[hash] ??= await createGradleProject( + gradleReport, + gradleFilePath, + options, + context, + gradleProjectRootToTestFilesMap[projectRoot] + ); + const project = targetsCache[hash]; + if (!project) { + return {}; + } + return { + projects: { + [projectRoot]: project, + }, + }; + }; + +/** + @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead. + This function will change to the v2 function in Nx 20. + */ +export const createNodes: CreateNodes = [ + gradleConfigGlob, + async (buildFile, options, context) => { + logger.warn( + '`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.' + ); + const { gradlewFiles } = splitConfigFiles(context.configFiles); + await populateGradleReport(context.workspaceRoot, gradlewFiles); + const gradleReport = getCurrentGradleReport(); + const internalCreateNodes = + makeCreateNodesForGradleConfigFile(gradleReport); + return await internalCreateNodes(buildFile, options, context); + }, +]; + +async function createGradleProject( + gradleReport: GradleReport, + gradleFilePath: string, + options: GradlePluginOptions | undefined, + context: CreateNodesContext, + testFiles = [] +) { + try { + const { + gradleProjectToTasksTypeMap, + gradleProjectToTasksMap, + gradleFileToOutputDirsMap, + gradleFileToGradleProjectMap, + gradleProjectToProjectName, + } = gradleReport; + + const gradleProject = gradleFileToGradleProjectMap.get( + gradleFilePath + ) as string; + const projectName = gradleProjectToProjectName.get(gradleProject); + if (!projectName) { + return; + } + + const tasksTypeMap: Map = gradleProjectToTasksTypeMap.get( + gradleProject + ) as Map; + const tasksSet = gradleProjectToTasksMap.get(gradleProject) as Set; + let tasks: GradleTask[] = []; + tasksSet.forEach((taskName) => { + tasks.push({ + type: tasksTypeMap.get(taskName) as string, + name: taskName, + }); + }); + if (options.includeSubprojectsTasks) { + tasksTypeMap.forEach((taskType, taskName) => { + if (!tasksSet.has(taskName)) { + tasks.push({ + type: taskType, + name: taskName, + }); + } + }); + } + + const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath) as Map< + string, + string + >; + + const { targets, targetGroups } = await createGradleTargets( + tasks, + options, + context, + outputDirs, + gradleProject, + gradleFilePath, + testFiles + ); + const project: Partial = { + name: projectName, + projectType: 'application', + targets, + metadata: { + targetGroups, + technologies: ['gradle'], + }, + }; + + return project; + } catch (e) { + console.error(e); + return undefined; + } +} + +async function createGradleTargets( + tasks: GradleTask[], + options: GradlePluginOptions | undefined, + context: CreateNodesContext, + outputDirs: Map, + gradleProject: string, + gradleBuildFilePath: string, + testFiles: string[] = [] +): Promise<{ + targetGroups: Record; + targets: Record; +}> { + const inputsMap = createInputsMap(context); + const gradlewFileDirectory = dirname( + findGraldewFile(gradleBuildFilePath, context.workspaceRoot) + ); + + const targets: Record = {}; + const targetGroups: Record = {}; + for (const task of tasks) { + const targetName = options?.[`${task.name}TargetName`] ?? task.name; + + let outputs = [outputDirs.get(task.name)].filter(Boolean); + if (task.name === 'test') { + outputs = [ + outputDirs.get('testReport'), + outputDirs.get('testResults'), + ].filter(Boolean); + getTestCiTargets( + testFiles, + gradleProject, + targetName as string, + options.ciTargetName, + inputsMap['test'], + outputs, + task.type, + targets, + targetGroups, + gradlewFileDirectory + ); + } + + const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}${ + task.name + }`; + + targets[targetName as string] = { + command: `${getGradleExecFile()} ${taskCommandToRun}`, + options: { + cwd: gradlewFileDirectory, + }, + cache: cacheableTaskType.has(task.type), + inputs: inputsMap[task.name], + dependsOn: dependsOnMap[task.name], + metadata: { + technologies: ['gradle'], + help: { + command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, + example: { + options: { + args: ['--rerun'], + }, + }, + }, + }, + ...(outputs && outputs.length ? { outputs } : {}), + }; + + if (task.type) { + if (!targetGroups[task.type]) { + targetGroups[task.type] = []; + } + targetGroups[task.type].push(targetName as string); + } + } + return { targetGroups, targets }; +} + +function createInputsMap( + context: CreateNodesContext +): Record { + const namedInputs = context.nxJsonConfiguration.namedInputs; + return { + build: namedInputs?.production + ? ['production', '^production'] + : ['default', '^default'], + test: ['default', namedInputs?.production ? '^production' : '^default'], + classes: namedInputs?.production + ? ['production', '^production'] + : ['default', '^default'], + }; +} + +function getTestCiTargets( + testFiles: string[], + gradleProject: string, + testTargetName: string, + ciTargetName: string, + inputs: TargetConfiguration['inputs'], + outputs: string[], + targetGroupName: string, + targets: Record, + targetGroups: Record, + gradlewFileDirectory: string +): void { + if (!testFiles || testFiles.length === 0 || !ciTargetName) { + return; + } + const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}test`; + + if (!targetGroups[targetGroupName]) { + targetGroups[targetGroupName] = []; + } + + const dependsOn: TargetConfiguration['dependsOn'] = []; + testFiles.forEach((testFile) => { + const testName = basename(testFile).split('.')[0]; + const targetName = ciTargetName + '--' + testName; + + targets[targetName] = { + command: `${getGradleExecFile()} ${taskCommandToRun} --tests ${testName}`, + options: { + cwd: gradlewFileDirectory, + }, + cache: true, + inputs, + dependsOn: dependsOnMap['test'], + metadata: { + technologies: ['gradle'], + description: `Runs Gradle test ${testFile} in CI`, + help: { + command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, + example: { + options: { + args: ['--rerun'], + }, + }, + }, + }, + ...(outputs && outputs.length > 0 ? { outputs } : {}), + }; + targetGroups[targetGroupName].push(targetName); + dependsOn.push({ + target: targetName, + projects: 'self', + params: 'forward', + }); + }); + + targets[ciTargetName] = { + executor: 'nx:noop', + cache: true, + inputs, + dependsOn: dependsOn, + ...(outputs && outputs.length > 0 ? { outputs } : {}), + metadata: { + technologies: ['gradle'], + description: 'Runs Gradle Tests in CI', + nonAtomizedTarget: testTargetName, + help: { + command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, + example: { + options: { + args: ['--rerun'], + }, + }, + }, + }, + }; + targetGroups[targetGroupName].push(ciTargetName); +} + +function getGradleProjectRootToTestFilesMap( + testFiles: string[], + projectRoots: string[] +): Record | undefined { + if (testFiles.length === 0 || projectRoots.length === 0) { + return; + } + const roots = new Map(projectRoots.map((root) => [root, root])); + const testFilesToGradleProjectMap: Record = {}; + testFiles.forEach((testFile) => { + const projectRoot = findProjectForPath(testFile, roots); + if (projectRoot) { + if (!testFilesToGradleProjectMap[projectRoot]) { + testFilesToGradleProjectMap[projectRoot] = []; + } + testFilesToGradleProjectMap[projectRoot].push(testFile); + } + }); + return testFilesToGradleProjectMap; +} diff --git a/packages/gradle/src/utils/__mocks__/gradle-composite-dependencies.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-composite-dependencies.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-composite-dependencies.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-composite-dependencies.txt diff --git a/packages/gradle/src/utils/__mocks__/gradle-dependencies.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-dependencies.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-dependencies.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-dependencies.txt diff --git a/packages/gradle/src/utils/__mocks__/gradle-project-report-println.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-project-report-println.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-project-report-println.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-project-report-println.txt diff --git a/packages/gradle/src/utils/__mocks__/gradle-project-report.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-project-report.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-project-report.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-project-report.txt diff --git a/packages/gradle/src/utils/__mocks__/gradle-properties-report-child-projects.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-properties-report-child-projects.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-properties-report-child-projects.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-properties-report-child-projects.txt diff --git a/packages/gradle/src/utils/__mocks__/gradle-properties-report-no-child-projects.txt b/packages/gradle/src/plugin-v1/utils/__mocks__/gradle-properties-report-no-child-projects.txt similarity index 100% rename from packages/gradle/src/utils/__mocks__/gradle-properties-report-no-child-projects.txt rename to packages/gradle/src/plugin-v1/utils/__mocks__/gradle-properties-report-no-child-projects.txt diff --git a/packages/gradle/src/utils/get-gradle-report.spec.ts b/packages/gradle/src/plugin-v1/utils/get-gradle-report.spec.ts similarity index 100% rename from packages/gradle/src/utils/get-gradle-report.spec.ts rename to packages/gradle/src/plugin-v1/utils/get-gradle-report.spec.ts diff --git a/packages/gradle/src/utils/get-gradle-report.ts b/packages/gradle/src/plugin-v1/utils/get-gradle-report.ts similarity index 98% rename from packages/gradle/src/utils/get-gradle-report.ts rename to packages/gradle/src/plugin-v1/utils/get-gradle-report.ts index f9de425ba8701..c12079050889e 100644 --- a/packages/gradle/src/utils/get-gradle-report.ts +++ b/packages/gradle/src/plugin-v1/utils/get-gradle-report.ts @@ -11,13 +11,10 @@ import { import { hashWithWorkspaceContext } from 'nx/src/utils/workspace-context'; import { dirname } from 'path'; -import { gradleConfigAndTestGlob } from './split-config-files'; -import { - getProjectReportLines, - fileSeparator, - newLineSeparator, -} from './get-project-report-lines'; +import { gradleConfigAndTestGlob } from '../../utils/split-config-files'; +import { getProjectReportLines } from './get-project-report-lines'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; +import { fileSeparator, newLineSeparator } from '../../utils/exec-gradle'; export interface GradleReport { gradleFileToGradleProjectMap: Map; diff --git a/packages/gradle/src/utils/get-project-report-lines.ts b/packages/gradle/src/plugin-v1/utils/get-project-report-lines.ts similarity index 88% rename from packages/gradle/src/utils/get-project-report-lines.ts rename to packages/gradle/src/plugin-v1/utils/get-project-report-lines.ts index ddeaf341c7861..988cd9d39d1e4 100644 --- a/packages/gradle/src/utils/get-project-report-lines.ts +++ b/packages/gradle/src/plugin-v1/utils/get-project-report-lines.ts @@ -1,16 +1,8 @@ import { AggregateCreateNodesError, logger } from '@nx/devkit'; -import { execGradleAsync } from './exec-gradle'; +import { execGradleAsync, newLineSeparator } from '../../utils/exec-gradle'; import { existsSync } from 'fs'; import { dirname, join } from 'path'; -export const fileSeparator = process.platform.startsWith('win') - ? 'file:///' - : 'file://'; - -export const newLineSeparator = process.platform.startsWith('win') - ? '\r\n' - : '\n'; - /** * This function executes the gradle projectReportAll task and returns the output as an array of lines. * @param gradlewFile the absolute path to the gradlew file diff --git a/packages/gradle/src/plugin/dependencies.ts b/packages/gradle/src/plugin/dependencies.ts index d306713064227..426844eac40c5 100644 --- a/packages/gradle/src/plugin/dependencies.ts +++ b/packages/gradle/src/plugin/dependencies.ts @@ -2,143 +2,48 @@ import { CreateDependencies, CreateDependenciesContext, DependencyType, - FileMap, - RawProjectGraphDependency, + StaticDependency, validateDependency, + workspaceRoot, } from '@nx/devkit'; -import { readFileSync } from 'node:fs'; -import { basename, dirname } from 'node:path'; +import { relative } from 'node:path'; -import { getCurrentGradleReport } from '../utils/get-gradle-report'; -import { GRADLE_BUILD_FILES } from '../utils/split-config-files'; -import { newLineSeparator } from '../utils/get-project-report-lines'; +import { getCurrentNodesReport } from './utils/get-nodes-from-gradle-plugin'; export const createDependencies: CreateDependencies = async ( _, context: CreateDependenciesContext ) => { - const gradleFiles: string[] = findGradleFiles(context.filesToProcess); - if (gradleFiles.length === 0) { - return []; - } - - const gradleDependenciesStart = performance.mark('gradleDependencies:start'); - const { - gradleFileToGradleProjectMap, - gradleProjectNameToProjectRootMap, - buildFileToDepsMap, - gradleProjectToChildProjects, - } = getCurrentGradleReport(); - const dependencies: Set = new Set(); - - for (const gradleFile of gradleFiles) { - const gradleProject = gradleFileToGradleProjectMap.get(gradleFile); - const projectName = Object.values(context.projects).find( - (project) => project.root === dirname(gradleFile) - )?.name; - const depsFile = buildFileToDepsMap.get(gradleFile); - - if (projectName && depsFile) { - processGradleDependencies( - depsFile, - gradleProjectNameToProjectRootMap, - projectName, - gradleFile, - context, - dependencies - ); - } - gradleProjectToChildProjects.get(gradleProject)?.forEach((childProject) => { - if (childProject) { - const dependency: RawProjectGraphDependency = { - source: projectName as string, - target: childProject, - type: DependencyType.static, - sourceFile: gradleFile, - }; - validateDependency(dependency, context); - dependencies.add(dependency); + const { dependencies: dependenciesFromReport } = getCurrentNodesReport(); + + const dependencies: Array = []; + dependenciesFromReport.forEach((dependencyFromPlugin: StaticDependency) => { + try { + const source = + relative(workspaceRoot, dependencyFromPlugin.source) || '.'; + const sourceProjectName = + Object.values(context.projects).find( + (project) => source === project.root + )?.name ?? dependencyFromPlugin.source; + const target = + relative(workspaceRoot, dependencyFromPlugin.target) || '.'; + const targetProjectName = + Object.values(context.projects).find( + (project) => target === project.root + )?.name ?? dependencyFromPlugin.target; + if (!sourceProjectName || !targetProjectName) { + return; } - }); - } - - const gradleDependenciesEnd = performance.mark('gradleDependencies:end'); - performance.measure( - 'gradleDependencies', - gradleDependenciesStart.name, - gradleDependenciesEnd.name - ); - - return Array.from(dependencies); + const dependency: StaticDependency = { + source: sourceProjectName, + target: targetProjectName, + type: DependencyType.static, + sourceFile: relative(workspaceRoot, dependencyFromPlugin.sourceFile), + }; + validateDependency(dependency, context); + dependencies.push(dependency); + } catch {} // ignore invalid dependencies + }); + + return dependencies; }; - -function findGradleFiles(fileMap: FileMap): string[] { - const gradleFiles: string[] = []; - - for (const [_, files] of Object.entries(fileMap.projectFileMap)) { - for (const file of files) { - if (GRADLE_BUILD_FILES.has(basename(file.file))) { - gradleFiles.push(file.file); - } - } - } - - return gradleFiles; -} - -export function processGradleDependencies( - depsFile: string, - gradleProjectNameToProjectRoot: Map, - sourceProjectName: string, - gradleFile: string, - context: CreateDependenciesContext, - dependencies: Set -): void { - const lines = readFileSync(depsFile).toString().split(newLineSeparator); - let inDeps = false; - for (const line of lines) { - if ( - line.startsWith('implementationDependenciesMetadata') || - line.startsWith('compileClasspath') - ) { - inDeps = true; - continue; - } - - if (inDeps) { - if (line === '') { - inDeps = false; - continue; - } - const [indents, dep] = line.split('--- '); - if (indents === '\\' || indents === '+') { - let gradleProjectName: string | undefined; - if (dep.startsWith('project ')) { - gradleProjectName = dep - .substring('project '.length) - .replace(/ \(n\)$/, '') - .trim(); - } else if (dep.includes('-> project')) { - const [_, projectName] = dep.split('-> project'); - gradleProjectName = projectName.trim(); - } - const targetProjectRoot = gradleProjectNameToProjectRoot.get( - gradleProjectName - ) as string; - const targetProjectName = Object.values(context.projects).find( - (project) => project.root === targetProjectRoot - )?.name; - if (targetProjectName) { - const dependency: RawProjectGraphDependency = { - source: sourceProjectName, - target: targetProjectName, - type: DependencyType.static, - sourceFile: gradleFile, - }; - validateDependency(dependency, context); - dependencies.add(dependency); - } - } - } - } -} diff --git a/packages/gradle/src/plugin/nodes.ts b/packages/gradle/src/plugin/nodes.ts index cbedf477d1b37..196c117d5a092 100644 --- a/packages/gradle/src/plugin/nodes.ts +++ b/packages/gradle/src/plugin/nodes.ts @@ -1,61 +1,37 @@ import { - CreateNodes, CreateNodesV2, CreateNodesContext, ProjectConfiguration, - TargetConfiguration, createNodesFromFiles, readJsonFile, writeJsonFile, CreateNodesFunction, - logger, + joinPathFragments, + workspaceRoot, } from '@nx/devkit'; import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes'; import { existsSync } from 'node:fs'; -import { basename, dirname, join } from 'node:path'; +import { dirname, join } from 'node:path'; import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; -import { findProjectForPath } from 'nx/src/devkit-internals'; -import { - populateGradleReport, - getCurrentGradleReport, - GradleReport, -} from '../utils/get-gradle-report'; import { hashObject } from 'nx/src/hasher/file-hasher'; import { gradleConfigAndTestGlob, - gradleConfigGlob, splitConfigFiles, } from '../utils/split-config-files'; -import { getGradleExecFile, findGraldewFile } from '../utils/exec-gradle'; - -const cacheableTaskType = new Set(['Build', 'Verification']); -const dependsOnMap = { - build: ['^build', 'classes', 'test'], - testClasses: ['classes'], - test: ['testClasses'], - classes: ['^classes'], -}; - -interface GradleTask { - type: string; - name: string; -} +import { + getCurrentNodesReport, + populateNodes, +} from './utils/get-nodes-from-gradle-plugin'; export interface GradlePluginOptions { - includeSubprojectsTasks?: boolean; // default is false, show all gradle tasks in the project ciTargetName?: string; - testTargetName?: string; - classesTargetName?: string; - buildTargetName?: string; [taskTargetName: string]: string | undefined | boolean; } function normalizeOptions(options: GradlePluginOptions): GradlePluginOptions { options ??= {}; - options.testTargetName ??= 'test'; - options.classesTargetName ??= 'classes'; - options.buildTargetName ??= 'build'; + options.ciTargetName ??= 'test-ci'; return options; } @@ -81,23 +57,15 @@ export const createNodesV2: CreateNodesV2 = [ ); const targetsCache = readTargetsCache(cachePath); - await populateGradleReport( + await populateNodes( context.workspaceRoot, gradlewFiles.map((f) => join(context.workspaceRoot, f)) ); - const gradleReport = getCurrentGradleReport(); - const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap( - testFiles, - projectRoots - ); + const { projects } = getCurrentNodesReport(); try { return createNodesFromFiles( - makeCreateNodesForGradleConfigFile( - gradleReport, - targetsCache, - gradleProjectRootToTestFilesMap - ), + makeCreateNodesForGradleConfigFile(projects, targetsCache), buildFiles, options, context @@ -110,9 +78,8 @@ export const createNodesV2: CreateNodesV2 = [ export const makeCreateNodesForGradleConfigFile = ( - gradleReport: GradleReport, - targetsCache: GradleTargets = {}, - gradleProjectRootToTestFilesMap: Record = {} + projects: Record>, + targetsCache: GradleTargets = {} ): CreateNodesFunction => async ( gradleFilePath, @@ -127,309 +94,30 @@ export const makeCreateNodesForGradleConfigFile = options ?? {}, context ); - targetsCache[hash] ??= await createGradleProject( - gradleReport, - gradleFilePath, - options, - context, - gradleProjectRootToTestFilesMap[projectRoot] - ); + targetsCache[hash] ??= + projects[projectRoot] ?? + projects[joinPathFragments(workspaceRoot, projectRoot)]; const project = targetsCache[hash]; if (!project) { return {}; } - return { - projects: { - [projectRoot]: project, - }, - }; - }; - -/** - @deprecated This is replaced with {@link createNodesV2}. Update your plugin to export its own `createNodesV2` function that wraps this one instead. - This function will change to the v2 function in Nx 20. - */ -export const createNodes: CreateNodes = [ - gradleConfigGlob, - async (buildFile, options, context) => { - logger.warn( - '`createNodes` is deprecated. Update your plugin to utilize createNodesV2 instead. In Nx 20, this will change to the createNodesV2 API.' - ); - const { gradlewFiles } = splitConfigFiles(context.configFiles); - await populateGradleReport(context.workspaceRoot, gradlewFiles); - const gradleReport = getCurrentGradleReport(); - const internalCreateNodes = - makeCreateNodesForGradleConfigFile(gradleReport); - return await internalCreateNodes(buildFile, options, context); - }, -]; - -async function createGradleProject( - gradleReport: GradleReport, - gradleFilePath: string, - options: GradlePluginOptions | undefined, - context: CreateNodesContext, - testFiles = [] -) { - try { - const { - gradleProjectToTasksTypeMap, - gradleProjectToTasksMap, - gradleFileToOutputDirsMap, - gradleFileToGradleProjectMap, - gradleProjectToProjectName, - } = gradleReport; - - const gradleProject = gradleFileToGradleProjectMap.get( - gradleFilePath - ) as string; - const projectName = gradleProjectToProjectName.get(gradleProject); - if (!projectName) { - return; - } - - const tasksTypeMap: Map = gradleProjectToTasksTypeMap.get( - gradleProject - ) as Map; - const tasksSet = gradleProjectToTasksMap.get(gradleProject) as Set; - let tasks: GradleTask[] = []; - tasksSet.forEach((taskName) => { - tasks.push({ - type: tasksTypeMap.get(taskName) as string, - name: taskName, - }); - }); - if (options.includeSubprojectsTasks) { - tasksTypeMap.forEach((taskType, taskName) => { - if (!tasksSet.has(taskName)) { - tasks.push({ - type: taskType, - name: taskName, - }); - } - }); - } - - const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath) as Map< - string, - string - >; - - const { targets, targetGroups } = await createGradleTargets( - tasks, - options, - context, - outputDirs, - gradleProject, - gradleFilePath, - testFiles - ); - const project: Partial = { - name: projectName, - projectType: 'application', - targets, - metadata: { - targetGroups, - technologies: ['gradle'], - }, - }; - - return project; - } catch (e) { - console.error(e); - return undefined; - } -} - -async function createGradleTargets( - tasks: GradleTask[], - options: GradlePluginOptions | undefined, - context: CreateNodesContext, - outputDirs: Map, - gradleProject: string, - gradleBuildFilePath: string, - testFiles: string[] = [] -): Promise<{ - targetGroups: Record; - targets: Record; -}> { - const inputsMap = createInputsMap(context); - const gradlewFileDirectory = dirname( - findGraldewFile(gradleBuildFilePath, context.workspaceRoot) - ); - const targets: Record = {}; - const targetGroups: Record = {}; - for (const task of tasks) { - const targetName = options?.[`${task.name}TargetName`] ?? task.name; - - let outputs = [outputDirs.get(task.name)].filter(Boolean); - if (task.name === 'test') { - outputs = [ - outputDirs.get('testReport'), - outputDirs.get('testResults'), - ].filter(Boolean); - getTestCiTargets( - testFiles, - gradleProject, - targetName as string, - options.ciTargetName, - inputsMap['test'], - outputs, - task.type, - targets, - targetGroups, - gradlewFileDirectory - ); - } - - const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}${ - task.name - }`; - - targets[targetName as string] = { - command: `${getGradleExecFile()} ${taskCommandToRun}`, - options: { - cwd: gradlewFileDirectory, - }, - cache: cacheableTaskType.has(task.type), - inputs: inputsMap[task.name], - dependsOn: dependsOnMap[task.name], - metadata: { - technologies: ['gradle'], - help: { - command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, - example: { - options: { - args: ['--rerun'], - }, - }, - }, - }, - ...(outputs && outputs.length ? { outputs } : {}), - }; - - if (task.type) { - if (!targetGroups[task.type]) { - targetGroups[task.type] = []; + let targets = {}; + // rename target name if it is provided + Object.entries(project.targets).forEach(([taskName, target]) => { + const targetName = options?.[`${taskName}TargetName`] as string; + if (targetName) { + targets[targetName] = target; + } else { + targets[taskName] = target; } - targetGroups[task.type].push(targetName as string); - } - } - return { targetGroups, targets }; -} - -function createInputsMap( - context: CreateNodesContext -): Record { - const namedInputs = context.nxJsonConfiguration.namedInputs; - return { - build: namedInputs?.production - ? ['production', '^production'] - : ['default', '^default'], - test: ['default', namedInputs?.production ? '^production' : '^default'], - classes: namedInputs?.production - ? ['production', '^production'] - : ['default', '^default'], - }; -} - -function getTestCiTargets( - testFiles: string[], - gradleProject: string, - testTargetName: string, - ciTargetName: string, - inputs: TargetConfiguration['inputs'], - outputs: string[], - targetGroupName: string, - targets: Record, - targetGroups: Record, - gradlewFileDirectory: string -): void { - if (!testFiles || testFiles.length === 0 || !ciTargetName) { - return; - } - const taskCommandToRun = `${gradleProject ? gradleProject + ':' : ''}test`; - - if (!targetGroups[targetGroupName]) { - targetGroups[targetGroupName] = []; - } - - const dependsOn: TargetConfiguration['dependsOn'] = []; - testFiles.forEach((testFile) => { - const testName = basename(testFile).split('.')[0]; - const targetName = ciTargetName + '--' + testName; - - targets[targetName] = { - command: `${getGradleExecFile()} ${taskCommandToRun} --tests ${testName}`, - options: { - cwd: gradlewFileDirectory, - }, - cache: true, - inputs, - dependsOn: dependsOnMap['test'], - metadata: { - technologies: ['gradle'], - description: `Runs Gradle test ${testFile} in CI`, - help: { - command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, - example: { - options: { - args: ['--rerun'], - }, - }, - }, - }, - ...(outputs && outputs.length > 0 ? { outputs } : {}), - }; - targetGroups[targetGroupName].push(targetName); - dependsOn.push({ - target: targetName, - projects: 'self', - params: 'forward', }); - }); + project.targets = targets; + project.root = projectRoot; - targets[ciTargetName] = { - executor: 'nx:noop', - cache: true, - inputs, - dependsOn: dependsOn, - ...(outputs && outputs.length > 0 ? { outputs } : {}), - metadata: { - technologies: ['gradle'], - description: 'Runs Gradle Tests in CI', - nonAtomizedTarget: testTargetName, - help: { - command: `${getGradleExecFile()} help --task ${taskCommandToRun}`, - example: { - options: { - args: ['--rerun'], - }, - }, + return { + projects: { + [projectRoot]: project, }, - }, + }; }; - targetGroups[targetGroupName].push(ciTargetName); -} - -function getGradleProjectRootToTestFilesMap( - testFiles: string[], - projectRoots: string[] -): Record | undefined { - if (testFiles.length === 0 || projectRoots.length === 0) { - return; - } - const roots = new Map(projectRoots.map((root) => [root, root])); - const testFilesToGradleProjectMap: Record = {}; - testFiles.forEach((testFile) => { - const projectRoot = findProjectForPath(testFile, roots); - if (projectRoot) { - if (!testFilesToGradleProjectMap[projectRoot]) { - testFilesToGradleProjectMap[projectRoot] = []; - } - testFilesToGradleProjectMap[projectRoot].push(testFile); - } - }); - return testFilesToGradleProjectMap; -} diff --git a/packages/gradle/src/plugin/utils/get-create-nodes-lines.ts b/packages/gradle/src/plugin/utils/get-create-nodes-lines.ts new file mode 100644 index 0000000000000..4529aea3ca9d9 --- /dev/null +++ b/packages/gradle/src/plugin/utils/get-create-nodes-lines.ts @@ -0,0 +1,47 @@ +import { AggregateCreateNodesError, logger, workspaceRoot } from '@nx/devkit'; +import { execGradleAsync, newLineSeparator } from '../../utils/exec-gradle'; +import { existsSync } from 'fs'; +import { dirname, join } from 'path'; +import { cacheDirectoryForWorkspace } from 'nx/src/utils/cache-directory'; + +export async function getCreateNodesLines(gradlewFile: string) { + let createNodesBuffer: Buffer; + + // if there is no build.gradle or build.gradle.kts file, we cannot run the createNodes task + if ( + !existsSync(join(dirname(gradlewFile), 'build.gradle')) && + !existsSync(join(dirname(gradlewFile), 'build.gradle.kts')) + ) { + logger.warn( + `Could not find build file near ${gradlewFile}. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks.` + ); + return []; + } + + try { + createNodesBuffer = await execGradleAsync(gradlewFile, [ + 'createNodes', + '--outputDirectory', + cacheDirectoryForWorkspace(workspaceRoot), + '--workspaceRoot', + workspaceRoot, + ]); + } catch (e) { + throw new AggregateCreateNodesError( + [ + [ + gradlewFile, + new Error( + `Could not run 'createNodes' task using ${gradlewFile}. Please run 'nx generate @nx/gradle:init' to generate the necessary tasks. ${e.message}`, + { cause: e } + ), + ], + ], + [] + ); + } + return createNodesBuffer + .toString() + .split(newLineSeparator) + .filter((line) => line.trim() !== ''); +} diff --git a/packages/gradle/src/plugin/utils/get-nodes-from-gradle-plugin.ts b/packages/gradle/src/plugin/utils/get-nodes-from-gradle-plugin.ts new file mode 100644 index 0000000000000..84539e116f076 --- /dev/null +++ b/packages/gradle/src/plugin/utils/get-nodes-from-gradle-plugin.ts @@ -0,0 +1,164 @@ +import { existsSync } from 'node:fs'; +import { join } from 'node:path'; + +import { + AggregateCreateNodesError, + ProjectConfiguration, + readJsonFile, + StaticDependency, + writeJsonFile, +} from '@nx/devkit'; + +import { hashWithWorkspaceContext } from 'nx/src/utils/workspace-context'; +import { gradleConfigAndTestGlob } from '../../utils/split-config-files'; +import { workspaceDataDirectory } from 'nx/src/utils/cache-directory'; +import { getCreateNodesLines } from './get-create-nodes-lines'; + +// the output json file from the gradle plugin +export interface NodesReportJSON { + [appName: string]: { + project: Partial; + dependencies: Array; + }; +} + +export interface NodesReport { + projects: Record>; + dependencies: Array; +} + +export interface NodesReportCache extends NodesReport { + hash: string; +} + +function readNodesReportCache( + cachePath: string, + hash: string +): NodesReport | undefined { + const nodesReportCache: Partial = existsSync(cachePath) + ? readJsonFile(cachePath) + : undefined; + if (!nodesReportCache || nodesReportCache.hash !== hash) { + return; + } + return nodesReportCache as NodesReport; +} + +export function writeNodesReportToCache( + cachePath: string, + results: NodesReport +) { + let nodesReportJson: NodesReportCache = { + hash: gradleCurrentConfigHash, + ...results, + }; + + writeJsonFile(cachePath, nodesReportJson); +} + +let nodesReportCache: NodesReport; +let gradleCurrentConfigHash: string; +let nodesReportCachePath: string = join( + workspaceDataDirectory, + 'gradle-nodes.hash' +); + +export function getCurrentNodesReport() { + if (!nodesReportCache) { + throw new AggregateCreateNodesError( + [ + [ + null, + new Error( + `Expected cached gradle report. Please open an issue at https://github.com/nrwl/nx/issues/new/choose` + ), + ], + ], + [] + ); + } + return nodesReportCache; +} + +/** + * This function populates the gradle report cache. + * For each gradlew file, it runs the `projectReportAll` task and processes the output. + * If `projectReportAll` fails, it runs the `projectReport` task instead. + * It will throw an error if both tasks fail. + * It will accumulate the output of all gradlew files. + * @param workspaceRoot + * @param gradlewFiles absolute paths to all gradlew files in the workspace + * @returns Promise + */ +export async function populateNodes( + workspaceRoot: string, + gradlewFiles: string[] +): Promise { + const gradleConfigHash = await hashWithWorkspaceContext(workspaceRoot, [ + gradleConfigAndTestGlob, + ]); + nodesReportCache ??= readNodesReportCache( + nodesReportCachePath, + gradleConfigHash + ); + if ( + nodesReportCache && + (!gradleCurrentConfigHash || gradleConfigHash === gradleCurrentConfigHash) + ) { + return; + } + + const gradleCreateNodesStart = performance.mark('gradleCreateNodes:start'); + + const createNodesLines = await gradlewFiles.reduce( + async ( + createNodesLines: Promise, + gradlewFile: string + ): Promise => { + const allLines = await createNodesLines; + const currentLines = await getCreateNodesLines(gradlewFile); + return [...allLines, ...currentLines]; + }, + Promise.resolve([]) + ); + + const gradleCreateNodesEnd = performance.mark('gradleCreateNodes:end'); + performance.measure( + 'gradleCreateNodes', + gradleCreateNodesStart.name, + gradleCreateNodesEnd.name + ); + gradleCurrentConfigHash = gradleConfigHash; + nodesReportCache = processCreateNodes(createNodesLines); + writeNodesReportToCache(nodesReportCachePath, nodesReportCache); +} + +export function processCreateNodes(createNodesLines: string[]): NodesReport { + let index = 0; + let projects: Record> = {}; + let dependencies: Array = []; + while (index < createNodesLines.length) { + const line = createNodesLines[index].trim(); + if (line.startsWith('> Task ') && line.endsWith(':createNodes')) { + while ( + index < createNodesLines.length && + !createNodesLines[index].includes('.json') + ) { + index++; + } + const file = createNodesLines[index]; + const nodesReportJson: NodesReportJSON = + readJsonFile(file); + for (const [projectRoot, node] of Object.entries(nodesReportJson)) { + projects[projectRoot] = node.project; + dependencies = dependencies.concat(node.dependencies); + } + } + index++; + } + + return { + projects, + dependencies, + }; +} diff --git a/packages/gradle/src/utils/exec-gradle.ts b/packages/gradle/src/utils/exec-gradle.ts index d695737b84e34..fff588b6c2b47 100644 --- a/packages/gradle/src/utils/exec-gradle.ts +++ b/packages/gradle/src/utils/exec-gradle.ts @@ -3,6 +3,14 @@ import { ExecFileOptions, execFile } from 'node:child_process'; import { existsSync } from 'node:fs'; import { dirname, join } from 'node:path'; +export const fileSeparator = process.platform.startsWith('win') + ? 'file:///' + : 'file://'; + +export const newLineSeparator = process.platform.startsWith('win') + ? '\r\n' + : '\n'; + /** * For gradle command, it needs to be run from the directory of the gradle binary * @returns gradle binary file name diff --git a/packages/gradle/src/utils/versions.ts b/packages/gradle/src/utils/versions.ts index e268dc8f82dd3..ef7bc54b1ed13 100644 --- a/packages/gradle/src/utils/versions.ts +++ b/packages/gradle/src/utils/versions.ts @@ -1 +1,10 @@ +import { config as loadDotEnvFile } from 'dotenv'; +import { join } from 'path'; + export const nxVersion = require('../../package.json').version; + +const gradleNativeProperties = loadDotEnvFile({ + path: join(__dirname, `../../native/gradle.properties`), +}); + +export const gradlePluginVersion = gradleNativeProperties.parsed?.version;