Skip to content

Commit 8226d44

Browse files
authored
Merge pull request #475 from tokuhirom/archiveClassifier
Use `archiveClassifier` instead of deprecated `classifier`
2 parents 66214d6 + 54d4b1c commit 8226d44

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ subprojects {
172172
}
173173

174174
task javadocJar(type: Jar, dependsOn: 'javadoc') {
175-
classifier = 'javadoc'
175+
archiveClassifier.set('javadoc')
176176
from javadoc.destinationDir
177177
}
178178

179179
task sourcesJar(type: Jar, dependsOn: 'classes') {
180-
classifier = 'sources'
180+
archiveClassifier.set('sources')
181181
from sourceSets.main.allSource
182182
}
183183

line-bot-cli/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bootJar {
3434
launchScript {
3535
script = file('src/main/resources/launch.script')
3636
}
37-
classifier = 'exec'
37+
archiveClassifier.set('exec')
3838
mainClassName = 'com.linecorp.bot.cli.Application'
3939
}
4040

@@ -48,6 +48,8 @@ bootJar.dependsOn jar
4848
signArchives.dependsOn bootJar
4949

5050
// Add exec jar into archives to be uploaded.
51-
artifacts.add('archives', file("$buildDir/libs/${project.name}-${project.version}-${bootJar.classifier}.jar")) {
52-
classifier = bootJar.classifier
51+
artifacts.add(
52+
'archives',
53+
file("$buildDir/libs/${project.name}-${project.version}-${bootJar.archiveClassifier.get()}.jar")) {
54+
classifier = bootJar.archiveClassifier.get()
5355
}

0 commit comments

Comments
 (0)