Skip to content

Commit d280e5d

Browse files
tomasstupkaelkorchi
authored andcommitted
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 (cherry picked from commit 9d40408)
1 parent 1f8365c commit d280e5d

File tree

14 files changed

+22
-30
lines changed

14 files changed

+22
-30
lines changed

graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "application"
3-
id "org.graalvm.python"
3+
id 'org.graalvm.python' version '24.2.0'
44
id "org.graalvm.buildtools.native" version "0.10.2"
55
}
66

graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/build/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
application
3-
id("org.graalvm.python")
3+
id("org.graalvm.python") version "24.2.0"
44
id("org.graalvm.buildtools.native") version "0.10.2"
55
}
66

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
rootProject.name = "graalpy-gradle-test-project"
2-
3-
buildscript {
1+
pluginManagement {
42
repositories {
5-
maven {
6-
url "https://repo.gradle.org/gradle/libs-releases/"
7-
}
8-
}
9-
dependencies {
10-
classpath "org.graalvm.python:graalpy-gradle-plugin:24.2.0"
3+
gradlePluginPortal()
114
}
12-
}
5+
}
6+
7+
rootProject.name = "graalpy-gradle-test-project"
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
rootProject.name = "graalpy-gradle-test-project"
2-
3-
buildscript {
1+
pluginManagement {
42
repositories {
5-
maven(url="https://repo.gradle.org/gradle/libs-releases/")
6-
}
7-
dependencies {
8-
classpath("org.graalvm.python:graalpy-gradle-plugin:24.2.0")
3+
gradlePluginPortal()
94
}
10-
}
5+
}
6+
7+
rootProject.name = "graalpy-gradle-test-project"

graalpython/graalpy-gradle-plugin/pom.xml renamed to graalpython/org.graalvm.python.gradle.plugin/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SOFTWARE.
4545
<modelVersion>4.0.0</modelVersion>
4646

4747
<groupId>org.graalvm.python</groupId>
48-
<artifactId>graalpy-gradle-plugin</artifactId>
48+
<artifactId>org.graalvm.python.gradle.plugin</artifactId>
4949
<packaging>jar</packaging>
5050
<!-- This version is always overridden when deploying using mx -->
5151
<version>24.2.0</version>
@@ -59,6 +59,7 @@ SOFTWARE.
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6060
<graalpy.version>24.2.0</graalpy.version>
6161
<gradle.version>6.1.1</gradle.version>
62+
<slf4j.version>2.0.13</slf4j.version>
6263
</properties>
6364

6465
<profiles>
@@ -75,19 +76,13 @@ SOFTWARE.
7576
</profile>
7677
</profiles>
7778

78-
7979
<dependencies>
8080
<dependency>
8181
<groupId>org.codehaus.groovy</groupId>
8282
<artifactId>groovy</artifactId>
8383
<version>3.0.22</version>
8484
<scope>provided</scope>
8585
</dependency>
86-
<dependency>
87-
<groupId>org.gradle</groupId>
88-
<artifactId>gradle-tooling-api</artifactId>
89-
<version>8.8</version>
90-
</dependency>
9186
<dependency>
9287
<groupId>org.gradle</groupId>
9388
<artifactId>gradle-core</artifactId>
@@ -142,7 +137,12 @@ SOFTWARE.
142137
<version>${gradle.version}</version>
143138
<scope>provided</scope>
144139
</dependency>
145-
140+
<dependency>
141+
<groupId>org.slf4j</groupId>
142+
<artifactId>slf4j-simple</artifactId>
143+
<version>${slf4j.version}</version>
144+
<scope>provided</scope>
145+
</dependency>
146146
<dependency>
147147
<groupId>org.graalvm.python</groupId>
148148
<artifactId>python-embedding-tools</artifactId>

graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java renamed to graalpython/org.graalvm.python.gradle.plugin/src/main/java/org/graalvm/python/tasks/MetaInfTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
public abstract class MetaInfTask extends DefaultTask {
5252

53-
private static final String GRAALPY_GRADLE_PLUGIN_ARTIFACT_ID = "graalpy-gradle-plugin";
53+
private static final String GRAALPY_GRADLE_PLUGIN_ARTIFACT_ID = "org.graalvm.python.gradle.plugin";
5454

5555
@OutputDirectory
5656
public abstract DirectoryProperty getManifestOutputDir();

mx.graalpython/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@
14641464
"tag": ["default", "public"],
14651465
},
14661466
},
1467-
"graalpy-gradle-plugin": {
1467+
"org.graalvm.python.gradle.plugin": {
14681468
"class": "MavenProject",
14691469
"subDir": "graalpython",
14701470
"noMavenJavadoc": True,

0 commit comments

Comments
 (0)