From 9d40408e79a9ad9e277d2eaa8774ff861895140f Mon Sep 17 00:00:00 2001
From: Tomas Stupka <tomas.stupka@oracle.com>
Date: Wed, 28 Aug 2024 16:19:45 +0200
Subject: [PATCH] rename graalpy-gradle-plugin to
 org.graalvm.python.gradle.plugin, so that it is recognizable to by gradle
 projects as org.graalvm.python without additional configuration

---
 .../tests/standalone/gradle/build/build.gradle   |  2 +-
 .../standalone/gradle/build/build.gradle.kts     |  2 +-
 .../standalone/gradle/build/settings.gradle      | 15 +++++----------
 .../standalone/gradle/build/settings.gradle.kts  | 13 +++++--------
 .../pom.xml                                      | 16 ++++++++--------
 .../org/graalvm/python/GraalPyGradlePlugin.java  |  0
 .../java/org/graalvm/python/GradleLogger.java    |  0
 .../org/graalvm/python/dsl/GraalPyExtension.java |  0
 .../org/graalvm/python/dsl/PythonHomeInfo.java   |  0
 .../org/graalvm/python/tasks/MetaInfTask.java    |  2 +-
 .../org/graalvm/python/tasks/ResourcesTask.java  |  0
 .../graalvm/python/tasks/VFSFilesListTask.java   |  0
 .../gradle-plugins/org.graalvm.python.properties |  0
 mx.graalpython/suite.py                          |  2 +-
 14 files changed, 22 insertions(+), 30 deletions(-)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/pom.xml (95%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/GradleLogger.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/dsl/GraalPyExtension.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/dsl/PythonHomeInfo.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/tasks/MetaInfTask.java (98%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/tasks/ResourcesTask.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java (100%)
 rename graalpython/{graalpy-gradle-plugin => org.graalvm.python.gradle.plugin}/src/main/resources/META-INF/gradle-plugins/org.graalvm.python.properties (100%)

diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle
index b03dcb7441..ac804e7fcb 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle
+++ b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "application"
-    id "org.graalvm.python"
+    id 'org.graalvm.python' version '24.2.0'
     id "org.graalvm.buildtools.native" version "0.10.2"
 }
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts
index 26230d7185..119e1482b1 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts
+++ b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     application
-    id("org.graalvm.python")
+    id("org.graalvm.python") version "24.2.0"
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle
index 94a40b69a8..cd2662dcd4 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle
+++ b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle
@@ -1,12 +1,7 @@
-rootProject.name = "graalpy-gradle-test-project"
-
-buildscript {
+pluginManagement {
     repositories {
-        maven {
-            url "https://repo.gradle.org/gradle/libs-releases/"
-        }
-    }
-    dependencies {
-        classpath "org.graalvm.python:graalpy-gradle-plugin:24.2.0"
+        gradlePluginPortal()
     }
-}
\ No newline at end of file
+}
+
+rootProject.name = "graalpy-gradle-test-project"
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle.kts b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle.kts
index 3353bd017a..cd2662dcd4 100644
--- a/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle.kts
+++ b/graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/settings.gradle.kts
@@ -1,10 +1,7 @@
-rootProject.name = "graalpy-gradle-test-project"
-
-buildscript {
+pluginManagement {
     repositories {
-        maven(url="https://repo.gradle.org/gradle/libs-releases/")
-    }
-    dependencies {
-        classpath("org.graalvm.python:graalpy-gradle-plugin:24.2.0")
+        gradlePluginPortal()
     }
-}
\ No newline at end of file
+}
+
+rootProject.name = "graalpy-gradle-test-project"
diff --git a/graalpython/graalpy-gradle-plugin/pom.xml b/graalpython/org.graalvm.python.gradle.plugin/pom.xml
similarity index 95%
rename from graalpython/graalpy-gradle-plugin/pom.xml
rename to graalpython/org.graalvm.python.gradle.plugin/pom.xml
index 4e50ced5c2..c7828c84c8 100644
--- a/graalpython/graalpy-gradle-plugin/pom.xml
+++ b/graalpython/org.graalvm.python.gradle.plugin/pom.xml
@@ -45,7 +45,7 @@ SOFTWARE.
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.graalvm.python</groupId>
-    <artifactId>graalpy-gradle-plugin</artifactId>
+    <artifactId>org.graalvm.python.gradle.plugin</artifactId>
     <packaging>jar</packaging>
     <!-- This version is always overridden when deploying using mx -->
     <version>24.2.0</version>
@@ -59,6 +59,7 @@ SOFTWARE.
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <graalpy.version>24.2.0</graalpy.version>
         <gradle.version>6.1.1</gradle.version>
+        <slf4j.version>2.0.13</slf4j.version>
     </properties>
 
     <profiles>
@@ -75,7 +76,6 @@ SOFTWARE.
         </profile>
     </profiles>
 
-
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -83,11 +83,6 @@ SOFTWARE.
             <version>3.0.22</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.gradle</groupId>
-            <artifactId>gradle-tooling-api</artifactId>
-            <version>8.8</version>
-        </dependency>
         <dependency>
             <groupId>org.gradle</groupId>
             <artifactId>gradle-core</artifactId>
@@ -142,7 +137,12 @@ SOFTWARE.
             <version>${gradle.version}</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.python</groupId>
             <artifactId>python-embedding-tools</artifactId>
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/GradleLogger.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/GradleLogger.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/GradleLogger.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/GradleLogger.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/dsl/GraalPyExtension.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/dsl/GraalPyExtension.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/dsl/GraalPyExtension.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/dsl/GraalPyExtension.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/dsl/PythonHomeInfo.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/dsl/PythonHomeInfo.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/dsl/PythonHomeInfo.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/dsl/PythonHomeInfo.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java
similarity index 98%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java
index 0815faea5c..2b3c4a927f 100644
--- a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java
+++ b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java
@@ -50,7 +50,7 @@
 
 public abstract class MetaInfTask extends DefaultTask {
 
-    private static final String GRAALPY_GRADLE_PLUGIN_ARTIFACT_ID = "graalpy-gradle-plugin";
+    private static final String GRAALPY_GRADLE_PLUGIN_ARTIFACT_ID = "org.graalvm.python.gradle.plugin";
 
     @OutputDirectory
     public abstract DirectoryProperty getManifestOutputDir();
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/ResourcesTask.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/ResourcesTask.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/ResourcesTask.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/ResourcesTask.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java b/graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/VFSFilesListTask.java
diff --git a/graalpython/graalpy-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graalvm.python.properties b/graalpython/org.graalvm.python.gradle.plugin/src/main/resources/META-INF/gradle-plugins/org.graalvm.python.properties
similarity index 100%
rename from graalpython/graalpy-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.graalvm.python.properties
rename to graalpython/org.graalvm.python.gradle.plugin/src/main/resources/META-INF/gradle-plugins/org.graalvm.python.properties
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
index 702b778d59..2f334054de 100644
--- a/mx.graalpython/suite.py
+++ b/mx.graalpython/suite.py
@@ -1466,7 +1466,7 @@
                 "tag": ["default", "public"],
             },
         },
-        "graalpy-gradle-plugin": {
+        "org.graalvm.python.gradle.plugin": {
             "class": "MavenProject",
             "subDir": "graalpython",
             "noMavenJavadoc": True,