Skip to content

Commit

Permalink
Migrate to Java 21 and new Runtime APIS
Browse files Browse the repository at this point in the history
  • Loading branch information
ravinperera00 committed Nov 17, 2024
1 parent 9ea8478 commit deff2f6
Show file tree
Hide file tree
Showing 15 changed files with 655 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-timestamped-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
with:
version: latest

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3
- name: Change to Timestamped Version
run: |
startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-stage-central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
with:
version: latest

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3

- name: Grant execute permission for gradlew
run: chmod +x gradlew
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 @@ -16,11 +16,11 @@ jobs:
with:
version: latest

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3

- name: Set version env variable
run: echo "VERSION=$((grep -w "version" | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
with:
version: latest

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17.0.7
java-version: 21.0.3

- name: Set ENV Variables
run: |
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,5 @@ hs_err_pid*
# Ignore Gradle build output directory
build

#Ignore all dependancy files
Dependencies.toml

#Ignore all .deb files
*.deb
69 changes: 69 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ This repository only contains the source code for the package.

### Prerequisites

1. Download and install Java SE Development Kit (JDK) version 17. You can download it from either of the following sources:
1. Download and install Java SE Development Kit (JDK) version 21. You can download it from either of the following sources:

* [Oracle JDK](https://www.oracle.com/java/technologies/downloads/)
* [OpenJDK](https://adoptium.net/)
Expand Down
2 changes: 1 addition & 1 deletion build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ version = "@toml.version@"
authors = ["Ballerina"]
keywords = ["edi"]
license = ["Apache-2.0"]
distribution = "2201.10.0"
distribution = "2201.11.0-20241112-214900-6b80ab87"
2 changes: 1 addition & 1 deletion edi-tools-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repositories {
}

dependencies {
implementation 'org.ballerinalang:ballerina-cli:2201.5.0'
implementation 'org.ballerinalang:ballerina-cli:2201.11.0-20241112-214900-6b80ab87'
implementation 'info.picocli:picocli:4.0.1'
}

Expand Down
45 changes: 45 additions & 0 deletions edi-tools-package/Dependencies.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# AUTO-GENERATED FILE. DO NOT MODIFY.

# This file is auto-generated by Ballerina for managing dependency versions.
# It should not be modified by hand.

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.11.0-20241112-214900-6b80ab87"

[[package]]
org = "ballerina"
name = "editoolspackage"
version = "2.1.0"
dependencies = [
{org = "ballerina", name = "io"}
]
modules = [
{org = "ballerina", packageName = "editoolspackage", moduleName = "editoolspackage"}
]

[[package]]
org = "ballerina"
name = "io"
version = "1.6.1"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
]
modules = [
{org = "ballerina", packageName = "io", moduleName = "io"}
]

[[package]]
org = "ballerina"
name = "jballerina.java"
version = "0.0.0"

[[package]]
org = "ballerina"
name = "lang.value"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

2 changes: 1 addition & 1 deletion edi-tools-tests/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
org = "ballerina"
name = "editoolstests"
version = "0.1.0"
distribution = "2201.10.0"
distribution = "2201.11.0-20241112-214900-6b80ab87"

[build-options]
observabilityIncluded = true
157 changes: 157 additions & 0 deletions edi-tools-tests/Dependencies.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
# AUTO-GENERATED FILE. DO NOT MODIFY.

# This file is auto-generated by Ballerina for managing dependency versions.
# It should not be modified by hand.

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.11.0-20241112-214900-6b80ab87"

[[package]]
org = "ballerina"
name = "edi"
version = "1.2.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "lang.regexp"},
{org = "ballerina", name = "log"}
]
modules = [
{org = "ballerina", packageName = "edi", moduleName = "edi"}
]

[[package]]
org = "ballerina"
name = "editoolstests"
version = "0.1.0"
dependencies = [
{org = "ballerina", name = "edi"},
{org = "ballerina", name = "io"},
{org = "ballerina", name = "test"},
{org = "ballerinai", name = "observe"}
]
modules = [
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.d96aORDERS"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample2"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample3"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample4"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample5"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample6"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample7"},
{org = "ballerina", packageName = "editoolstests", moduleName = "editoolstests.sample8"}
]

[[package]]
org = "ballerina"
name = "io"
version = "1.6.1"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"}
]
modules = [
{org = "ballerina", packageName = "io", moduleName = "io"}
]

[[package]]
org = "ballerina"
name = "jballerina.java"
version = "0.0.0"

[[package]]
org = "ballerina"
name = "lang.__internal"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.object"}
]

[[package]]
org = "ballerina"
name = "lang.array"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.__internal"}
]

[[package]]
org = "ballerina"
name = "lang.error"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.object"
version = "0.0.0"
scope = "testOnly"

[[package]]
org = "ballerina"
name = "lang.regexp"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "lang.value"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "log"
version = "2.9.0"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.value"},
{org = "ballerina", name = "observe"}
]

[[package]]
org = "ballerina"
name = "observe"
version = "1.2.3"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "test"
version = "0.0.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.array"},
{org = "ballerina", name = "lang.error"}
]
modules = [
{org = "ballerina", packageName = "test", moduleName = "test"}
]

[[package]]
org = "ballerinai"
name = "observe"
version = "0.0.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "observe"}
]
modules = [
{org = "ballerinai", packageName = "observe", moduleName = "observe"}
]

2 changes: 1 addition & 1 deletion edi-tools/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ version = "2.1.0"
authors = ["Ballerina"]
keywords = ["edi"]
license = ["Apache-2.0"]
distribution = "2201.10.0"
distribution = "2201.11.0-20241112-214900-6b80ab87"
Loading

0 comments on commit deff2f6

Please sign in to comment.