Skip to content

Commit c8bf33f

Browse files
snapesnape
committed
Update for latest bazel and gradle
1 parent d53715c commit c8bf33f

12 files changed

+89
-52
lines changed

‎.bazelversion

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
latest

‎.bazelversion.license

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.bazelversion
2+
RVO2 Library Java
3+
4+
SPDX-FileCopyrightText: 2008 University of North Carolina at Chapel Hill
5+
SPDX-License-Identifier: Apache-2.0
6+
7+
Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
https://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
19+
Please send all bug reports to <[email protected]>.
20+
21+
The authors may be contacted via:
22+
23+
Jur van den Berg, Stephen J. Guy, Jamie Snape, Ming C. Lin, Dinesh Manocha
24+
Dept. of Computer Science
25+
201 S. Columbia St.
26+
Frederick P. Brooks, Jr. Computer Science Bldg.
27+
Chapel Hill, N.C. 27599-3175
28+
United States of America
29+
30+
<https://gamma.cs.unc.edu/RVO2/>

‎.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@
6161

6262
.bazelignore text whitespace-4
6363
.bazelrc text whitespace-4
64+
.bazelversion text whitespace-4
6465
.dockerignore text whitespace-2
6566
.editorconfig text whitespace-2
6667
.gitattributes text export-ignore whitespace-2
6768
.gitignore text export-ignore whitespace-2
68-
.zenodo.json linguist-documentation
69+
.zenodo.json export-ignore linguist-documentation
6970
Brewfile text diff=ruby export-ignore whitespace-4
7071
CMakeLists.txt whitespace-2
7172
CODEOWNERS text whitespace-2

