From 07b35db4d41f8d5505bb1e945051f5c884a3b411 Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Mon, 13 Dec 2021 15:38:17 +0000 Subject: [PATCH] Fix headless jar build on Java 11, add to CI pipeline. --- .gitlab-ci.yml | 1 + briar-headless/build.gradle | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef18ade7b5..8a72bb851e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,7 @@ test: stage: test script: - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest + - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom :briar-headless:linuxJars - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom compileOfficialDebugAndroidTestSources compileScreenshotDebugAndroidTestSources check rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' diff --git a/briar-headless/build.gradle b/briar-headless/build.gradle index 0da7271804..d95750adf7 100644 --- a/briar-headless/build.gradle +++ b/briar-headless/build.gradle @@ -58,6 +58,7 @@ void jarFactory(Jar jarTask, jarArchitecture) { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } { + it.duplicatesStrategy(DuplicatesStrategy.EXCLUDE) String[] architectures = ["linux-aarch64", "linux-armhf", "linux-x86_64"] for (String arch : architectures) { if (arch != jarArchitecture) { @@ -111,6 +112,10 @@ task x86LinuxJar(type: Jar) { jarFactory(it, 'linux-x86_64') } +task linuxJars { + dependsOn(aarch64LinuxJar, armhfLinuxJar, x86LinuxJar) +} + // At the moment for non-Android projects we need to explicitly mark the code generated by kapt // as 'generated source code' for correct highlighting and resolve in IDE. idea { -- GitLab