Skip to content

Commit 96a86c9

Browse files
mjpt777mjpt777
committed
[Java] Upgrade to Gradle 4.5.
1 parent b012b46 commit 96a86c9

File tree

3 files changed

+57
-57
lines changed

3 files changed

+57
-57
lines changed

‎build.gradle‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ def projectPom = {
9191
}
9292
}
9393

94+
allprojects {
95+
repositories {
96+
mavenLocal()
97+
mavenCentral()
98+
}
99+
}
100+
94101
configurations {
95102
shadow
96103
}
@@ -107,11 +114,6 @@ subprojects {
107114
group = sbeGroup
108115
version = sbeVersion
109116

110-
repositories {
111-
mavenLocal()
112-
mavenCentral()
113-
}
114-
115117
jar.enabled = true
116118

117119
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -168,12 +170,12 @@ project(':sbe-tool') {
168170

169171
jar {
170172
manifest.attributes(
171-
'Main-Class': 'uk.co.real_logic.sbe.SbeTool',
172-
'Specification-Title' : 'Simple Binary Encoding',
173-
'Specification-Version' : '1.0',
174-
'Implementation-Title' : 'SBE',
175-
'Implementation-Version' : "${sbeVersion}",
176-
'Implementation-Vendor' : 'Real Logic Limited'
173+
'Main-Class': 'uk.co.real_logic.sbe.SbeTool',
174+
'Specification-Title' : 'Simple Binary Encoding',
175+
'Specification-Version' : '1.0',
176+
'Implementation-Title' : 'SBE',
177+
'Implementation-Version' : "${sbeVersion}",
178+
'Implementation-Vendor' : 'Real Logic Limited'
177179
)
178180
}
179181

@@ -192,10 +194,10 @@ project(':sbe-tool') {
192194
main = 'uk.co.real_logic.sbe.SbeTool'
193195
classpath = sourceSets.main.runtimeClasspath
194196
systemProperties(
195-
'sbe.output.dir': 'build/generated',
196-
'sbe.target.language': 'Java',
197-
'sbe.validation.stop.on.error': 'true',
198-
'sbe.validation.xsd': validationXsdPath)
197+
'sbe.output.dir': 'build/generated',
198+
'sbe.target.language': 'Java',
199+
'sbe.validation.stop.on.error': 'true',
200+
'sbe.validation.xsd': validationXsdPath)
199201
args = ['src/test/resources/json-printer-test-schema.xml',
200202
'src/test/resources/composite-elements-schema.xml']
201203
}
@@ -254,13 +256,12 @@ project(':sbe-all') {
254256
shadowJar {
255257
classifier = ''
256258
manifest.attributes(
257-
'Main-Class': 'uk.co.real_logic.sbe.SbeTool',
258-
'Specification-Title' : 'Simple Binary Encoding',
259-
'Specification-Version' : '1.0',
260-
'Implementation-Title' : 'SBE',
261-
'Implementation-Version' : "${sbeVersion}",
262-
'Implementation-Vendor' : 'Real Logic Limited'
263-
)
259+
'Main-Class': 'uk.co.real_logic.sbe.SbeTool',
260+
'Specification-Title' : 'Simple Binary Encoding',
261+
'Specification-Version' : '1.0',
262+
'Implementation-Title' : 'SBE',
263+
'Implementation-Version' : "${sbeVersion}",
264+
'Implementation-Vendor' : 'Real Logic Limited')
264265
}
265266

266267
uploadArchives {
@@ -334,11 +335,11 @@ project(':sbe-samples') {
334335
main = 'uk.co.real_logic.sbe.SbeTool'
335336
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
336337
systemProperties(
337-
'sbe.output.dir': 'build/generated',
338-
'sbe.target.language': 'Java',
339-
'sbe.java.generate.interfaces': 'false',
340-
'sbe.validation.stop.on.error': 'true',
341-
'sbe.validation.xsd': validationXsdPath)
338+
'sbe.output.dir': 'build/generated',
339+
'sbe.target.language': 'Java',
340+
'sbe.java.generate.interfaces': 'false',
341+
'sbe.validation.stop.on.error': 'true',
342+
'sbe.validation.xsd': validationXsdPath)
342343
args = ['src/main/resources/example-schema.xml',
343344
'src/main/resources/example-extension-schema.xml']
344345
}
@@ -421,12 +422,12 @@ project(':sbe-benchmarks') {
421422
main = 'uk.co.real_logic.sbe.SbeTool'
422423
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
423424
systemProperties(
424-
'sbe.output.dir': 'build/generated',
425-
'sbe.target.language': 'Java',
426-
'sbe.validation.stop.on.error': 'true',
427-
'sbe.validation.xsd': validationXsdPath,
428-
'sbe.java.encoding.buffer.type': 'org.agrona.concurrent.UnsafeBuffer',
429-
'sbe.java.decoding.buffer.type': 'org.agrona.concurrent.UnsafeBuffer')
425+
'sbe.output.dir': 'build/generated',
426+
'sbe.target.language': 'Java',
427+
'sbe.validation.stop.on.error': 'true',
428+
'sbe.validation.xsd': validationXsdPath,
429+
'sbe.java.encoding.buffer.type': 'org.agrona.concurrent.UnsafeBuffer',
430+
'sbe.java.decoding.buffer.type': 'org.agrona.concurrent.UnsafeBuffer')
430431
args = ['src/main/resources/car.xml', 'src/main/resources/fix-message-samples.xml']
431432
}
432433

