fix(generators): update gradle plugin for gradle validation (#247)

khalilou88 · Jun 5, 2023 · b908e93 · b908e93
1 parent 79f9191
commit b908e93
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
@@ -12,4 +12,4 @@
   - [Executors](nx-boot-maven/3-executors)
   - [Project graph](nx-boot-maven/4-dep-graph)
   - [Upgrading](nx-boot-maven/5-upgrading)
-- [**Gradle plugin**](io.github.jnxplus/plugin)
+- [**Gradle plugin**](gradle-plugin)
diff --git a/docs/io.github.jnxplus/plugin.md → docs/gradle-plugin/README.md b/docs/io.github.jnxplus/plugin.md → docs/gradle-plugin/README.md
@@ -1,4 +1,4 @@
-# io.github.jnxplus
+# io.github.khalilou88.jnxplus
 
 This repository contains Gradle plugin for managing gradle projects inside a nx workspace. Plugin registers task `projectDependencyTask` that generate project dependencies in a json file.
 
@@ -17,15 +17,15 @@ Kotlin:
 ```bash
 val jnxplusGradlePluginVersion: String by settings
 plugins {
-    id("io.github.jnxplus") version jnxplusGradlePluginVersion
+    id("io.github.khalilou88.jnxplus") version jnxplusGradlePluginVersion
 }
 ```
 
 Groovy:
 
 ```bash
 plugins {
-    id 'io.github.jnxplus' version "${jnxplusGradlePluginVersion}"
+    id 'io.github.khalilou88.jnxplus' version "${jnxplusGradlePluginVersion}"
 }
 ```
 
@@ -35,15 +35,15 @@ Kotlin:
 
 ```bash
 plugins {
-    id("io.github.jnxplus")
+    id("io.github.khalilou88.jnxplus")
 }
 ```
 
 Groovy:
 
 ```bash
 plugins {
-    id "io.github.jnxplus"
+    id "io.github.khalilou88.jnxplus"
 }
 ```
 

diff --git a/packages/gradle-plugin/README.md b/packages/gradle-plugin/README.md
@@ -1,4 +1,4 @@
-# io.github.jnxplus
+# io.github.khalilou88.jnxplus
 
 This repository contains Gradle plugin for managing gradle projects inside a nx workspace. Plugin registers task `projectDependencyTask` that generate project dependencies in a json file.
 
@@ -17,15 +17,15 @@ Kotlin:
 ```bash
 val jnxplusGradlePluginVersion: String by settings
 plugins {
-    id("io.github.jnxplus") version jnxplusGradlePluginVersion
+    id("io.github.khalilou88.jnxplus") version jnxplusGradlePluginVersion
 }
 ```
 
 Groovy:
 
 ```bash
 plugins {
-    id 'io.github.jnxplus' version "${jnxplusGradlePluginVersion}"
+    id 'io.github.khalilou88.jnxplus' version "${jnxplusGradlePluginVersion}"
 }
 ```
 
@@ -35,15 +35,15 @@ Kotlin:
 
 ```bash
 plugins {
-    id("io.github.jnxplus")
+    id("io.github.khalilou88.jnxplus")
 }
 ```
 
 Groovy:
 
 ```bash
 plugins {
-    id "io.github.jnxplus"
+    id "io.github.khalilou88.jnxplus"
 }
 ```
 

diff --git a/packages/gradle-plugin/build.gradle b/packages/gradle-plugin/build.gradle
@@ -18,7 +18,7 @@ plugins {
   id 'com.gradle.plugin-publish' version '1.2.0'
 }
 
-group = 'io.github.jnxplus'
+group = 'io.github.khalilou88.jnxplus'
 version = '0.1.4'
 
 repositories {
@@ -33,15 +33,15 @@ dependencies {
 
 gradlePlugin {
   // Define the plugin
-  website = 'https://khalilou88.github.io/jnxplus/#/io.github.jnxplus/plugin'
-  vcsUrl = 'https://github.com/khalilou88/jnxplus/tree/main/packages/gradle-plugin'
+  website = 'https://khalilou88.github.io/jnxplus/#/gradle-plugin'
+  vcsUrl = 'https://github.com/khalilou88/jnxplus'
   plugins {
     jnxplusPlugin {
-      id = 'io.github.jnxplus'
+      id = 'io.github.khalilou88.jnxplus'
       displayName = 'jnxplus gradle plugin'
       description = 'jnxplus gradle plugin for depedency graph'
       tags.set(['nx', 'jnxplus'])
-      implementationClass = 'io.github.jnxplus.GradlePlugin'
+      implementationClass = 'io.github.khalilou88.jnxplus.GradlePlugin'
     }
   }
 }

diff --git a/...jnxplus/GradlePluginFunctionalTest.groovy → ...jnxplus/GradlePluginFunctionalTest.groovy b/...jnxplus/GradlePluginFunctionalTest.groovy → ...jnxplus/GradlePluginFunctionalTest.groovy
@@ -1,14 +1,14 @@
 /*
  * This Groovy source file was generated by the Gradle 'init' task.
  */
-package io.github.jnxplus
+package io.github.khalilou88.jnxplus
 
 import org.gradle.testkit.runner.GradleRunner
 import spock.lang.Specification
 import spock.lang.TempDir
 
 /**
- * A simple functional test for the 'io.github.jnxplus.projects' plugin.*/
+ * A simple functional test for the 'io.github.khalilou88.jnxplus.projects' plugin.*/
 class GradlePluginFunctionalTest extends Specification {
   @TempDir
   private File projectDir
@@ -26,7 +26,7 @@ class GradlePluginFunctionalTest extends Specification {
     settingsFile << ""
     buildFile << """
 plugins {
-    id('io.github.jnxplus')
+    id('io.github.khalilou88.jnxplus')
 }
 """
 

diff --git a/...ovy/io/github/jnxplus/GradlePlugin.groovy → ...ub/khalilou88/jnxplus/GradlePlugin.groovy b/...ovy/io/github/jnxplus/GradlePlugin.groovy → ...ub/khalilou88/jnxplus/GradlePlugin.groovy
@@ -1,7 +1,7 @@
 /*
  * This Groovy source file was generated by the Gradle 'init' task.
  */
-package io.github.jnxplus
+package io.github.khalilou88.jnxplus
 
 
 import org.gradle.api.Plugin

diff --git a/...thub/jnxplus/ProjectDependencyTask.groovy → ...ou88/jnxplus/ProjectDependencyTask.groovy b/...thub/jnxplus/ProjectDependencyTask.groovy → ...ou88/jnxplus/ProjectDependencyTask.groovy
@@ -1,4 +1,4 @@
-package io.github.jnxplus
+package io.github.khalilou88.jnxplus
 
 import groovy.json.JsonOutput
 import org.gradle.api.DefaultTask

diff --git a/...io/github/jnxplus/GradlePluginTest.groovy → ...halilou88/jnxplus/GradlePluginTest.groovy b/...io/github/jnxplus/GradlePluginTest.groovy → ...halilou88/jnxplus/GradlePluginTest.groovy
@@ -1,7 +1,7 @@
 /*
  * This Groovy source file was generated by the Gradle 'init' task.
  */
-package io.github.jnxplus
+package io.github.khalilou88.jnxplus
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
@@ -14,7 +14,7 @@ class GradlePluginTest extends Specification {
     def project = ProjectBuilder.builder().build()
 
     when:
-    project.plugins.apply("io.github.jnxplus")
+    project.plugins.apply("io.github.khalilou88.jnxplus")
 
     then:
     project.tasks.findByName("projectDependencyTask") != null

diff --git a/packages/gradle/src/executors/set-version/executor.spec.ts b/packages/gradle/src/executors/set-version/executor.spec.ts
@@ -15,7 +15,7 @@ describe('regex work', () => {
       id 'com.gradle.plugin-publish' version '1.2.0'
     }
     
-    group = 'io.github.jnxplus'
+    group = 'io.github.khalilou88.jnxplus'
     version = '0.0.1-SNAPSHOT'
     
     repositories {

diff --git a/packages/maven-wrapper/pom.xml b/packages/maven-wrapper/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.github.jnxplus</groupId>
+  <groupId>io.github.khalilou88.jnxplus</groupId>
   <artifactId>maven-wrapper</artifactId>
   <version>1.0-SNAPSHOT</version>
 

diff --git a/packages/nx-gradle/src/generators/init/files/gradle/config/build.gradle__kotlinExtension__ b/packages/nx-gradle/src/generators/init/files/gradle/config/build.gradle__kotlinExtension__
@@ -1,8 +1,8 @@
 plugins {
 <% if(dsl === 'groovy') { -%>
-  id 'io.github.jnxplus'
+  id 'io.github.khalilou88.jnxplus'
 <% } -%>
 <% if(dsl === 'kotlin') { -%>
-  id("io.github.jnxplus")
+  id("io.github.khalilou88.jnxplus")
 <% } -%>
 }
diff --git a/...ages/nx-gradle/src/generators/init/files/gradle/config/settings.gradle__kotlinExtension__ b/...ages/nx-gradle/src/generators/init/files/gradle/config/settings.gradle__kotlinExtension__
@@ -5,7 +5,7 @@ pluginManagement {
     id 'io.spring.dependency-management' version "${dependencyManagementVersion}"
     id 'org.jetbrains.kotlin.jvm' version "${kotlinJvmVersion}"
     id 'org.jetbrains.kotlin.plugin.spring' version "${kotlinSpringVersion}"
-    id 'io.github.jnxplus' version "${jnxplusGradlePluginVersion}"
+    id 'io.github.khalilou88.jnxplus' version "${jnxplusGradlePluginVersion}"
   }
 <% if(generateRepositories) { -%>
   repositories {
@@ -29,7 +29,7 @@ pluginManagement {
     id("io.spring.dependency-management") version dependencyManagementVersion
     id("org.jetbrains.kotlin.jvm") version kotlinJvmVersion
     id("org.jetbrains.kotlin.plugin.spring") version kotlinSpringVersion
-    id("io.github.jnxplus") version jnxplusGradlePluginVersion
+    id("io.github.khalilou88.jnxplus") version jnxplusGradlePluginVersion
   }
 <% if(generateRepositories) { -%>
   repositories {