Skip to content

Commit 1fb3e21

Browse files
Migrate to Gradle 8.2.1
1 parent ad114d2 commit 1fb3e21

File tree

5 files changed

+253
-155
lines changed

5 files changed

+253
-155
lines changed

ballerina/build.gradle

+30-18
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ task combineDocs(type: Exec) {
284284
task packageDist(type: Zip) {
285285
group = "package_distribution"
286286
description = 'Ballerina Tools Distribution Assembly'
287-
baseName = "${distributionName}"
288-
ext { parentDir = "${baseName}-${shortVersion}" }
287+
ext {
288+
baseName = "${distributionName}"
289+
parentDir = "${baseName}-${shortVersion}"
290+
}
289291
archiveFileName = "${baseName}-${shortVersion}.zip"
290292
entryCompression = ZipEntryCompression.DEFLATED
291293

@@ -327,8 +329,10 @@ task packageDist(type: Zip) {
327329
task packageDistZip(type: Zip) {
328330
group = "package_distribution"
329331
description = 'Ballerina Distribution Assembly'
330-
baseName = "${distributionName}-${version}"
331-
ext { parentDir = "${baseName}-${codeName}" }
332+
ext {
333+
baseName = "${distributionName}-${version}"
334+
parentDir = "${baseName}-${codeName}"
335+
}
332336
archiveFileName = "${distributionName}-${version}-${codeName}.zip"
333337
entryCompression = ZipEntryCompression.DEFLATED
334338

@@ -410,12 +414,14 @@ task packageDistZip(type: Zip) {
410414
task packageDistLinux(type: Zip) {
411415
group = "package_distribution"
412416
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+
}
415421
archiveFileName = "${parentDir}.zip"
416422
entryCompression = ZipEntryCompression.DEFLATED
417423

418-
into("${parentDir}/dependencies") {
424+
into("${parentDir}/dependencies/${dependencyJREVersion}") {
419425
from "build/target/extracted-jre-linux"
420426
fileMode = 0755
421427
}
@@ -497,12 +503,14 @@ task packageDistLinux(type: Zip) {
497503
task packageDistMac(type: Zip) {
498504
group = "package_distribution"
499505
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+
}
502510
archiveFileName = "${parentDir}.zip"
503511
entryCompression = ZipEntryCompression.DEFLATED
504512

505-
into("${parentDir}/dependencies") {
513+
into("${parentDir}/dependencies/${dependencyJREVersion}") {
506514
from "build/target/extracted-jre-macos"
507515
fileMode = 0755
508516
}
@@ -580,12 +588,14 @@ task packageDistMac(type: Zip) {
580588
task packageDistMacArm(type: Zip) {
581589
group = "package_distribution"
582590
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+
}
585595
archiveFileName = "${parentDir}.zip"
586596
entryCompression = ZipEntryCompression.DEFLATED
587597

588-
into("${parentDir}/dependencies") {
598+
into("${parentDir}/dependencies/${dependencyJREVersion}") {
589599
from "build/target/extracted-jre-macos-arm"
590600
fileMode = 0755
591601
}
@@ -663,12 +673,14 @@ task packageDistMacArm(type: Zip) {
663673
task packageDistWindows(type: Zip) {
664674
group = "package_distribution"
665675
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+
}
668680
archiveFileName = "${parentDir}.zip"
669681
entryCompression = ZipEntryCompression.DEFLATED
670682

671-
into("${parentDir}/dependencies") {
683+
into("${parentDir}/dependencies/${dependencyJREVersion}") {
672684
from "build/target/extracted-jre-windows"
673685
fileMode = 0755
674686
}
@@ -801,7 +813,7 @@ task testExamples() {
801813

802814
if (bbe.startsWith('mysql')) {
803815
def tomlFile = new File("${distPath}/${bbe}/Ballerina.toml")
804-
tomlFile.append("\n\n[[platform.java17.dependency]]")
816+
tomlFile.append("\n\n[[platform.java11.dependency]]")
805817
tomlFile.append("\npath = \"$distPath/lib/mysql-connector-java-8.0.21.jar\"\n")
806818
}
807819

@@ -1373,7 +1385,7 @@ task generateCache(dependsOn: ':cache-generator:build') {
13731385
def moduleName = dependency.module_name[i].toString() + "-ballerina-zip"
13741386
if ( sortedLibs.contains(moduleName) ) {
13751387
if ( !dependencyMap["${moduleName}"].contains(dependency.version[i].toString()))
1376-
dependencyMap["${moduleName}"].add(dependency.version[i].toString())
1388+
dependencyMap["${moduleName}"].add(dependency.version[i].toString())
13771389
}
13781390
}
13791391
}

gradle/wrapper/gradle-wrapper.jar

7.57 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
36
zipStoreBase=GRADLE_USER_HOME
47
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip

0 commit comments

Comments
 (0)