Skip to content

Commit 8ae4895

Browse files
committed
[C++] Fix build for using Gradle 5.2.1.
1 parent 7f13deb commit 8ae4895

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ file(GLOB_RECURSE SBE_SOURCES
110110
)
111111

112112
add_custom_command(OUTPUT ${SBE_JAR}
113-
COMMAND ./gradlew build -x test -x check -x javadoc :sbe-all:build
113+
COMMAND ./gradlew -x test -x check -x javadoc
114114
DEPENDS ${SBE_SOURCES}
115115
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
116116
COMMENT "Generating SBE jar"

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,15 @@ project(':sbe-tool') {
250250
}
251251

252252
task sourcesJar(type: Jar) {
253-
classifier = 'sources'
253+
archiveClassifier = 'sources'
254254
from sourceSets.main.allSource
255255

256256
dependsOn 'copyCppFiles'
257257
from 'build/generated/cpp'
258258
}
259259

260260
task javadocJar(type: Jar, dependsOn: javadoc) {
261-
classifier = 'javadoc'
261+
archiveClassifier = 'javadoc'
262262
from javadoc.destinationDir
263263
}
264264

@@ -276,7 +276,7 @@ project(':sbe-all') {
276276
}
277277

278278
task sourcesJar(type: Jar) {
279-
classifier = 'sources'
279+
archiveClassifier = 'sources'
280280
from project(':sbe-tool').sourceSets.main.allSource
281281
}
282282

@@ -285,12 +285,12 @@ project(':sbe-all') {
285285
}
286286

287287
task javadocJar(type: Jar, dependsOn: javadoc) {
288-
classifier = 'javadoc'
288+
archiveClassifier = 'javadoc'
289289
from javadoc.destinationDir
290290
}
291291

292292
shadowJar {
293-
classifier = ''
293+
archiveClassifier = ''
294294
manifest.attributes(
295295
'Main-Class': 'uk.co.real_logic.sbe.SbeTool',
296296
'Specification-Title': 'Simple Binary Encoding',
@@ -426,12 +426,12 @@ project(':sbe-samples') {
426426
}
427427

428428
task sourcesJar(type: Jar) {
429-
classifier = 'sources'
429+
archiveClassifier = 'sources'
430430
from sourceSets.main.allSource
431431
}
432432

433433
task javadocJar(type: Jar, dependsOn: javadoc) {
434-
classifier = 'javadoc'
434+
archiveClassifier = 'javadoc'
435435
from javadoc.destinationDir
436436
}
437437

@@ -482,8 +482,8 @@ project(':sbe-benchmarks') {
482482
}
483483

484484
shadowJar {
485-
archiveName = 'sbe-benchmarks.jar'
486-
classifier = 'benchmarks'
485+
archiveFileName = 'sbe-benchmarks.jar'
486+
archiveClassifier = 'benchmarks'
487487
manifest.attributes('Main-Class': 'org.openjdk.jmh.Main')
488488
}
489489

@@ -506,12 +506,12 @@ project(':sbe-benchmarks') {
506506
}
507507

508508
task sourcesJar(type: Jar) {
509-
classifier = 'sources'
509+
archiveClassifier = 'sources'
510510
from sourceSets.main.allSource
511511
}
512512

513513
task javadocJar(type: Jar, dependsOn: javadoc) {
514-
classifier = 'javadoc'
514+
archiveClassifier = 'javadoc'
515515
from javadoc.destinationDir
516516
}
517517

0 commit comments

Comments
 (0)