Skip to content

Commit

Permalink
Migrate to Java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
ravinperera00 committed Nov 22, 2024
1 parent 05b05ae commit 79603b9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,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 {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
group=org.ballerinalang
version=1.4.5-SNAPSHOT
ballerinaJreVersion=1.1.0
ballerinaJreVersion=2.0.1
jreVersion=21.0.5+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.5+11-jre
1-x-channel-version=1.2.0
1-x-channel-dependency-version=jdk8u202-b08-jre
1-x-channel-spec-version=2020R1
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions resources/scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 79603b9

Please sign in to comment.