@@ -284,8 +284,10 @@ task combineDocs(type: Exec) {
284
284
task packageDist (type : Zip ) {
285
285
group = " package_distribution"
286
286
description = ' Ballerina Tools Distribution Assembly'
287
- baseName = " ${ distributionName} "
288
- ext { parentDir = " ${ baseName} -${ shortVersion} " }
287
+ ext {
288
+ baseName = " ${ distributionName} "
289
+ parentDir = " ${ baseName} -${ shortVersion} "
290
+ }
289
291
archiveFileName = " ${ baseName} -${ shortVersion} .zip"
290
292
entryCompression = ZipEntryCompression . DEFLATED
291
293
@@ -327,8 +329,10 @@ task packageDist(type: Zip) {
327
329
task packageDistZip (type : Zip ) {
328
330
group = " package_distribution"
329
331
description = ' Ballerina Distribution Assembly'
330
- baseName = " ${ distributionName} -${ version} "
331
- ext { parentDir = " ${ baseName} -${ codeName} " }
332
+ ext {
333
+ baseName = " ${ distributionName} -${ version} "
334
+ parentDir = " ${ baseName} -${ codeName} "
335
+ }
332
336
archiveFileName = " ${ distributionName} -${ version} -${ codeName} .zip"
333
337
entryCompression = ZipEntryCompression . DEFLATED
334
338
@@ -410,12 +414,14 @@ task packageDistZip(type: Zip) {
410
414
task packageDistLinux (type : Zip ) {
411
415
group = " package_distribution"
412
416
description = ' Ballerina Linux Distribution Assembly'
413
- baseName = " ${ distributionName} -${ version} "
414
- ext { parentDir = " ${ baseName} -${ codeName} -linux" }
417
+ ext {
418
+ baseName = " ${ distributionName} -${ version} "
419
+ parentDir = " ${ baseName} -${ codeName} -linux"
420
+ }
415
421
archiveFileName = " ${ parentDir} .zip"
416
422
entryCompression = ZipEntryCompression . DEFLATED
417
423
418
- into(" ${ parentDir} /dependencies" ) {
424
+ into(" ${ parentDir} /dependencies/ ${ dependencyJREVersion } " ) {
419
425
from " build/target/extracted-jre-linux"
420
426
fileMode = 0755
421
427
}
@@ -497,12 +503,14 @@ task packageDistLinux(type: Zip) {
497
503
task packageDistMac (type : Zip ) {
498
504
group = " package_distribution"
499
505
description = ' Ballerina MacOS Distribution Assembly'
500
- baseName = " ${ distributionName} -${ version} "
501
- ext { parentDir = " ${ baseName} -${ codeName} -macos" }
506
+ ext {
507
+ baseName = " ${ distributionName} -${ version} "
508
+ parentDir = " ${ baseName} -${ codeName} -macos"
509
+ }
502
510
archiveFileName = " ${ parentDir} .zip"
503
511
entryCompression = ZipEntryCompression . DEFLATED
504
512
505
- into(" ${ parentDir} /dependencies" ) {
513
+ into(" ${ parentDir} /dependencies/ ${ dependencyJREVersion } " ) {
506
514
from " build/target/extracted-jre-macos"
507
515
fileMode = 0755
508
516
}
@@ -580,12 +588,14 @@ task packageDistMac(type: Zip) {
580
588
task packageDistMacArm (type : Zip ) {
581
589
group = " package_distribution"
582
590
description = ' Ballerina MacOS-ARM Distribution Assembly'
583
- baseName = " ${ distributionName} -${ version} "
584
- ext { parentDir = " ${ baseName} -${ codeName} -macos-arm" }
591
+ ext {
592
+ baseName = " ${ distributionName} -${ version} "
593
+ parentDir = " ${ baseName} -${ codeName} -macos-arm"
594
+ }
585
595
archiveFileName = " ${ parentDir} .zip"
586
596
entryCompression = ZipEntryCompression . DEFLATED
587
597
588
- into(" ${ parentDir} /dependencies" ) {
598
+ into(" ${ parentDir} /dependencies/ ${ dependencyJREVersion } " ) {
589
599
from " build/target/extracted-jre-macos-arm"
590
600
fileMode = 0755
591
601
}
@@ -663,12 +673,14 @@ task packageDistMacArm(type: Zip) {
663
673
task packageDistWindows (type : Zip ) {
664
674
group = " package_distribution"
665
675
description = ' Ballerina Windows Distribution Assembly'
666
- baseName = " ${ distributionName} -${ version} "
667
- ext { parentDir = " ${ baseName} -${ codeName} -windows" }
676
+ ext {
677
+ baseName = " ${ distributionName} -${ version} "
678
+ parentDir = " ${ baseName} -${ codeName} -windows"
679
+ }
668
680
archiveFileName = " ${ parentDir} .zip"
669
681
entryCompression = ZipEntryCompression . DEFLATED
670
682
671
- into(" ${ parentDir} /dependencies" ) {
683
+ into(" ${ parentDir} /dependencies/ ${ dependencyJREVersion } " ) {
672
684
from " build/target/extracted-jre-windows"
673
685
fileMode = 0755
674
686
}
@@ -801,7 +813,7 @@ task testExamples() {
801
813
802
814
if (bbe. startsWith(' mysql' )) {
803
815
def tomlFile = new File (" ${ distPath} /${ bbe} /Ballerina.toml" )
804
- tomlFile. append(" \n\n [[platform.java17 .dependency]]" )
816
+ tomlFile. append(" \n\n [[platform.java11 .dependency]]" )
805
817
tomlFile. append(" \n path = \" $distPath /lib/mysql-connector-java-8.0.21.jar\"\n " )
806
818
}
807
819
@@ -1373,7 +1385,7 @@ task generateCache(dependsOn: ':cache-generator:build') {
1373
1385
def moduleName = dependency. module_name[i]. toString() + " -ballerina-zip"
1374
1386
if ( sortedLibs. contains(moduleName) ) {
1375
1387
if ( ! dependencyMap[" ${ moduleName} " ]. contains(dependency. version[i]. toString()))
1376
- dependencyMap[" ${ moduleName} " ]. add(dependency. version[i]. toString())
1388
+ dependencyMap[" ${ moduleName} " ]. add(dependency. version[i]. toString())
1377
1389
}
1378
1390
}
1379
1391
}
0 commit comments