From 0ac26883c65d530e7bcd532f56095f7fba754a04 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 11 Jan 2022 10:48:03 +0000 Subject: [PATCH 1/3] Build APK for CI pipelines. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a72bb851..158744bd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,9 +32,9 @@ test: extends: .base-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 + - ./gradlew -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest + - ./gradlew -Djava.security.egd=file:/dev/urandom assembleOfficialDebug :briar-headless:linuxJars + - ./gradlew -Djava.security.egd=file:/dev/urandom compileOfficialDebugAndroidTestSources compileScreenshotDebugAndroidTestSources check rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: always From b334e8da278b4c1bdc9666055c55e56d84a65b0c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 11 Jan 2022 10:48:56 +0000 Subject: [PATCH 2/3] Suppress ProGuard warning about Jackson's Java7SupportImpl. --- bramble-android/proguard-rules.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bramble-android/proguard-rules.txt b/bramble-android/proguard-rules.txt index 7890a3139..9bc907876 100644 --- a/bramble-android/proguard-rules.txt +++ b/bramble-android/proguard-rules.txt @@ -15,5 +15,4 @@ -dontwarn sun.misc.Unsafe -dontnote com.google.common.** -# UPnP library isn't used --dontwarn org.bitlet.weupnp.** +-dontwarn com.fasterxml.jackson.databind.ext.Java7SupportImpl From 841b8133d1c8e5131997d9c19664d9ac1f8f351a Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 11 Jan 2022 10:50:49 +0000 Subject: [PATCH 3/3] Update ProGuard rules to stay within dex method limit. --- bramble-android/proguard-rules.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bramble-android/proguard-rules.txt b/bramble-android/proguard-rules.txt index 9bc907876..fee1df635 100644 --- a/bramble-android/proguard-rules.txt +++ b/bramble-android/proguard-rules.txt @@ -1,6 +1,8 @@ --keep,includedescriptorclasses class org.briarproject.** { *; } - --keep class org.h2.** { *; } +# Keep the H2 classes that are loaded via reflection +-keep class org.h2.Driver { *; } +-keep class org.h2.engine.Engine { *; } +-keep class org.h2.store.fs.** { *; } +# Don't warn about unused dependencies of H2 classes -dontwarn org.h2.** -dontnote org.h2.**