Skip to content

Commit

Permalink
rename graalpy-gradle-plugin to org.graalvm.python.gradle.plugin,
Browse files Browse the repository at this point in the history
so that it is recognizable to by gradle projects as org.graalvm.python
without additional configuration
  • Loading branch information
tomasstupka committed Aug 28, 2024
1 parent 8139937 commit 9d40408
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 30 deletions.
Original file line number Diff line number Diff line change
@@ -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"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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()
}
}
}

rootProject.name = "graalpy-gradle-test-project"
Original file line number Diff line number Diff line change
@@ -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()
}
}
}

rootProject.name = "graalpy-gradle-test-project"
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -75,19 +76,13 @@ SOFTWARE.
</profile>
</profiles>


<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion mx.graalpython/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@
"tag": ["default", "public"],
},
},
"graalpy-gradle-plugin": {
"org.graalvm.python.gradle.plugin": {
"class": "MavenProject",
"subDir": "graalpython",
"noMavenJavadoc": True,
Expand Down

0 comments on commit 9d40408

Please sign in to comment.