diff --git a/README.md b/README.md index b127c82a..9ede79b6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This repository only contains the source code for the package. ### Set up the prerequisites -1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). +1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptium.net/) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index c048ea36..154e5c7a 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "os" -version = "1.8.1" +version = "1.8.2" authors = ["Ballerina"] keywords = ["environment"] repository = "https://github.com/ballerina-platform/module-ballerina-os" @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.8.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" -version = "1.8.1" -path = "../native/build/libs/os-native-1.8.1-SNAPSHOT.jar" +version = "1.8.2" +path = "../native/build/libs/os-native-1.8.2-SNAPSHOT.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "1.6.0" path = "./lib/io-native-1.6.0.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "1.8.1" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 3d14e3be..b7e202ae 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.8.0" +distribution-version = "2201.10.0-20240926-231800-8a5a4343" [[package]] org = "ballerina" diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 3559cc3d..7e4a6c3d 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,22 +9,22 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.8.0" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-native" version = "@toml.version@" path = "../native/build/libs/os-native-@project.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "io-native" version = "@io.version@" path = "./lib/io-native-@io.native.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "os-test-utils" version = "@toml.version@" diff --git a/gradle.properties b/gradle.properties index ff5cc4f9..c4f80fb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ group=io.ballerina.stdlib version=1.8.1-SNAPSHOT ballerinaGradlePluginVersion=2.0.1 -githubSpotBugsVersion=5.0.14 +githubSpotBugsVersion=6.0.18 shadowJarVersion=7.1.2 undercouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 puppycrawlCheckstyleVersion=10.12.0 -ballerinaLangVersion=2201.8.0 -stdlibIoVersion=1.6.0 +ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 +stdlibIoVersion=1.6.2-20241112-233100-995cf5f diff --git a/native/build.gradle b/native/build.gradle index 1767f564..4d0114d9 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -30,9 +30,12 @@ dependencies { } spotbugsMain { + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") ignoreFailures = true - effort = "max" - reportLevel = "low" + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml") if (excludeFile.exists()) { diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/Output.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/Output.java index bde2e4f7..ec9ab9d3 100644 --- a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/Output.java +++ b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/Output.java @@ -18,11 +18,11 @@ package io.ballerina.stdlib.os.nativeimpl; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BObject; diff --git a/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java b/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java index 198677be..234aaaab 100644 --- a/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java @@ -18,10 +18,10 @@ package io.ballerina.stdlib.os.utils; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.PredefinedTypes; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.MapType; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BMap; import io.ballerina.runtime.api.values.BObject; @@ -63,7 +63,7 @@ public static BString getSystemProperty(BString key) { String value = System.getProperty(key.toString()); if (value == null) { return StringUtils.fromString( - io.ballerina.runtime.api.PredefinedTypes.TYPE_STRING.getZeroValue().toString()); + io.ballerina.runtime.api.types.PredefinedTypes.TYPE_STRING.getZeroValue().toString()); } return StringUtils.fromString(value); } diff --git a/test-utils/build.gradle b/test-utils/build.gradle index e2ec3580..5a4d6789 100644 --- a/test-utils/build.gradle +++ b/test-utils/build.gradle @@ -30,9 +30,12 @@ dependencies { } spotbugsMain { + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") ignoreFailures = true - effort = "max" - reportLevel = "low" + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") def excludeFile = file("${rootDir}/build-config/spotbugs-exclude.xml") if (excludeFile.exists()) { diff --git a/test-utils/src/main/java/io/ballerina/stdlib/os/testutils/OSTestUtils.java b/test-utils/src/main/java/io/ballerina/stdlib/os/testutils/OSTestUtils.java index 8c83c18e..43ab01ba 100644 --- a/test-utils/src/main/java/io/ballerina/stdlib/os/testutils/OSTestUtils.java +++ b/test-utils/src/main/java/io/ballerina/stdlib/os/testutils/OSTestUtils.java @@ -29,7 +29,7 @@ public final class OSTestUtils { private OSTestUtils() {} public static BString testValidEnv() { - return StringUtils.fromString(System.getenv("JAVA_HOME")); + return StringUtils.fromString(System.getenv("java.home")); } public static BString testGetUserHome() {