‎.github/workflows/ci.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
/var/lib/pacman/sync/*
6666
shell: bash
6767
- name: checkout
68-
uses: actions/checkout@v3
68+
uses: actions/checkout@v4
6969
- name: build test package
7070
run: bazel test --enable_bzlmod=0 --flaky_test_attempts=3 ...
7171
shell: bash
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: macos-latest
7676
steps:
7777
- name: checkout
78-
uses: actions/checkout@v3
78+
uses: actions/checkout@v4
7979
- name: setup
8080
run: |
8181
rm -f \
@@ -141,7 +141,7 @@ jobs:
141141
DEBIAN_FRONTEND: noninteractive
142142
shell: bash
143143
- name: checkout
144-
uses: actions/checkout@v3
144+
uses: actions/checkout@v4
145145
- name: build test package
146146
run: bazel test --enable_bzlmod=0 --flaky_test_attempts=3 ...
147147
shell: bash
@@ -166,7 +166,7 @@ jobs:
166166
/var/lib/pacman/sync/*
167167
shell: bash
168168
- name: checkout
169-
uses: actions/checkout@v3
169+
uses: actions/checkout@v4
170170
- name: build test package
171171
run: bazel test --enable_bzlmod=1 --flaky_test_attempts=3 ...
172172
shell: bash
@@ -176,7 +176,7 @@ jobs:
176176
runs-on: macos-latest
177177
steps:
178178
- name: checkout
179-
uses: actions/checkout@v3
179+
uses: actions/checkout@v4
180180
- name: setup
181181
run: |
182182
rm -f \
@@ -242,7 +242,7 @@ jobs:
242242
DEBIAN_FRONTEND: noninteractive
243243
shell: bash
244244
- name: checkout
245-
uses: actions/checkout@v3
245+
uses: actions/checkout@v4
246246
- name: build test package
247247
run: bazel test --enable_bzlmod=1 --flaky_test_attempts=3 ...
248248
shell: bash
@@ -263,7 +263,7 @@ jobs:
263263
openjdk11
264264
shell: sh
265265
- name: checkout
266-
uses: actions/checkout@v3
266+
uses: actions/checkout@v4
267267
- name: build test package
268268
run: |
269269
mkdir _build
@@ -302,7 +302,7 @@ jobs:
302302
/var/lib/pacman/sync/*
303303
shell: bash
304304
- name: checkout
305-
uses: actions/checkout@v3
305+
uses: actions/checkout@v4
306306
- name: build test package
307307
run: |
308308
mkdir _build
@@ -342,7 +342,7 @@ jobs:
342342
rm -rf /var/cache/yum
343343
shell: bash
344344
- name: checkout
345-
uses: actions/checkout@v3
345+
uses: actions/checkout@v4
346346
- name: build test package
347347
run: |
348348
mkdir _build
@@ -366,7 +366,7 @@ jobs:
366366
runs-on: macos-latest
367367
steps:
368368
- name: checkout
369-
uses: actions/checkout@v3
369+
uses: actions/checkout@v4
370370
- name: setup
371371
run: |
372372
rm -f \
@@ -435,7 +435,7 @@ jobs:
435435
rm -rf /var/cache/yum
436436
shell: bash
437437
- name: checkout
438-
uses: actions/checkout@v3
438+
uses: actions/checkout@v4
439439
- name: build test package
440440
run: |
441441
mkdir _build
@@ -488,7 +488,7 @@ jobs:
488488
DEBIAN_FRONTEND: noninteractive
489489
shell: bash
490490
- name: checkout
491-
uses: actions/checkout@v3
491+
uses: actions/checkout@v4
492492
- name: build test package
493493
run: |
494494
mkdir _build
@@ -512,7 +512,7 @@ jobs:
512512
runs-on: windows-latest
513513
steps:
514514
- name: checkout
515-
uses: actions/checkout@v3
515+
uses: actions/checkout@v4
516516
- uses: actions/setup-java@v3
517517
with:
518518
distribution: microsoft
@@ -554,7 +554,7 @@ jobs:
554554
openjdk11
555555
shell: sh
556556
- name: checkout
557-
uses: actions/checkout@v3
557+
uses: actions/checkout@v4
558558
- name: cache
559559
uses: actions/cache@v3
560560
with:
@@ -586,7 +586,7 @@ jobs:
586586
/var/lib/pacman/sync/*
587587
shell: bash
588588
- name: checkout
589-
uses: actions/checkout@v3
589+
uses: actions/checkout@v4
590590
- name: cache
591591
uses: actions/cache@v3
592592
with:
@@ -618,7 +618,7 @@ jobs:
618618
rm -rf /var/cache/yum
619619
shell: bash
620620
- name: checkout
621-
uses: actions/checkout@v3
621+
uses: actions/checkout@v4
622622
- name: cache
623623
uses: actions/cache@v3
624624
with:
@@ -650,7 +650,7 @@ jobs:
650650
rm -rf /var/cache/yum
651651
shell: bash
652652
- name: checkout
653-
uses: actions/checkout@v3
653+
uses: actions/checkout@v4
654654
- name: cache
655655
uses: actions/cache@v3
656656
with:
@@ -668,7 +668,7 @@ jobs:
668668
runs-on: macos-latest
669669
steps:
670670
- name: checkout
671-
uses: actions/checkout@v3
671+
uses: actions/checkout@v4
672672
- name: setup
673673
run: |
674674
rm -f \
@@ -732,7 +732,7 @@ jobs:
732732
DEBIAN_FRONTEND: noninteractive
733733
shell: bash
734734
- name: checkout
735-
uses: actions/checkout@v3
735+
uses: actions/checkout@v4
736736
- name: cache
737737
uses: actions/cache@v3
738738
with:
@@ -750,7 +750,7 @@ jobs:
750750
runs-on: windows-latest
751751
steps:
752752
- name: checkout
753-
uses: actions/checkout@v3
753+
uses: actions/checkout@v4
754754
- uses: actions/setup-java@v3
755755
with:
756756
distribution: microsoft

‎.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ jobs:
5050
runs-on: ubuntu-22.04
5151
steps:
5252
- name: checkout
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v4
5454
- name: initialize codeql
55-
uses: github/codeql-action/init@v2
55+
uses: github/codeql-action/init@v3
5656
with:
5757
languages: java
5858
- name: autobuild
59-
uses: github/codeql-action/autobuild@v2
59+
uses: github/codeql-action/autobuild@v3
6060
- name: perform codeql analysis
61-
uses: github/codeql-action/analyze@v2
61+
uses: github/codeql-action/analyze@v3

‎MODULE.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ module(
3939
version = "2.0.0",
4040
)
4141

42-
bazel_dep(name = "rules_java", version = "6.1.0")
43-
bazel_dep(name = "rules_jvm_external", version = "5.2")
42+
bazel_dep(name = "rules_java", version = "7.3.1")
43+
bazel_dep(name = "rules_jvm_external", version = "5.3")
4444

4545
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
4646
maven.install(
@@ -52,6 +52,6 @@ use_repo(maven, "maven")
5252
non_module_deps = use_extension("//:extensions.bzl", "non_module_deps")
5353
use_repo(non_module_deps, "google_bazel_common")
5454

55-
bazel_dep(name = "rules_license", version = "0.0.4")
55+
bazel_dep(name = "rules_license", version = "0.0.7")
5656

5757
bazel_dep(name = "rules_pkg", version = "0.9.1", dev_dependency = True)

‎WORKSPACE.bazel

+11-11
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4040

4141
http_archive(
4242
name = "rules_java",
43-
sha256 = "78e3c24f05cffed529bfcafd1f7a8d1a7b97b4a411f25d8d3b4d47d9bb980394",
44-
urls = ["https://github.com/bazelbuild/rules_java/releases/download/6.1.0/rules_java-6.1.0.tar.gz"],
43+
sha256 = "4018e97c93f97680f1650ffd2a7530245b864ac543fd24fae8c02ba447cb2864",
44+
urls = ["https://github.com/bazelbuild/rules_java/releases/download/7.3.1/rules_java-7.3.1.tar.gz"],
4545
)
4646

4747
load(
@@ -56,9 +56,9 @@ rules_java_toolchains()
5656

5757
http_archive(
5858
name = "rules_jvm_external",
59-
sha256 = "f86fd42a809e1871ca0aabe89db0d440451219c3ce46c58da240c7dcdc00125f",
60-
strip_prefix = "rules_jvm_external-5.2",
61-
urls = ["https://github.com/bazelbuild/rules_jvm_external/releases/download/5.2/rules_jvm_external-5.2.tar.gz"],
59+
sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
60+
strip_prefix = "rules_jvm_external-5.3",
61+
urls = ["https://github.com/bazelbuild/rules_jvm_external/releases/download/5.3/rules_jvm_external-5.3.tar.gz"],
6262
)
6363

6464
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
@@ -83,9 +83,9 @@ pinned_maven_install()
8383

8484
http_archive(
8585
name = "google_bazel_common",
86-
sha256 = "17ea98149586dff60aa741c67fbd9a010fbb1507df90e741c50403bf5228bea3",
87-
strip_prefix = "bazel-common-a9e1d8efd54cbf27249695b23775b75ca65bb59d",
88-
urls = ["https://github.com/google/bazel-common/archive/a9e1d8efd54cbf27249695b23775b75ca65bb59d.tar.gz"],
86+
sha256 = "de1441c02b35f5768b872d15d7e5813c4826b66630703e253fc95da39988a6d8",
87+
strip_prefix = "bazel-common-d4ada735afa0ab044957cfa21849be577756a6cd",
88+
urls = ["https://github.com/google/bazel-common/archive/d4ada735afa0ab044957cfa21849be577756a6cd.tar.gz"],
8989
)
9090

9191
load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
@@ -94,10 +94,10 @@ google_common_workspace_rules()
9494

9595
http_archive(
9696
name = "rules_license",
97-
sha256 = "6157e1e68378532d0241ecd15d3c45f6e5cfd98fc10846045509fb2a7cc9e381",
97+
sha256 = "4531deccb913639c30e5c7512a054d5d875698daeb75d8cf90f284375fe7c360",
9898
urls = [
99-
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
100-
"https://github.com/bazelbuild/rules_license/releases/download/0.0.4/rules_license-0.0.4.tar.gz",
99+
"https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz",
100+
"https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz",
101101
],
102102
)
103103

‎extensions.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
3939
def _non_module_deps_implementation(ctx):
4040
http_archive(
4141
name = "google_bazel_common",
42-
sha256 = "17ea98149586dff60aa741c67fbd9a010fbb1507df90e741c50403bf5228bea3",
43-
strip_prefix = "bazel-common-a9e1d8efd54cbf27249695b23775b75ca65bb59d",
44-
urls = ["https://github.com/google/bazel-common/archive/a9e1d8efd54cbf27249695b23775b75ca65bb59d.tar.gz"],
42+
sha256 = "de1441c02b35f5768b872d15d7e5813c4826b66630703e253fc95da39988a6d8",
43+
strip_prefix = "bazel-common-d4ada735afa0ab044957cfa21849be577756a6cd",
44+
urls = ["https://github.com/google/bazel-common/archive/d4ada735afa0ab044957cfa21849be577756a6cd.tar.gz"],
4545
)
4646

4747
non_module_deps = module_extension(

‎gradle/wrapper/gradle-wrapper.jar

-18.2 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
distributionBase=GRADLE_USER_HOME
55
distributionPath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
77
networkTimeout=10000
8+
validateDistributionUrl=true
89
zipStoreBase=GRADLE_USER_HOME
910
zipStorePath=wrapper/dists

‎gradlew

+13-9
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ done
8484
# This is normally unused
8585
# shellcheck disable=SC2034
8686
APP_BASE_NAME=${0##*/}
87-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
88+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8889

