Skip to content

Commit 817e788

Browse files
committed
wip
1 parent eace886 commit 817e788

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM mcr.microsoft.com/devcontainers/javascript-node:22
22

33
# need to run update and install at the same time to prevent stale update layer
4-
RUN apt-get update && apt-get install -y gdb clang-format openjdk-17-jdk maven
4+
RUN apt-get update && apt-get install -y gdb clang-format openjdk-17-jdk maven gradle

scripts/update-commons-lang.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
22
set -eu
3-
43
SCRIPT_DIR=$(dirname "$0")
54

65
build_common_lang () {
@@ -12,7 +11,7 @@ build_common_lang () {
1211
else
1312
mkdir -p build
1413
cd build
15-
git clone git@github.com:apache/commons-lang.git
14+
git clone https://github.com/apache/commons-lang.git
1615
cd commons-lang
1716
fi
1817
git pull
@@ -23,16 +22,16 @@ build_common_lang () {
2322
build_jarjar () {
2423
echo "build jarjar"
2524
cd "${SCRIPT_DIR}/.."
26-
if [ -d build/jarjar-forkfork ]; then
27-
cd build/jarjar-forkfork/jarjar
25+
if [ -d build/jarjar ]; then
26+
cd build/jarjar
2827
git pull
2928
else
3029
mkdir -p build
3130
cd build
32-
git clone git@github.com:mike-hogan/jarjar-forkfork.git
33-
cd jarjar-forkfork/jarjar
31+
git clone https://github.com/shevek/jarjar.git
32+
cd jarjar
3433
fi
35-
mvn clean compile package -DskipTests
34+
gradle
3635
}
3736

3837
repackage_common_lang () {

0 commit comments

Comments
 (0)