Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# <https://gamma.cs.unc.edu/RVO2/>
#

build --javacopt "--release 21"
build --javacopt "--release 25"

build --javacopt "-Xep:AlwaysThrows:ERROR"
build --javacopt "-Xep:AndroidInjectionBeforeSuper:OFF"
Expand Down Expand Up @@ -520,18 +520,19 @@ build --javacopt "-Xep:UnusedException:WARN"
build --javacopt "-Xep:UrlInSee:WARN"
build --javacopt "-Xep:UsingJsr305CheckReturnValue:WARN"

build --java_language_version=25
build --java_runtime_version=remotejdk_25

build --remote_upload_local_results=false

build --tool_java_language_version=25
build --tool_java_runtime_version=remotejdk_25

build:macos --apple_platform_type=macos

common --enable_platform_specific_config=true
common --heap_dump_on_oom=true

common --java_language_version=21
common --java_runtime_version=remotejdk_21
common --tool_java_language_version=21
common --tool_java_runtime_version=remotejdk_21

test --test_verbose_timeout_warnings=true

try-import %workspace%/.user.bazelrc
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
ca-certificates \
gcc-c++ \
git \
java-25-openjdk-devel \
java-25-openjdk-headless \
python3 \
wget \
which
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
ca-certificates \
gcc \
git \
jdk25-openjdk \
jre25-openjdk-headless \
python \
wget \
which
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
ca-certificates \
gcc-c++ \
git \
java-25-openjdk-devel \
java-25-openjdk-headless \
python3 \
wget \
which
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
ca-certificates \
gcc-c++ \
git \
java-21-openjdk-devel \
java-25-openjdk-headless \
python3 \
wget \
which
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
ca-certificates \
g++ \
git \
openjdk-25-jdk \
openjdk-25-jre-headless \
python-is-python3 \
wget
apt-get -qq -o Dpkg::Use-Pty=0 autoremove
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
ca-certificates \
g++ \
git \
openjdk-25-jdk \
openjdk-25-jre-headless \
python-is-python3 \
wget
apt-get -qq -o Dpkg::Use-Pty=0 autoremove
Expand Down Expand Up @@ -412,6 +412,8 @@ jobs:
brew bundle install -q
brew cleanup -q -s
rm -rf $(brew --cache)
echo "JAVA_HOME=$(brew --prefix openjdk)/libexec/openjdk.jdk/Contents/Home" >> "$GITHUB_ENV"
echo "$(brew --prefix openjdk)/bin" >> "$GITHUB_PATH"
env:
HOMEBREW_NO_ANALYTICS: 1
HOMEBREW_NO_AUTO_UPDATE: 1
Expand Down Expand Up @@ -448,7 +450,7 @@ jobs:
ca-certificates \
cmake \
git \
java-21-openjdk-devel \
java-25-openjdk-devel \
make \
rpm-build
zypper -n -q cc -a
Expand Down Expand Up @@ -748,7 +750,7 @@ jobs:
zypper -n -q in --no-recommends \
ca-certificates \
git \
java-21-openjdk-devel
java-25-openjdk-devel
zypper -n -q cc -a
shell: bash
- name: checkout
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif()

include(CTest)

find_package(Java 21 REQUIRED COMPONENTS Development)
find_package(Java 25 REQUIRED COMPONENTS Development)
include(UseJava)

option(WARNINGS_AS_ERRORS "Turn compiler warnings into errors" OFF)
Expand Down Expand Up @@ -157,15 +157,15 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
set(CPACK_DEBIAN_PACKAGE_SECTION contrib/java)

set(CPACK_FREEBSD_PACKAGE_CATEGORIES java)
set(CPACK_FREEBSD_PACKAGE_DEPS "java/openjdk21" "math/apache-commons-math")
set(CPACK_FREEBSD_PACKAGE_DEPS "java/openjdk25" "math/apache-commons-math")
Comment thread
coderabbitai[bot] marked this conversation as resolved.
set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
set(CPACK_FREEBSD_PACKAGE_ORIGIN "java/${CPACK_PACKAGE_NAME}")
set(CPACK_FREEBSD_PACKAGE_WWW ${PROJECT_HOMEPAGE_URL})

set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_ARCHITECTURE noarch)
set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
set(CPACK_RPM_PACKAGE_REQUIRES "apache-commons-math >= 3.6.1, java-headless >= 1:21")
set(CPACK_RPM_PACKAGE_REQUIRES "apache-commons-math >= 3.6.1, java-headless >= 25")
set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})

include(CPack)
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
nano \
netbase \
ninja-build \
openjdk-21-jdk-headless \
openjdk-25-jdk-headless \
openssh-client \
python3 \
python3-click \
Expand Down
3 changes: 3 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ module(
)

bazel_dep(name = "rules_java", version = "9.7.0")

register_toolchains("@rules_java//java:all")

bazel_dep(name = "rules_jvm_external", version = "7.1")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
Expand Down
2 changes: 1 addition & 1 deletion QUALITY_DECLARATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ None.

### Direct Runtime non-ROS Dependencies [5.iii]

- **Java Standard Library**: provided by the Java runtime (OpenJDK 21 or
- **Java Standard Library**: provided by the Java runtime (OpenJDK 25 or
later). This is a de facto standard with no quality level concerns.
- **Apache Commons Math** (`org.apache.commons:commons-math3:3.6.1`): provides
the `Vector2D` type used throughout the public API. This is a widely-used,
Expand Down
Loading