File tree Expand file tree Collapse file tree 4 files changed +8
-4
lines changed Expand file tree Collapse file tree 4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -276,7 +276,7 @@ jobs:
276
276
- name : Verify that the JNI bindings are up to date
277
277
run : rust/bridge/jni/bin/gen_java_decl.py --verify
278
278
279
- - run : ./gradlew build assembleAndroidTest android:lintDebug -PandroidArchs=arm,arm64 | tee ./gradle-output.txt
279
+ - run : ./gradlew --dependency-verification strict build assembleAndroidTest android:lintDebug -PandroidArchs=arm,arm64 | tee ./gradle-output.txt
280
280
working-directory : java
281
281
shell : bash # Explicitly setting the shell turns on pipefail in GitHub Actions
282
282
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ default: java_build
11
11
12
12
DOCKER_IMAGE := libsignal-builder
13
13
DOCKER_TTY_FLAG := $$(test -t 0 && echo -it )
14
+ GRADLE_OPTIONS ?= --dependency-verification strict
14
15
CROSS_COMPILE_SERVER ?= -PcrossCompileServer
15
16
16
17
docker_image :
@@ -22,7 +23,7 @@ java_build: docker_image
22
23
--env LIBSIGNAL_TESTING_RUN_NONHERMETIC_TESTS \
23
24
--env LIBSIGNAL_TESTING_PROXY_SERVER \
24
25
-v `cd .. && pwd`/ :/home/libsignal/src $(DOCKER_EXTRA ) $(DOCKER_IMAGE ) \
25
- sh -c "cd src/java; ./gradlew build $(CROSS_COMPILE_SERVER)"
26
+ sh -c "cd src/java; ./gradlew $(GRADLE_OPTIONS) build $(CROSS_COMPILE_SERVER)"
26
27
27
28
publish_java : DOCKER_EXTRA = $(shell [ -L build ] && P=$$(readlink build ) && echo -v $$P/:$$P )
28
29
publish_java : docker_image
@@ -34,7 +35,7 @@ publish_java: docker_image
34
35
-e ORG_GRADLE_PROJECT_signingPassword \
35
36
-e ORG_GRADLE_PROJECT_signingKey \
36
37
$(DOCKER_IMAGE ) \
37
- sh -c " cd src/java; ./gradlew publish closeAndReleaseStagingRepositories $( CROSS_COMPILE_SERVER) "
38
+ sh -c " cd src/java; ./gradlew $( GRADLE_OPTIONS ) publish closeAndReleaseStagingRepositories $( CROSS_COMPILE_SERVER) "
38
39
39
40
# We could run these through Docker, but they would have the same result anyway.
40
41
Original file line number Diff line number Diff line change 1
1
android.enableAdditionalTestOutput =true
2
2
android.useAndroidX =true
3
+ # Downgrade dependency verification by default (we turn it back to strict in CI and pre-commit checking).
4
+ org.gradle.dependency.verification =lenient
3
5
# Don't rely on the HTML output; that's not useful in CI.
4
6
org.gradle.dependency.verification.console =verbose
5
- org.gradle.jvmargs =-Xmx4g -Xms256m -XX:MaxMetaspaceSize=1g
7
+ org.gradle.jvmargs =-Xmx4g -Xms256m -XX:MaxMetaspaceSize=1g
Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ check-pre-commit: check-format-all
56
56
(cd node && npm run lint)
57
57
(cd swift && ./ verify_error_codes.sh)
58
58
(cd swift && swiftlint lint --strict)
59
+ (cd java && ./ gradlew --dependency-verification strict help >/ dev/ null)
59
60
cargo test --workspace --all-features --verbose --no-fail-fast -- --include-ignored
60
61
cargo clippy --workspace --all-targets --all-features --keep-going -- -D warnings
61
62
@ printf " \e [32mBasic pre-commit checks passed! ✅ Hopefully good to push! 🤞\e [0m\n "
You can’t perform that action at this time.
0 commit comments