From 10ca36474e991af42e7f537aade2d381011cb52e Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 22 Nov 2024 21:56:35 +0530 Subject: [PATCH] Migrate to Java 21 --- .github/workflows/build-master.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/pull-request.yml | 8 ++++---- build.gradle | 22 +++++++++++----------- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- resources/scripts/install | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index c973258c..183d93d5 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 21 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 21.0.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index fb3ea2db..b2e030b0 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -15,10 +15,10 @@ jobs: RELEASE_VERSION=$(./gradlew properties | grep ^version: | cut -d\ -f2 | sed 's@-SNAPSHOT@@') echo VERSION=$RELEASE_VERSION >> $GITHUB_ENV echo "::set-output name=version::$RELEASE_VERSION" - - name: Set up JDK 1.8 + - name: Set up JDK 21 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 21.0.3 - name: Pre release depenency version update env: GITHUB_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f9ff1d18..9011b00c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 21 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 21.0.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle @@ -24,10 +24,10 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 21 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 21.0.3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/build.gradle b/build.gradle index 02d5d878..83943175 100644 --- a/build.gradle +++ b/build.gradle @@ -63,12 +63,14 @@ task copyScripts(type: Copy) { } task copyLib(type: Copy) { + dependsOn jar from file("build/libs") into file("build/resources/lib") } task createZip(type:Zip) { dependsOn jar + dependsOn processTestResources dependsOn copyBin dependsOn copyScripts dependsOn copyLib @@ -132,7 +134,7 @@ task createZipLinux(type:Zip) { into "${distName}" } - archiveName "${distName}.zip" + archiveFileName = "${distName}.zip" } task createZipMac(type:Zip) { @@ -150,7 +152,7 @@ task createZipMac(type:Zip) { into "${distName}" } - archiveName "${distName}.zip" + archiveFileName = "${distName}.zip" } task createZipMacARM(type:Zip) { @@ -168,7 +170,7 @@ task createZipMacARM(type:Zip) { into "${distName}" } - archiveName "${distName}.zip" + archiveFileName = "${distName}.zip" } task createZipWindows(type:Zip) { @@ -186,7 +188,7 @@ task createZipWindows(type:Zip) { into "${distName}" } - archiveName "${distName}.zip" + archiveFileName = "${distName}.zip" } dependencies { @@ -195,7 +197,7 @@ dependencies { implementation 'me.tongfei:progressbar:0.7.4' implementation 'com.googlecode.json-simple:json-simple:1.1.1' testImplementation 'org.testng:testng:6.14.3' - jacocoRuntime "org.jacoco:org.jacoco.agent:0.8.6:runtime" + jacocoRuntime "org.jacoco:org.jacoco.agent:0.8.12:runtime" } publishing { @@ -253,6 +255,7 @@ task copyBinForTests(type: Copy) { } task copyLibForTests(type: Copy) { + dependsOn jar from file("$buildDir/libs") into file("$buildDir/classes/lib") } @@ -322,12 +325,9 @@ repositories { jacocoTestReport { reports { - xml.enabled = true - html.enabled = true - csv.enabled = true - xml.destination = new File("${buildDir}/reports/jacoco/report.xml") - html.destination = new File("${buildDir}/reports/jacoco/report.html") - csv.destination = new File("${buildDir}/reports/jacoco/report.csv") + xml.required = true + html.required = true + csv.required = true } } diff --git a/gradle.properties b/gradle.properties index f7343062..548b225d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ group=org.ballerinalang version=1.4.5-SNAPSHOT -ballerinaJreVersion=1.1.0 -jreVersion=21.0.5+11-jre +ballerinaJreVersion=2.0.1 +jreVersion=21.0.3+11-jre # For test purpose swan-lake-version=2201.2.0 swan-lake-spec-version=2022R3 swan-lake-latest-version=2201.10.2 swan-lake-latest-spec-version=2024R1 -swan-lake-latest-dependency-version=jdk-17.0.7+7-jre +swan-lake-latest-dependency-version=jdk-21.0.3+11-jre 1-x-channel-version=1.2.0 1-x-channel-dependency-version=jdk8u202-b08-jre 1-x-channel-spec-version=2020R1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..81aa1c04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/resources/scripts/install b/resources/scripts/install index 38e17bb1..87bc1c5d 100755 --- a/resources/scripts/install +++ b/resources/scripts/install @@ -55,9 +55,9 @@ then \cp $CURRENT_PATH/ballerina-command-@version@/scripts/_bal $CURRENT_PATH/../scripts fi -if [ -d "$CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre" ] +if [ -d "$CURRENT_PATH/../dependencies/jdk-21.0.5+11-jre" ] then -chmod -R 755 $CURRENT_PATH/../dependencies/jdk-17.0.7+7-jre +chmod -R 755 $CURRENT_PATH/../dependencies/jdk-21.0.5+11-jre fi if [ $? -ne '0' ]; then