diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-07-09 00:51:02 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-07-09 00:51:02 +0200 |
commit | 4217b24cd988fb554c55cac195135423ecb8bbac (patch) | |
tree | 687649f8ac347d9c21ee110e1e5d887b64299b4b | |
parent | build: publish version catalog and BOM (diff) | |
download | refinery-4217b24cd988fb554c55cac195135423ecb8bbac.tar.gz refinery-4217b24cd988fb554c55cac195135423ecb8bbac.tar.zst refinery-4217b24cd988fb554c55cac195135423ecb8bbac.zip |
build: do not publish applications
But enforce their platform BOMs.
11 files changed, 21 insertions, 21 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index e469590a..43083252 100644 --- a/build.gradle.kts +++ b/build.gradle.kts | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn | 7 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn |
8 | import tools.refinery.gradle.MavenPublishPlugin | ||
8 | 9 | ||
9 | plugins { | 10 | plugins { |
10 | alias(pluginLibs.plugins.versions) | 11 | alias(pluginLibs.plugins.versions) |
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts index 5dc4d934..ec81e029 100644 --- a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts | |||
@@ -12,7 +12,6 @@ plugins { | |||
12 | jacoco | 12 | jacoco |
13 | java | 13 | java |
14 | id("tools.refinery.gradle.eclipse") | 14 | id("tools.refinery.gradle.eclipse") |
15 | id("tools.refinery.gradle.maven-publish") | ||
16 | } | 15 | } |
17 | 16 | ||
18 | repositories { | 17 | repositories { |
@@ -27,7 +26,6 @@ configurations.testRuntimeClasspath { | |||
27 | val libs = the<LibrariesForLibs>() | 26 | val libs = the<LibrariesForLibs>() |
28 | 27 | ||
29 | dependencies { | 28 | dependencies { |
30 | implementation(platform(project(":refinery-bom-dependencies"))) | ||
31 | compileOnly(libs.jetbrainsAnnotations) | 29 | compileOnly(libs.jetbrainsAnnotations) |
32 | testCompileOnly(libs.jetbrainsAnnotations) | 30 | testCompileOnly(libs.jetbrainsAnnotations) |
33 | testImplementation(libs.hamcrest) | 31 | testImplementation(libs.hamcrest) |
@@ -51,10 +49,6 @@ java { | |||
51 | } | 49 | } |
52 | } | 50 | } |
53 | 51 | ||
54 | publishing.publications.named<MavenPublication>("mavenJava") { | ||
55 | from(components["java"]) | ||
56 | } | ||
57 | |||
58 | tasks { | 52 | tasks { |
59 | test { | 53 | test { |
60 | useJUnitPlatform { | 54 | useJUnitPlatform { |
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts index 1292620a..73696301 100644 --- a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts +++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts | |||
@@ -23,6 +23,7 @@ val libs = the<LibrariesForLibs>() | |||
23 | dependencies { | 23 | dependencies { |
24 | implementation(libs.slf4j.simple) | 24 | implementation(libs.slf4j.simple) |
25 | implementation(libs.slf4j.log4j) | 25 | implementation(libs.slf4j.log4j) |
26 | implementation(enforcedPlatform(project(":refinery-bom-dependencies"))) | ||
26 | } | 27 | } |
27 | 28 | ||
28 | // See https://github.com/johnrengelman/shadow/issues/586 | 29 | // See https://github.com/johnrengelman/shadow/issues/586 |
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-library.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-library.gradle.kts index 3aff3833..3f68057a 100644 --- a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-library.gradle.kts +++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-library.gradle.kts | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/> | 2 | * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/> |
3 | * | 3 | * |
4 | * SPDX-License-Identifier: EPL-2.0 | 4 | * SPDX-License-Identifier: EPL-2.0 |
5 | */ | 5 | */ |
@@ -8,4 +8,13 @@ package tools.refinery.gradle | |||
8 | plugins { | 8 | plugins { |
9 | `java-library` | 9 | `java-library` |
10 | id("tools.refinery.gradle.internal.java-conventions") | 10 | id("tools.refinery.gradle.internal.java-conventions") |
11 | id("tools.refinery.gradle.maven-publish") | ||
12 | } | ||
13 | |||
14 | dependencies { | ||
15 | api(platform(project(":refinery-bom-dependencies"))) | ||
16 | } | ||
17 | |||
18 | publishing.publications.named<MavenPublication>("mavenJava") { | ||
19 | from(components["java"]) | ||
11 | } | 20 | } |
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-test-fixtures.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-test-fixtures.gradle.kts index 004be8b4..ea3e8bca 100644 --- a/buildSrc/src/main/kotlin/tools/refinery/gradle/java-test-fixtures.gradle.kts +++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/java-test-fixtures.gradle.kts | |||
@@ -11,6 +11,7 @@ import tools.refinery.gradle.utils.EclipseUtils | |||
11 | plugins { | 11 | plugins { |
12 | `java-test-fixtures` | 12 | `java-test-fixtures` |
13 | id("tools.refinery.gradle.internal.java-conventions") | 13 | id("tools.refinery.gradle.internal.java-conventions") |
14 | id("tools.refinery.gradle.maven-publish") | ||
14 | } | 15 | } |
15 | 16 | ||
16 | publishing.publications { | 17 | publishing.publications { |
diff --git a/subprojects/bom/build.gradle.kts b/subprojects/bom/build.gradle.kts index 61c55391..8a7c3610 100644 --- a/subprojects/bom/build.gradle.kts +++ b/subprojects/bom/build.gradle.kts | |||
@@ -4,6 +4,8 @@ | |||
4 | * SPDX-License-Identifier: EPL-2.0 | 4 | * SPDX-License-Identifier: EPL-2.0 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | import tools.refinery.gradle.JavaLibraryPlugin | ||
8 | |||
7 | plugins { | 9 | plugins { |
8 | id("tools.refinery.gradle.maven-bom") | 10 | id("tools.refinery.gradle.maven-bom") |
9 | } | 11 | } |
@@ -25,7 +27,7 @@ dependencies { | |||
25 | gradle.projectsEvaluated { | 27 | gradle.projectsEvaluated { |
26 | dependencies.constraints { | 28 | dependencies.constraints { |
27 | for (subproject in rootProject.subprojects) { | 29 | for (subproject in rootProject.subprojects) { |
28 | if (subproject.plugins.hasPlugin(JavaPlugin::class)) { | 30 | if (subproject.plugins.hasPlugin(JavaLibraryPlugin::class)) { |
29 | api(project(subproject.path)) | 31 | api(project(subproject.path)) |
30 | } | 32 | } |
31 | } | 33 | } |
diff --git a/subprojects/docs/build.gradle.kts b/subprojects/docs/build.gradle.kts index 631df761..ab67128a 100644 --- a/subprojects/docs/build.gradle.kts +++ b/subprojects/docs/build.gradle.kts | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn | 7 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn |
8 | import tools.refinery.gradle.JavaLibraryPlugin | ||
8 | import tools.refinery.gradle.utils.SonarPropertiesUtils | 9 | import tools.refinery.gradle.utils.SonarPropertiesUtils |
9 | 10 | ||
10 | plugins { | 11 | plugins { |
@@ -24,7 +25,7 @@ val javadocs: Configuration by configurations.creating { | |||
24 | dependencies { | 25 | dependencies { |
25 | gradle.projectsEvaluated { | 26 | gradle.projectsEvaluated { |
26 | for (subproject in rootProject.subprojects) { | 27 | for (subproject in rootProject.subprojects) { |
27 | if (subproject.plugins.hasPlugin(JavaPlugin::class)) { | 28 | if (subproject.plugins.hasPlugin(JavaLibraryPlugin::class)) { |
28 | javadocs(project(subproject.path, "javadocElements")) | 29 | javadocs(project(subproject.path, "javadocElements")) |
29 | } | 30 | } |
30 | } | 31 | } |
diff --git a/subprojects/docs/src/develop/javadoc.md b/subprojects/docs/src/develop/javadoc.md index 225e9de0..e94e3eab 100644 --- a/subprojects/docs/src/develop/javadoc.md +++ b/subprojects/docs/src/develop/javadoc.md | |||
@@ -12,12 +12,10 @@ Here you can find API documentation for Refinery components automatically genera | |||
12 | # Refinery | 12 | # Refinery |
13 | 13 | ||
14 | * [`tools.refinery:refinery-generator`](pathname://refinery-generator) | 14 | * [`tools.refinery:refinery-generator`](pathname://refinery-generator) |
15 | * [`tools.refinery:refinery-generator-cli`](pathname://refinery-generator-cli) | ||
16 | * [`tools.refinery:refinery-language`](pathname://refinery-language) | 15 | * [`tools.refinery:refinery-language`](pathname://refinery-language) |
17 | * [`tools.refinery:refinery-language-ide`](pathname://refinery-language-ide) | 16 | * [`tools.refinery:refinery-language-ide`](pathname://refinery-language-ide) |
18 | * [`tools.refinery:refinery-language-model`](pathname://refinery-language-model) | 17 | * [`tools.refinery:refinery-language-model`](pathname://refinery-language-model) |
19 | * [`tools.refinery:refinery-language-semantics`](pathname://refinery-language-semantics) | 18 | * [`tools.refinery:refinery-language-semantics`](pathname://refinery-language-semantics) |
20 | * [`tools.refinery:refinery-language-web`](pathname://refinery-language-web) | ||
21 | * [`tools.refinery:refinery-logic`](pathname://refinery-logic) | 19 | * [`tools.refinery:refinery-logic`](pathname://refinery-logic) |
22 | * [`tools.refinery:refinery-store`](pathname://refinery-store) | 20 | * [`tools.refinery:refinery-store`](pathname://refinery-store) |
23 | * [`tools.refinery:refinery-store-dse`](pathname://refinery-store-dse) | 21 | * [`tools.refinery:refinery-store-dse`](pathname://refinery-store-dse) |
diff --git a/subprojects/generator-cli/build.gradle.kts b/subprojects/generator-cli/build.gradle.kts index da6c92f6..6c681222 100644 --- a/subprojects/generator-cli/build.gradle.kts +++ b/subprojects/generator-cli/build.gradle.kts | |||
@@ -8,11 +8,6 @@ plugins { | |||
8 | id("tools.refinery.gradle.java-application") | 8 | id("tools.refinery.gradle.java-application") |
9 | } | 9 | } |
10 | 10 | ||
11 | mavenArtifact { | ||
12 | name = "Generator CLI" | ||
13 | description = "CLI for model generation" | ||
14 | } | ||
15 | |||
16 | dependencies { | 11 | dependencies { |
17 | implementation(project(":refinery-generator")) | 12 | implementation(project(":refinery-generator")) |
18 | implementation(libs.jcommander) | 13 | implementation(libs.jcommander) |
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts index 73e80b1d..00570e48 100644 --- a/subprojects/language-web/build.gradle.kts +++ b/subprojects/language-web/build.gradle.kts | |||
@@ -9,10 +9,6 @@ plugins { | |||
9 | id("tools.refinery.gradle.xtext-generated") | 9 | id("tools.refinery.gradle.xtext-generated") |
10 | } | 10 | } |
11 | 11 | ||
12 | mavenArtifact { | ||
13 | description = "Cloud-based partial modeling environment" | ||
14 | } | ||
15 | |||
16 | val webapp: Configuration by configurations.creating { | 12 | val webapp: Configuration by configurations.creating { |
17 | isCanBeConsumed = false | 13 | isCanBeConsumed = false |
18 | isCanBeResolved = true | 14 | isCanBeResolved = true |
diff --git a/subprojects/versions/build.gradle.kts b/subprojects/versions/build.gradle.kts index cf446753..0cc9e811 100644 --- a/subprojects/versions/build.gradle.kts +++ b/subprojects/versions/build.gradle.kts | |||
@@ -4,6 +4,8 @@ | |||
4 | * SPDX-License-Identifier: EPL-2.0 | 4 | * SPDX-License-Identifier: EPL-2.0 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | import tools.refinery.gradle.JavaLibraryPlugin | ||
8 | |||
7 | plugins { | 9 | plugins { |
8 | `version-catalog` | 10 | `version-catalog` |
9 | id("tools.refinery.gradle.maven-publish") | 11 | id("tools.refinery.gradle.maven-publish") |
@@ -33,7 +35,7 @@ publishing.publications.named<MavenPublication>("mavenJava") { | |||
33 | gradle.projectsEvaluated { | 35 | gradle.projectsEvaluated { |
34 | catalog.versionCatalog { | 36 | catalog.versionCatalog { |
35 | for (subproject in rootProject.subprojects) { | 37 | for (subproject in rootProject.subprojects) { |
36 | if (subproject.plugins.hasPlugin(JavaPlugin::class)) { | 38 | if (subproject.plugins.hasPlugin(JavaLibraryPlugin::class)) { |
37 | val alias = subproject.name.removePrefix("refinery-") | 39 | val alias = subproject.name.removePrefix("refinery-") |
38 | val group = subproject.group.toString() | 40 | val group = subproject.group.toString() |
39 | val versionRef = if (interpreterGroup == group) interpreterVersion else refineryVersion | 41 | val versionRef = if (interpreterGroup == group) interpreterVersion else refineryVersion |