Skip to content

Commit

Permalink
Update Ubuntu, CMake, and Gradle versions
Browse files Browse the repository at this point in the history
  • Loading branch information
snape committed May 4, 2024
1 parent c8bf33f commit 533dc8b
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 186 deletions.
206 changes: 68 additions & 138 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ on: # yamllint disable-line rule:truthy
jobs:
analyze:
name: analyze
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
13 changes: 5 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,12 @@
# <https://gamma.cs.unc.edu/RVO2/>
#

cmake_minimum_required(VERSION 3.11 FATAL_ERROR)

if(POLICY CMP0082)
cmake_policy(SET CMP0082 NEW)
endif()
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

project(RVOJava
VERSION 2.0.0
DESCRIPTION "Optimal Reciprocal Collision Avoidance for Java"
HOMEPAGE_URL https://gamma.cs.unc.edu/RVO2/
LANGUAGES NONE)

list(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/modules")
Expand Down Expand Up @@ -165,17 +162,17 @@ set(CPACK_SOURCE_STRIP_FILES ON)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE all)
set(CPACK_DEBIAN_PACKAGE_DEPENDS)
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE https://gamma.cs.unc.edu/RVO2/)
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
set(CPACK_DEBIAN_PACKAGE_SECTION contrib/java)

set(CPACK_FREEBSD_PACKAGE_DEPS)
set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
set(CPACK_FREEBSD_PACKAGE_WWW ${CPACK_DEBIAN_PACKAGE_HOMEPAGE})
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 "java-headless >= 1:1.8")
set(CPACK_RPM_PACKAGE_URL ${CPACK_DEBIAN_PACKAGE_HOMEPAGE})
set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})

include(CPack)
32 changes: 10 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# syntax=docker.io/docker/dockerfile:1

#
# Dockerfile
# RVO2 Library Java
Expand Down Expand Up @@ -31,9 +33,9 @@
# <https://gamma.cs.unc.edu/RVO2/>
#

FROM ubuntu:22.04
FROM ubuntu:latest
LABEL org.opencontainers.image.authors="Jur van den Berg, Stephen J. Guy, Jamie Snape, Ming C. Lin, Dinesh Manocha"
LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:latest"
LABEL org.opencontainers.image.description="Optimal Reciprocal Collision Avoidance for Java"
LABEL org.opencontainers.image.licenses="Apache-2.0"
LABEL org.opencontainers.image.source="https://github.com/snape/RVO2/"
Expand All @@ -48,39 +50,25 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -qq \
&& apt-get install --no-install-recommends -o Dpkg::Use-Pty=0 -qy \
ca-certificates \
cmake \
cmake-format \
dirmngr \
dpkg \
dpkg-dev \
file \
git \
gnupg \
jsonlint \
make \
markdownlint \
nano \
netbase \
ninja-build \
npm \
openjdk-11-jdk-headless
openjdk-21-jdk-headless \
python3 \
reuse \
unzip \
wget \
yamllint \
zlib1g-dev \
&& wget -qO - https://bazel.build/bazel-release.pub.gpg | gpg --dearmor - \
> /usr/share/keyrings/bazel-archive-keyring.gpg \
&& echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
> /etc/apt/sources.list.d/bazel.list \
&& wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc \
| gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg \
&& echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu jammy main' \
> /etc/apt/sources.list.d/kitware.list \
&& apt-get update -qq \
&& apt-get install --no-install-recommends -o Dpkg::Use-Pty=0 -qy \
bazel \
cmake \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g \
@bazel/buildifier \
jsonlint \
markdownlint-cli
@bazel/bazelisk \
@bazel/buildifier
6 changes: 3 additions & 3 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ pinned_maven_install()

http_archive(
name = "google_bazel_common",
sha256 = "de1441c02b35f5768b872d15d7e5813c4826b66630703e253fc95da39988a6d8",
strip_prefix = "bazel-common-d4ada735afa0ab044957cfa21849be577756a6cd",
urls = ["https://github.com/google/bazel-common/archive/d4ada735afa0ab044957cfa21849be577756a6cd.tar.gz"],
sha256 = "fdcd5b4ed39efd8150ba584b56b08f9c03406183385121e8a11ddf8ae19f1db5",
strip_prefix = "bazel-common-d59d067c04e973f3c4aa34f6628bed97d6664c3c",
urls = ["https://github.com/google/bazel-common/archive/d59d067c04e973f3c4aa34f6628bed97d6664c3c.tar.gz"],
)

load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
Expand Down
6 changes: 3 additions & 3 deletions extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def _non_module_deps_implementation(ctx):
http_archive(
name = "google_bazel_common",
sha256 = "de1441c02b35f5768b872d15d7e5813c4826b66630703e253fc95da39988a6d8",
strip_prefix = "bazel-common-d4ada735afa0ab044957cfa21849be577756a6cd",
urls = ["https://github.com/google/bazel-common/archive/d4ada735afa0ab044957cfa21849be577756a6cd.tar.gz"],
sha256 = "fdcd5b4ed39efd8150ba584b56b08f9c03406183385121e8a11ddf8ae19f1db5",
strip_prefix = "bazel-common-d59d067c04e973f3c4aa34f6628bed97d6664c3c",
urls = ["https://github.com/google/bazel-common/archive/d59d067c04e973f3c4aa34f6628bed97d6664c3c.tar.gz"],
)

non_module_deps = module_extension(
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -58,11 +58,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 533dc8b

Please sign in to comment.