feat(gradle): change group name to dev.nx

nrwl · Jan 26, 2025 · 6827ba3 · 6827ba3
1 parent c0f7978
commit 6827ba3
Show file tree

Hide file tree

Showing 18 changed files with 197 additions and 66 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
-group = "io.nx"
+group = "dev.nx"
 
 plugins {
-    id("io.nx.gradle.native") version("+")
+    // id("dev.nx.gradle.native") version("+")
 }
 
 allprojects {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/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/gradlew.bat b/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/nx.json b/nx.json
@@ -52,7 +52,11 @@
     ]
   },
   "release": {
-    "projects": ["packages/*", "packages/nx/native-packages/*"],
+    "projects": [
+      "packages/*",
+      "packages/nx/native-packages/*",
+      "packages/gradle/native/*"
+    ],
     "releaseTagPattern": "{version}",
     "changelog": {
       "workspaceChangelog": {
@@ -240,8 +244,7 @@
         "serveStaticTargetName": "serve-static"
       }
     },
-    "@nx/powerpack-enterprise-cloud",
-    "@nx/gradle/plugin-v1"
+    "@nx/powerpack-enterprise-cloud"
   ],
   "nxCloudId": "62d013ea0852fe0a2df74438",
   "nxCloudUrl": "https://staging.nx.app",

diff --git a/packages/build.gradle.kts b/packages/build.gradle.kts
@@ -1,7 +1,7 @@
-group = "io.nx"
+group = "dev.nx"
 
 plugins {
-    id("io.nx.gradle.native") version("+")
+    // id("dev.nx.gradle.native") version("+")
 }
 
 allprojects {

diff --git a/packages/gradle/build.gradle.kts b/packages/gradle/build.gradle.kts
@@ -1,7 +1,7 @@
-group = "io.nx"
+group = "dev.nx"
 
 plugins {
-    id("io.nx.gradle.native") version("+")
+    // id("dev.nx.gradle.native") version("+")
 }
 
 allprojects {

diff --git a/packages/gradle/native/README.md b/packages/gradle/native/README.md
@@ -0,0 +1,62 @@
+# dev.nx.gradle.native
+
+This gradle plugin contains
+
+## Installation
+
+Kotlin
+build.gradle.kts
+
+```
+plugins {
+    id("dev.nx.gradle.native") version("+")
+}
+```
+
+Groovy
+build.gradle
+
+```
+plugins {
+    id "dev.nx.gradle.native" version "+"
+}
+```
+
+## Usage
+
+```bash
+./gradlew :createNodes
+```
+
+With specific output directory (default to `.nx/cache`):
+
+```bash
+./gradlew :createNodes --outputDirectory ./
+```
+
+With specific nx workspace root (default to current working directory):
+
+```bash
+./gradlew :createNodes --workspaceRoot ./
+```
+
+In terminal, it should output something like:
+
+```
+> Task :createNodes
+<your workspace>/.nx/cache/add-nx-to-gradle.json
+```
+
+It generates a json file to be consumed by nx:
+
+```json
+{
+  "nodes": {
+    "app": {
+      "targets": {}
+    }
+  },
+  "dependencies": [],
+  "externalNodes": {}
+}
+```
diff --git a/packages/gradle/native/build.gradle.kts b/packages/gradle/native/build.gradle.kts
@@ -1,7 +1,7 @@
-group = "io.nx.gradle"
+group = "dev.nx.gradle"
 
 /*
- * This file was generated by the Gradle 'init' task.
+ * 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.
@@ -14,8 +14,8 @@ plugins {
     `maven-publish`
     id("com.gradle.plugin-publish") version "1.3.0"
 
-    // id("java-library")
-    // id("org.jetbrains.kotlin.jvm") version "2.0.21"
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm") version "2.0.21"
 
     // Apply the Kotlin JVM plugin to add support for Kotlin.
     // alias(libs.plugins.jvm)
@@ -32,8 +32,8 @@ gradlePlugin {
     // Define the plugin
     plugins {
         create("nxGradleNodesPlugin") {
-            id = "io.nx.gradle.native"
-            implementationClass = "io.nx.gradle.native.Nodes"
+            id = "dev.nx.gradle.native"
+            implementationClass = "dev.nx.gradle.native.Nodes"
             displayName = "The Nx Plugin for Gradle to generate nodes, dependencies and external nodes"
             description = "A plugin to generate a json file with nodes, dependencies and external nodes for Nx"
             tags = listOf("nx", "monorepo", "javascript", "typescript")

diff --git a/packages/gradle/native/project.json b/packages/gradle/native/project.json
@@ -0,0 +1,4 @@
+{
+  "name": "gradle-native-plugin",
+  "$schema": "node_modules/nx/schemas/project-schema.json"
+}