Skip to content

Commit 35fa8d3

Browse files
committed
[Gradle] Use mainClass instead of deprecated main property for JavaExec tasks.
1 parent 4ac0b25 commit 35fa8d3

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ project(':sbe-samples') {
405405
compileGeneratedJava.dependsOn 'generateCodecs'
406406

407407
task generateCodecs(type: JavaExec) {
408-
main = 'uk.co.real_logic.sbe.SbeTool'
408+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
409409
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
410410
systemProperties(
411411
'sbe.output.dir': generatedDir,
@@ -419,20 +419,20 @@ project(':sbe-samples') {
419419
}
420420

421421
task runExampleUsingGeneratedStub(dependsOn: 'compileJava', type: JavaExec) {
422+
mainClass = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub'
422423
classpath = sourceSets.main.runtimeClasspath
423-
main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub'
424424
systemProperties System.getProperties()
425425
}
426426

427427
task runExampleUsingGeneratedStubExtension(dependsOn: 'compileJava', type: JavaExec) {
428+
mainClass = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension'
428429
classpath = sourceSets.main.runtimeClasspath
429-
main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension'
430430
systemProperties System.getProperties()
431431
}
432432

433433
task runOtfExample(dependsOn: 'compileJava', type: JavaExec) {
434+
mainClass = 'uk.co.real_logic.sbe.examples.OtfExample'
434435
classpath = sourceSets.main.runtimeClasspath
435-
main = 'uk.co.real_logic.sbe.examples.OtfExample'
436436
workingDir = 'src/main/resources'
437437
}
438438

@@ -515,7 +515,7 @@ project(':sbe-benchmarks') {
515515
compileJava.dependsOn 'compileGeneratedJava'
516516

517517
task generateCodecs(type: JavaExec) {
518-
main = 'uk.co.real_logic.sbe.SbeTool'
518+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
519519
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
520520
systemProperties(
521521
'sbe.output.dir': 'build/generated-src',
@@ -547,7 +547,7 @@ project(':sbe-benchmarks') {
547547
* *) Some examples need to fiddle with WorkingDir to deal with XInclude
548548
*/
549549
task generateGolangCodecTestComposite(type: JavaExec) {
550-
main = 'uk.co.real_logic.sbe.SbeTool'
550+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
551551
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
552552
systemProperties(
553553
'sbe.output.dir': 'gocode/src',
@@ -556,7 +556,7 @@ task generateGolangCodecTestComposite(type: JavaExec) {
556556
}
557557

558558
task generateGolangCodecTestBasic(type: JavaExec) {
559-
main = 'uk.co.real_logic.sbe.SbeTool'
559+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
560560
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
561561
systemProperties(
562562
'sbe.output.dir': 'gocode/src/basic',
@@ -565,7 +565,7 @@ task generateGolangCodecTestBasic(type: JavaExec) {
565565
}
566566

567567
task generateGolangCodecTestGroup(type: JavaExec) {
568-
main = 'uk.co.real_logic.sbe.SbeTool'
568+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
569569
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
570570
systemProperties(
571571
'sbe.output.dir': 'gocode/src/group',
@@ -574,7 +574,7 @@ task generateGolangCodecTestGroup(type: JavaExec) {
574574
}
575575

576576
task generateGolangCodecTestVarData(type: JavaExec) {
577-
main = 'uk.co.real_logic.sbe.SbeTool'
577+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
578578
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
579579
systemProperties(
580580
'sbe.output.dir': 'gocode/src/vardata',
@@ -583,7 +583,7 @@ task generateGolangCodecTestVarData(type: JavaExec) {
583583
}
584584

585585
task generateGolangCodecsWithXIncludes(type: JavaExec) {
586-
main = 'uk.co.real_logic.sbe.SbeTool'
586+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
587587
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
588588
systemProperties(
589589
'sbe.output.dir': 'gocode/src',
@@ -595,7 +595,7 @@ task generateGolangCodecsWithXIncludes(type: JavaExec) {
595595
}
596596

597597
task generateGolangCodecsWithXSD(type: JavaExec) {
598-
main = 'uk.co.real_logic.sbe.SbeTool'
598+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
599599
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
600600
systemProperties(
601601
'sbe.output.dir': 'gocode/src',
@@ -635,7 +635,7 @@ task generateGolangCodecs {
635635
* multiple targets as XInclude forces us to change working dir
636636
*/
637637
task generateCSharpCodecsWithXIncludes(type: JavaExec) {
638-
main = 'uk.co.real_logic.sbe.SbeTool'
638+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
639639
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
640640
systemProperties(
641641
'sbe.output.dir': 'csharp/sbe-generated',
@@ -647,7 +647,7 @@ task generateCSharpCodecsWithXIncludes(type: JavaExec) {
647647
}
648648

649649
task generateCSharpCodecsTests(type: JavaExec) {
650-
main = 'uk.co.real_logic.sbe.SbeTool'
650+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
651651
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
652652
systemProperties(
653653
'sbe.output.dir': 'csharp/sbe-generated',
@@ -670,7 +670,7 @@ task generateCSharpCodecs {
670670
}
671671

672672
task generateJavaIrCodecs(type: JavaExec) {
673-
main = 'uk.co.real_logic.sbe.SbeTool'
673+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
674674
classpath = project(':sbe-all').sourceSets.main.runtimeClasspath
675675
systemProperties(
676676
'sbe.output.dir': 'sbe-tool/src/main/java',
@@ -680,7 +680,7 @@ task generateJavaIrCodecs(type: JavaExec) {
680680
}
681681

682682
task generateCppIrCodecs(type: JavaExec) {
683-
main = 'uk.co.real_logic.sbe.SbeTool'
683+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
684684
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
685685
systemProperties(
686686
'sbe.output.dir': 'sbe-tool/src/main/cpp',
@@ -690,7 +690,7 @@ task generateCppIrCodecs(type: JavaExec) {
690690
}
691691

692692
task generateGolangIrCodecs(type: JavaExec) {
693-
main = 'uk.co.real_logic.sbe.SbeTool'
693+
mainClass = 'uk.co.real_logic.sbe.SbeTool'
694694
classpath = project(':sbe-tool').sourceSets.main.runtimeClasspath
695695
systemProperties(
696696
'sbe.output.dir': 'sbe-tool/src/main/golang',

0 commit comments

Comments
 (0)