Skip to content

Commit 1db9fe4

Browse files
committed
[skip ci] publish shadow jar and regular jar
1 parent 333a5bf commit 1db9fe4

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

grails-forge/grails-cli/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jarTask.configure { Jar it ->
7777

7878
TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
7979
shadowJarTask.configure { ShadowJar it ->
80-
it.archiveClassifier.set('')
80+
it.archiveClassifier.set('all')
8181

8282
// TODO: This needs reworked so we have one consistent license view, for now the disclaimer is shipped so this should suffice until this is fixed.
8383
it.transform(ApacheLicenseResourceTransformer)
@@ -88,6 +88,8 @@ shadowJarTask.configure { ShadowJar it ->
8888
it.mergeServiceFiles()
8989
it.mergeServiceFiles('META-INF/grails.factories')
9090
}
91+
// publish shadow jar separately from the regular library
92+
artifacts { archives shadowJarTask }
9193

9294
TaskProvider<CreateStartScripts> cliStartScripts = tasks.register('createCliStartScripts', CreateStartScripts)
9395
cliStartScripts.configure { CreateStartScripts t ->

grails-forge/grails-forge-cli/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jarTask.configure { Jar it ->
158158

159159
TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
160160
shadowJarTask.configure { ShadowJar it ->
161-
it.archiveClassifier.set('')
161+
it.archiveClassifier.set('all')
162162

163163
// TODO: This needs reworked so we have one consistent license view, for now the disclaimer is shipped so this should suffice until this is fixed.
164164
it.transform(ApacheLicenseResourceTransformer)
@@ -167,6 +167,8 @@ shadowJarTask.configure { ShadowJar it ->
167167

168168
it.mergeServiceFiles()
169169
}
170+
// publish shadow jar separately from the regular library
171+
artifacts { archives shadowJarTask }
170172

171173
TaskProvider<CreateStartScripts> forgeCliStartScripts = tasks.register('createForgeCliStartScripts', CreateStartScripts)
172174
forgeCliStartScripts.configure { CreateStartScripts t ->
@@ -213,9 +215,6 @@ distZipTask.configure {
213215
tasks.named('distTar').configure {
214216
dependsOn(forgeCliStartScripts, jarTask, shadowJarTask, buildCompletion)
215217
}
216-
tasks.named('build').configure {
217-
it.dependsOn(distZipTask)
218-
}
219218
tasks.named('assemble').configure {
220219
dependsOn(distZipTask)
221220
}

0 commit comments

Comments
 (0)