Skip to content

Commit f8478b3

Browse files
committed
build: prepare release to the gradle plugin portal
1 parent ea6b20f commit f8478b3

File tree

4 files changed

+42
-31
lines changed

4 files changed

+42
-31
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
required: true
8+
description: version to be released
9+
push: # todo: to be removed
10+
11+
jobs:
12+
release:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: eclipse-edc/.github/.github/actions/setup-build@main
17+
- run: ./gradlew -Pversion=0.0.1 :plugins:edc-build:publishPlugins
18+
env:
19+
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
20+
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
21+
22+
# todo: create tag, create release
23+
24+
25+

plugins/edc-build/build.gradle.kts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
`java-gradle-plugin`
2+
alias(libs.plugins.publish)
33
}
44

55
val group: String by project
@@ -10,7 +10,6 @@ repositories {
1010
}
1111

1212
dependencies {
13-
implementation(project(":plugins:autodoc:autodoc-plugin"))
1413
implementation(project(":plugins:test-summary"))
1514
implementation(project(":plugins:module-names"))
1615
implementation(project(":plugins:openapi-merger"))
@@ -24,23 +23,15 @@ dependencies {
2423
gradlePlugin {
2524
website.set("https://projects.eclipse.org/projects/technology.edc")
2625
vcsUrl.set("https://github.com/eclipse-edc/GradlePlugins.git")
27-
// Define the plugins
26+
2827
plugins {
29-
create("edc-build-base") {
30-
displayName = "edc-build-base"
31-
description =
32-
"Meta-plugin that provides the capabilities of the EDC build"
33-
id = "${group}.edc-build-base"
34-
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildBasePlugin"
35-
tags.set(listOf("build", "verification", "test"))
36-
}
3728
create("edc-build") {
29+
id = "${group}.edc-build"
3830
displayName = "edc-build"
3931
description =
4032
"Plugin that applies the base capabilities and provides default configuration for the EDC build"
41-
id = "${group}.edc-build"
4233
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildPlugin"
43-
tags.set(listOf("build", "verification", "test"))
34+
tags = listOf("build", "verification", "test")
4435
}
4536
}
4637
}

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildBasePlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.eclipse.edc.plugins.edcbuild;
1616

1717
import io.github.gradlenexus.publishplugin.NexusPublishPlugin;
18-
import org.eclipse.edc.plugins.autodoc.AutodocPlugin;
1918
import org.eclipse.edc.plugins.modulenames.ModuleNamesPlugin;
2019
import org.eclipse.edc.plugins.openapimerger.OpenApiMergerPlugin;
2120
import org.eclipse.edc.plugins.testsummary.TestSummaryPlugin;
@@ -36,7 +35,6 @@ public class EdcBuildBasePlugin implements Plugin<Project> {
3635
private static void defineCapabilities(Project target) {
3736

3837
target.getPlugins().apply(JavaLibraryPlugin.class);
39-
target.getPlugins().apply(AutodocPlugin.class);
4038
target.getPlugins().apply(CheckstylePlugin.class);
4139
target.getPlugins().apply(MavenPublishPlugin.class);
4240
target.getPlugins().apply(JavaPlugin.class);

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/MavenArtifactConvention.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package org.eclipse.edc.plugins.edcbuild.conventions;
1717

18-
import org.eclipse.edc.plugins.autodoc.AutodocExtension;
1918
import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
2019
import org.eclipse.edc.plugins.edcbuild.extensions.MavenPomExtension;
2120
import org.gradle.api.Action;
@@ -24,14 +23,12 @@
2423
import org.gradle.api.publish.PublishingExtension;
2524
import org.gradle.api.publish.maven.MavenPom;
2625
import org.gradle.api.publish.maven.MavenPublication;
27-
import org.jetbrains.annotations.NotNull;
2826

2927
import java.io.File;
30-
import java.nio.file.Path;
3128

3229
import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;
3330

34-
/**
31+
/**
3532
* Configures the Maven POM for each project:
3633
* <ul>
3734
* <li>sets project name, description, license, SCM info etc.</li>
@@ -53,11 +50,11 @@ public void apply(Project target) {
5350
.map(p -> (MavenPublication) p)
5451
.peek(mavenPub -> mavenPub.pom(pom -> setPomInformation(pomExt, target, pom)))
5552
.forEach(mavenPub -> {
56-
addArtifactIfExist(target, getManifestFile(target), mavenPub, artifact -> {
57-
artifact.setClassifier("manifest");
58-
artifact.setType("json");
59-
artifact.builtBy("autodoc");
60-
});
53+
// addArtifactIfExist(target, getManifestFile(target), mavenPub, artifact -> {
54+
// artifact.setClassifier("manifest");
55+
// artifact.setType("json");
56+
// artifact.builtBy("autodoc");
57+
// });
6158

6259
var openapiFiles = target.getLayout().getBuildDirectory().getAsFile().get().toPath()
6360
.resolve("docs").resolve("openapi").toFile()
@@ -88,13 +85,13 @@ private void addArtifactIfExist(Project project, File location, MavenPublication
8885
}
8986
}
9087

91-
private static @NotNull File getManifestFile(Project target) {
92-
var autodocExt = requireExtension(target, AutodocExtension.class);
93-
var projectBuildDirectory = target.getLayout().getBuildDirectory().getAsFile();
94-
var pathToManifest = autodocExt.getOutputDirectory().convention(projectBuildDirectory).get().getAbsolutePath();
95-
var manifestFileName = "edc.json";
96-
return Path.of(pathToManifest, manifestFileName).toFile();
97-
}
88+
// private static @NotNull File getManifestFile(Project target) {
89+
// var autodocExt = requireExtension(target, AutodocExtension.class);
90+
// var projectBuildDirectory = target.getLayout().getBuildDirectory().getAsFile();
91+
// var pathToManifest = autodocExt.getOutputDirectory().convention(projectBuildDirectory).get().getAbsolutePath();
92+
// var manifestFileName = "edc.json";
93+
// return Path.of(pathToManifest, manifestFileName).toFile();
94+
// }
9895

9996
private static void setPomInformation(MavenPomExtension pomExt, Project project, MavenPom pom) {
10097
// these properties are mandatory!

0 commit comments

Comments
 (0)