diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-11-17 03:56:45 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-11-17 03:56:45 +0100 |
commit | 2457f042578634478965212067df82bef2cb8eb4 (patch) | |
tree | cd5e45280f0792333f782109325d04739c86bcb3 | |
parent | build: merge java and junit conventions (diff) | |
download | refinery-2457f042578634478965212067df82bef2cb8eb4.tar.gz refinery-2457f042578634478965212067df82bef2cb8eb4.tar.zst refinery-2457f042578634478965212067df82bef2cb8eb4.zip |
build: library and application convetion plugins
-rw-r--r-- | buildSrc/build.gradle | 4 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-application.gradle | 11 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-conventions.gradle (renamed from buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle) | 1 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-java-library.gradle | 4 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-jmh.gradle (renamed from buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle) | 2 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-mwe2.gradle (renamed from buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle) | 2 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-xtend.gradle (renamed from buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle) | 2 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/refinery-xtext-conventions.gradle (renamed from buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle) | 2 | ||||
-rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
-rw-r--r-- | language-ide/build.gradle | 4 | ||||
-rw-r--r-- | language-model/build.gradle | 5 | ||||
-rw-r--r-- | language-to-store/build.gradle | 5 | ||||
-rw-r--r-- | language-web/build.gradle | 15 | ||||
-rw-r--r-- | language/build.gradle | 8 | ||||
-rw-r--r-- | store/build.gradle | 5 |
15 files changed, 41 insertions, 31 deletions
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 74fe04fb..05b2363b 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle | |||
@@ -7,6 +7,10 @@ repositories { | |||
7 | } | 7 | } |
8 | 8 | ||
9 | dependencies { | 9 | dependencies { |
10 | implementation libs.shadowGradle | ||
10 | implementation libs.sonarqubeGradle | 11 | implementation libs.sonarqubeGradle |
11 | implementation libs.xtendGradle | 12 | implementation libs.xtendGradle |
12 | } | 13 | } |
14 | |||
15 | sourceCompatibility = '17' | ||
16 | targetCompatibility = '17' | ||
diff --git a/buildSrc/src/main/groovy/refinery-java-application.gradle b/buildSrc/src/main/groovy/refinery-java-application.gradle new file mode 100644 index 00000000..1566f3c0 --- /dev/null +++ b/buildSrc/src/main/groovy/refinery-java-application.gradle | |||
@@ -0,0 +1,11 @@ | |||
1 | plugins { | ||
2 | id 'application' | ||
3 | id 'com.github.johnrengelman.shadow' | ||
4 | id 'refinery-java-conventions' | ||
5 | } | ||
6 | |||
7 | distTar.enabled = false | ||
8 | distZip.enabled = false | ||
9 | |||
10 | shadowDistTar.enabled = false | ||
11 | shadowDistZip.enabled = false | ||
diff --git a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle index 2712d391..fcdc8ea9 100644 --- a/buildSrc/src/main/groovy/tools.refinery.java-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle | |||
@@ -1,6 +1,7 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'eclipse' | 2 | id 'eclipse' |
3 | id 'jacoco' | 3 | id 'jacoco' |
4 | id 'java' | ||
4 | } | 5 | } |
5 | 6 | ||
6 | repositories { | 7 | repositories { |
diff --git a/buildSrc/src/main/groovy/refinery-java-library.gradle b/buildSrc/src/main/groovy/refinery-java-library.gradle new file mode 100644 index 00000000..daa80f17 --- /dev/null +++ b/buildSrc/src/main/groovy/refinery-java-library.gradle | |||
@@ -0,0 +1,4 @@ | |||
1 | plugins { | ||
2 | id 'java-library' | ||
3 | id 'refinery-java-conventions' | ||
4 | } | ||
diff --git a/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle b/buildSrc/src/main/groovy/refinery-jmh.gradle index 0a82ae4b..553c469b 100644 --- a/buildSrc/src/main/groovy/tools.refinery.jmh-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-jmh.gradle | |||
@@ -1,6 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'org.sonarqube' | 2 | id 'org.sonarqube' |
3 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-java-conventions' |
4 | } | 4 | } |
5 | 5 | ||
6 | configurations { | 6 | configurations { |
diff --git a/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle b/buildSrc/src/main/groovy/refinery-mwe2.gradle index fe213d42..c7f15e82 100644 --- a/buildSrc/src/main/groovy/tools.refinery.mwe2-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-mwe2.gradle | |||
@@ -1,6 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'eclipse' | 2 | id 'eclipse' |
3 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-java-conventions' |
4 | } | 4 | } |
5 | 5 | ||
6 | configurations { | 6 | configurations { |
diff --git a/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle b/buildSrc/src/main/groovy/refinery-xtend.gradle index 98fc131c..9281ab1f 100644 --- a/buildSrc/src/main/groovy/tools.refinery.xtend-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-xtend.gradle | |||
@@ -1,7 +1,7 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'org.sonarqube' | 2 | id 'org.sonarqube' |
3 | id 'org.xtext.xtend' | 3 | id 'org.xtext.xtend' |
4 | id 'tools.refinery.java-conventions' | 4 | id 'refinery-java-conventions' |
5 | } | 5 | } |
6 | 6 | ||
7 | sourceSets { | 7 | sourceSets { |
diff --git a/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle index 3fd2f9d6..a91d723e 100644 --- a/buildSrc/src/main/groovy/tools.refinery.xtext-conventions.gradle +++ b/buildSrc/src/main/groovy/refinery-xtext-conventions.gradle | |||
@@ -1,6 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'org.sonarqube' | 2 | id 'org.sonarqube' |
3 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-java-conventions' |
4 | } | 4 | } |
5 | 5 | ||
6 | sourceSets { | 6 | sourceSets { |
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3f08c9ab..978aa36b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml | |||
@@ -26,6 +26,7 @@ mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version | |||
26 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" } | 26 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" } |
27 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } | 27 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } |
28 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } | 28 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } |
29 | shadowGradle = { group = "gradle.plugin.com.github.johnrengelman", name = "shadow", version = "7.1.0" } | ||
29 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } | 30 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } |
30 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } | 31 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } |
31 | sonarqubeGradle = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version = "3.3" } | 32 | sonarqubeGradle = { group = "org.sonarsource.scanner.gradle", name = "sonarqube-gradle-plugin", version = "3.3" } |
@@ -43,5 +44,4 @@ xtext-xbase = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase", v | |||
43 | xtext-xbase-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase.ide", version.ref = "xtext" } | 44 | xtext-xbase-ide = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xbase.ide", version.ref = "xtext" } |
44 | 45 | ||
45 | [plugins] | 46 | [plugins] |
46 | shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.0" } | ||
47 | frontend = { id = "org.siouan.frontend-jdk11", version = "5.3.0" } | 47 | frontend = { id = "org.siouan.frontend-jdk11", version = "5.3.0" } |
diff --git a/language-ide/build.gradle b/language-ide/build.gradle index 91f21109..3786762b 100644 --- a/language-ide/build.gradle +++ b/language-ide/build.gradle | |||
@@ -1,6 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java-library' | 2 | id 'refinery-java-library' |
3 | id 'tools.refinery.xtext-conventions' | 3 | id 'refinery-xtext-conventions' |
4 | } | 4 | } |
5 | 5 | ||
6 | dependencies { | 6 | dependencies { |
diff --git a/language-model/build.gradle b/language-model/build.gradle index 0add85d9..4c30e62f 100644 --- a/language-model/build.gradle +++ b/language-model/build.gradle | |||
@@ -1,8 +1,7 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java-library' | ||
3 | id 'java-test-fixtures' | 2 | id 'java-test-fixtures' |
4 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-java-library' |
5 | id 'tools.refinery.mwe2-conventions' | 4 | id 'refinery-mwe2' |
6 | } | 5 | } |
7 | 6 | ||
8 | dependencies { | 7 | dependencies { |
diff --git a/language-to-store/build.gradle b/language-to-store/build.gradle index 92de9458..f1c1564d 100644 --- a/language-to-store/build.gradle +++ b/language-to-store/build.gradle | |||
@@ -1,7 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java-library' | 2 | id 'refinery-java-library' |
3 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-xtext-conventions' |
4 | id 'tools.refinery.xtend-conventions' | ||
5 | } | 4 | } |
6 | 5 | ||
7 | dependencies { | 6 | dependencies { |
diff --git a/language-web/build.gradle b/language-web/build.gradle index 9f092e5e..7306869b 100644 --- a/language-web/build.gradle +++ b/language-web/build.gradle | |||
@@ -1,9 +1,7 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java' | ||
3 | id 'application' | ||
4 | alias libs.plugins.frontend | 2 | alias libs.plugins.frontend |
5 | alias libs.plugins.shadow | 3 | id 'refinery-java-application' |
6 | id 'tools.refinery.xtext-conventions' | 4 | id 'refinery-xtext-conventions' |
7 | } | 5 | } |
8 | 6 | ||
9 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn | 7 | import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn |
@@ -99,6 +97,8 @@ tasks.named('check') { | |||
99 | dependsOn(eslint, stylelint) | 97 | dependsOn(eslint, stylelint) |
100 | } | 98 | } |
101 | 99 | ||
100 | mainClassName = serverMainClass | ||
101 | |||
102 | tasks.named('jar') { | 102 | tasks.named('jar') { |
103 | dependsOn assembleFrontend | 103 | dependsOn assembleFrontend |
104 | from(productionResources) { | 104 | from(productionResources) { |
@@ -106,13 +106,6 @@ tasks.named('jar') { | |||
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | mainClassName = serverMainClass | ||
110 | distTar.enabled = false | ||
111 | distZip.enabled = false | ||
112 | |||
113 | shadowDistTar.enabled = false | ||
114 | shadowDistZip.enabled = false | ||
115 | |||
116 | tasks.named('shadowJar') { | 109 | tasks.named('shadowJar') { |
117 | dependsOn assembleFrontend | 110 | dependsOn assembleFrontend |
118 | from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output) | 111 | from(project.convention.getPlugin(JavaPluginConvention).sourceSets.main.output) |
diff --git a/language/build.gradle b/language/build.gradle index 4208979f..7f956a47 100644 --- a/language/build.gradle +++ b/language/build.gradle | |||
@@ -1,9 +1,9 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java-library' | ||
3 | id 'java-test-fixtures' | 2 | id 'java-test-fixtures' |
4 | id 'tools.refinery.xtext-conventions' | 3 | id 'refinery-java-library' |
5 | id 'tools.refinery.mwe2-conventions' | 4 | id 'refinery-mwe2' |
6 | id 'tools.refinery.xtend-conventions' | 5 | id 'refinery-xtend' |
6 | id 'refinery-xtext-conventions' | ||
7 | } | 7 | } |
8 | 8 | ||
9 | dependencies { | 9 | dependencies { |
diff --git a/store/build.gradle b/store/build.gradle index 43a496ba..8d091a81 100644 --- a/store/build.gradle +++ b/store/build.gradle | |||
@@ -1,7 +1,6 @@ | |||
1 | plugins { | 1 | plugins { |
2 | id 'java-library' | 2 | id 'refinery-java-library' |
3 | id 'tools.refinery.java-conventions' | 3 | id 'refinery-jmh' |
4 | id 'tools.refinery.jmh-conventions' | ||
5 | } | 4 | } |
6 | 5 | ||
7 | dependencies { | 6 | dependencies { |