8990
# Use the maximum available, or set MAX_FD != -1 to use that value.
9091
MAX_FD=maximum
@@ -131,26 +132,29 @@ location of your Java installation."
131132
fi
132133
else
133134
JAVACMD=java
134-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
135+
if ! command -v java >/dev/null 2>&1
136+
then
137+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
135138
136139
Please set the JAVA_HOME variable in your environment to match the
137140
location of your Java installation."
141+
fi
138142
fi
139143

140144
# Increase the maximum file descriptors if we can.
141145
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
142146
case $MAX_FD in #(
143147
max*)
144148
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
145-
# shellcheck disable=SC3045
149+
# shellcheck disable=SC2039,SC3045
146150
MAX_FD=$( ulimit -H -n ) ||
147151
warn "Could not query maximum file descriptor limit"
148152
esac
149153
case $MAX_FD in #(
150154
'' | soft) :;; #(
151155
*)
152156
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
153-
# shellcheck disable=SC3045
157+
# shellcheck disable=SC2039,SC3045
154158
ulimit -n "$MAX_FD" ||
155159
warn "Could not set maximum file descriptor limit to $MAX_FD"
156160
esac
@@ -199,11 +203,11 @@ fi
199203
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
200204
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
201205

202-
# Collect all arguments for the java command;
203-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
204-
# shell script including quotes and variable substitutions, so put them in
205-
# double quotes to make sure that they get re-expanded; and
206-
# * put everything else in single quotes, so that it's not re-expanded.
206+
# Collect all arguments for the java command:
207+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# and any embedded shellness will be escaped.
209+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
210+
# treated as '${Hostname}' itself on the command line.
207211

208212
set -- \
209213
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎maven_install.json

100755100644
File mode changed.

0 commit comments

Comments
 (0)