Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use gradle 'group' property instead of 'groupId' #116

Merged
merged 1 commit into from
Mar 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ plugins {
alias(libs.plugins.publish) apply false
}

val groupId: String by project
val group: String by project
val annotationProcessorVersion: String by project

allprojects {
apply(plugin = "org.eclipse.edc.edc-build")
group = groupId
apply(plugin = "${group}.edc-build")

configure<org.eclipse.edc.plugins.autodoc.AutodocExtension> {
processorVersion.set(annotationProcessorVersion)
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
groupId=org.eclipse.edc
group=org.eclipse.edc
version=0.0.1-SNAPSHOT

annotationProcessorVersion=0.0.1-SNAPSHOT
4 changes: 2 additions & 2 deletions plugins/autodoc/autodoc-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
implementation(libs.jackson.datatypeJsr310)
}

val groupId: String by project
val group: String by project

gradlePlugin {
website.set("https://projects.eclipse.org/projects/technology.edc")
Expand All @@ -22,7 +22,7 @@ gradlePlugin {
displayName = "autodoc"
description =
"Plugin to generate a documentation manifest for the EDC Metamodel, i.e. extensions, SPIs, etc."
id = "${groupId}.autodoc"
id = "${group}.autodoc"
implementationClass = "org.eclipse.edc.plugins.autodoc.AutodocPlugin"
tags.set(listOf("build", "documentation", "generated", "autodoc"))
}
Expand Down
3 changes: 1 addition & 2 deletions plugins/edc-build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ This module contains a Gradle Plugin, that acts as a "meta-plugin" of sorts, bec
Note that the `edc.publish.repoName=foobar` is important, because it will define actual
command `publishAllPublicationsToFoobar`
- performs general configuration, e.g. adding standard dependencies to all projects
- applies the `groupId`
- applies all values for the signing config, e.g. developer name, etc.
- applies all values for the signing config, e.g. developer name, etc.
6 changes: 3 additions & 3 deletions plugins/edc-build/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-gradle-plugin`
}

val groupId: String by project
val group: String by project

repositories {
mavenCentral()
Expand Down Expand Up @@ -32,15 +32,15 @@ gradlePlugin {
displayName = "edc-build-base"
description =
"Meta-plugin that provides the capabilities of the EDC build"
id = "${groupId}.edc-build-base"
id = "${group}.edc-build-base"
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildBasePlugin"
tags.set(listOf("build", "verification", "test"))
}
create("edc-build") {
displayName = "edc-build"
description =
"Plugin that applies the base capabilities and provides default configuration for the EDC build"
id = "${groupId}.edc-build"
id = "${group}.edc-build"
implementationClass = "org.eclipse.edc.plugins.edcbuild.EdcBuildPlugin"
tags.set(listOf("build", "verification", "test"))
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/module-names/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-gradle-plugin`
}

val groupId: String by project
val group: String by project

gradlePlugin {
website.set("https://projects.eclipse.org/projects/technology.edc")
Expand All @@ -13,7 +13,7 @@ gradlePlugin {
displayName = "module-names"
description =
"Plugin to verify that a project has no duplicate submodules (by name)"
id = "${groupId}.module-names"
id = "${group}.module-names"
implementationClass = "org.eclipse.edc.plugins.modulenames.ModuleNamesPlugin"
tags.set(listOf("build", "verification"))
version = version
Expand Down
4 changes: 2 additions & 2 deletions plugins/openapi-merger/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-gradle-plugin`
}

val groupId: String by project
val group: String by project

dependencies {
// contains the actual merger task
Expand All @@ -20,7 +20,7 @@ gradlePlugin {
displayName = "openapi-merger"
description =
"Plugin to several OpenAPI spec files into one"
id = "${groupId}.openapi-merger"
id = "${group}.openapi-merger"
implementationClass = "org.eclipse.edc.plugins.openapimerger.OpenApiMergerPlugin"
tags.set(listOf("build", "openapi", "merge", "documentation"))
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/test-summary/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-gradle-plugin`
}

val groupId: String by project
val group: String by project

gradlePlugin {
website.set("https://projects.eclipse.org/projects/technology.edc")
Expand All @@ -14,7 +14,7 @@ gradlePlugin {
displayName = "test-summary"
description =
"Plugin to verify that a project has no duplicate submodules (by name)"
id = "${groupId}.test-summary"
id = "${group}.test-summary"
implementationClass = "org.eclipse.edc.plugins.testsummary.TestSummaryPlugin"
tags.set(listOf("build", "verification", "test"))
}
Expand Down