aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle.kts1
-rw-r--r--buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts6
-rw-r--r--buildSrc/src/main/kotlin/tools/refinery/gradle/java-application.gradle.kts1
-rw-r--r--buildSrc/src/main/kotlin/tools/refinery/gradle/java-library.gradle.kts11
-rw-r--r--buildSrc/src/main/kotlin/tools/refinery/gradle/java-test-fixtures.gradle.kts1
-rw-r--r--subprojects/bom/build.gradle.kts4
-rw-r--r--subprojects/docs/build.gradle.kts3
-rw-r--r--subprojects/docs/src/develop/javadoc.md2
-rw-r--r--subprojects/generator-cli/build.gradle.kts5
-rw-r--r--subprojects/language-web/build.gradle.kts4
-rw-r--r--subprojects/versions/build.gradle.kts4
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
7import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn 7import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
8import tools.refinery.gradle.MavenPublishPlugin
8 9
9plugins { 10plugins {
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
18repositories { 17repositories {
@@ -27,7 +26,6 @@ configurations.testRuntimeClasspath {
27val libs = the<LibrariesForLibs>() 26val libs = the<LibrariesForLibs>()
28 27
29dependencies { 28dependencies {
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
54publishing.publications.named<MavenPublication>("mavenJava") {
55 from(components["java"])
56}
57
58tasks { 52tasks {
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>()
23dependencies { 23dependencies {
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
8plugins { 8plugins {
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
14dependencies {
15 api(platform(project(":refinery-bom-dependencies")))
16}
17
18publishing.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
11plugins { 11plugins {
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
16publishing.publications { 17publishing.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
7import tools.refinery.gradle.JavaLibraryPlugin
8
7plugins { 9plugins {
8 id("tools.refinery.gradle.maven-bom") 10 id("tools.refinery.gradle.maven-bom")
9} 11}
@@ -25,7 +27,7 @@ dependencies {
25gradle.projectsEvaluated { 27gradle.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
7import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn 7import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
8import tools.refinery.gradle.JavaLibraryPlugin
8import tools.refinery.gradle.utils.SonarPropertiesUtils 9import tools.refinery.gradle.utils.SonarPropertiesUtils
9 10
10plugins { 11plugins {
@@ -24,7 +25,7 @@ val javadocs: Configuration by configurations.creating {
24dependencies { 25dependencies {
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
11mavenArtifact {
12 name = "Generator CLI"
13 description = "CLI for model generation"
14}
15
16dependencies { 11dependencies {
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
12mavenArtifact {
13 description = "Cloud-based partial modeling environment"
14}
15
16val webapp: Configuration by configurations.creating { 12val 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
7import tools.refinery.gradle.JavaLibraryPlugin
8
7plugins { 9plugins {
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") {
33gradle.projectsEvaluated { 35gradle.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