From deb14865c6f04522a90527d86f000a97cadb9cb1 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Tue, 18 Apr 2023 13:31:25 +0200 Subject: [PATCH] Fix: JNA issue in release mode (#335) * Restore checkout config for nightly workflows. * Add missing proguard config line for JNA. --- .github/workflows/nightly.yml | 4 ---- .github/workflows/nightly_manual.yml | 4 ---- app/proguard-rules.pro | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 12a82a0740..2f7c10a3d0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -16,10 +16,6 @@ jobs: if: ${{ github.repository == 'vector-im/element-x-android' }} steps: - uses: actions/checkout@v3 - with: - # Ensure we are building the branch and not the branch after being merged on develop - # https://github.com/actions/checkout/issues/881 - ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} - name: Use JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/nightly_manual.yml b/.github/workflows/nightly_manual.yml index 792ed54560..6e8ef7c684 100644 --- a/.github/workflows/nightly_manual.yml +++ b/.github/workflows/nightly_manual.yml @@ -13,10 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - # Ensure we are building the branch and not the branch after being merged on develop - # https://github.com/actions/checkout/issues/881 - ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }} - name: Use JDK 17 uses: actions/setup-java@v3 with: diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5cc1d0e7ef..80b09858cf 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -6,6 +6,7 @@ # http://developer.android.com/guide/developing/tools/proguard.html # JNA +-dontwarn java.awt.* -keep class com.sun.jna.** { *; } -keep class * implements com.sun.jna.** { *; } @@ -23,4 +24,4 @@ } -keepclassmembers class <1>.<2> { <1>.<2>$Companion Companion; -} \ No newline at end of file +}