@@ -482,9 +483,9 @@ task(generateRustCarExample, type: JavaExec) {
482483
main = 'uk.co.real_logic.sbe.SbeTool'
483484
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
484485
systemProperties(
485-
'sbe.output.dir': 'rust/car_example/src',
486-
'sbe.target.language': 'uk.co.real_logic.sbe.generation.rust.Rust',
487-
'sbe.target.namespace': 'car_example_generated_codec')
486+
'sbe.output.dir': 'rust/car_example/src',
487+
'sbe.target.language': 'uk.co.real_logic.sbe.generation.rust.Rust',
488+
'sbe.target.namespace': 'car_example_generated_codec')
488489
args = ['sbe-tool/src/test/resources/example-schema.xml']
489490
}
490491

@@ -530,8 +531,7 @@ if (cargo_exists()) {
530531

531532
task generateRustCodecs {
532533
description = 'Generate rust test codecs'
533-
dependsOn 'generateRustCarExample',
534-
'generateCarExampleDataFile'
534+
dependsOn 'generateRustCarExample', 'generateCarExampleDataFile'
535535
}
536536

537537
/*
@@ -546,8 +546,8 @@ task(generateGolangCodecTestComposite, type: JavaExec) {
546546
main = 'uk.co.real_logic.sbe.SbeTool'
547547
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
548548
systemProperties(
549-
'sbe.output.dir': 'gocode/src',
550-
'sbe.target.language': 'golang')
549+
'sbe.output.dir': 'gocode/src',
550+
'sbe.target.language': 'golang')
551551
args = ['sbe-tool/src/test/resources/composite-elements-schema-rc4.xml']
552552
}
553553

@@ -564,17 +564,17 @@ task(generateGolangCodecTestGroup, type: JavaExec) {
564564
main = 'uk.co.real_logic.sbe.SbeTool'
565565
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
566566
systemProperties(
567-
'sbe.output.dir': 'gocode/src/group',
568-
'sbe.target.language': 'golang')
567+
'sbe.output.dir': 'gocode/src/group',
568+
'sbe.target.language': 'golang')
569569
args = ['sbe-tool/src/test/resources/basic-group-schema.xml']
570570
}
571571

572572
task(generateGolangCodecTestVarData, type: JavaExec) {
573573
main = 'uk.co.real_logic.sbe.SbeTool'
574574
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
575575
systemProperties(
576-
'sbe.output.dir': 'gocode/src/vardata',
577-
'sbe.target.language': 'golang')
576+
'sbe.output.dir': 'gocode/src/vardata',
577+
'sbe.target.language': 'golang')
578578
args = ['sbe-tool/src/test/resources/basic-variable-length-schema.xml']
579579
}
580580

@@ -604,10 +604,10 @@ task(generateGolangCodecsWithXSD, type: JavaExec) {
604604
task generateGolangCodecs {
605605
description = 'Generate golang test codecs'
606606
dependsOn 'generateGolangCodecTestVarData',
607-
'generateGolangCodecTestGroup',
608-
'generateGolangCodecTestBasic',
609-
'generateGolangCodecTestComposite',
610-
'generateGolangCodecsWithXSD'
607+
'generateGolangCodecTestGroup',
608+
'generateGolangCodecTestBasic',
609+
'generateGolangCodecTestComposite',
610+
'generateGolangCodecsWithXSD'
611611
}
612612

613613
task(generateCSharpCodecs, type: JavaExec) {
@@ -664,20 +664,20 @@ task generateIrCodecs {
664664

665665
task runBenchmarks(type: Exec) {
666666
commandLine 'java',
667-
'-Dagrona.disable.bounds.checks=true',
668-
'-jar', 'sbe-benchmarks/build/libs/sbe-benchmarks.jar',
669-
'-wi', '3', '-i', '5', '-tu', 'ns', '-f', '5'
667+
'-Dagrona.disable.bounds.checks=true',
668+
'-jar', 'sbe-benchmarks/build/libs/sbe-benchmarks.jar',
669+
'-wi', '3', '-i', '5', '-tu', 'ns', '-f', '5'
670670
}
671671

672672
task uploadToMavenCentral {
673673
dependsOn 'sbe-tool:uploadArchives',
674-
'sbe-samples:uploadArchives',
675-
'sbe-benchmarks:uploadArchives',
676-
'sbe-all:uploadArchives',
677-
'sbe-all:uploadShadow'
674+
'sbe-samples:uploadArchives',
675+
'sbe-benchmarks:uploadArchives',
676+
'sbe-all:uploadArchives',
677+
'sbe-all:uploadShadow'
678678
}
679679

680680
task wrapper(type: Wrapper) {
681-
gradleVersion = '4.4'
681+
gradleVersion = '4.5'
682682
distributionType = 'ALL'
683683
}

‎gradle/wrapper/gradle-wrapper.jar‎

0 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip

0 commit comments

Comments
 (0)