From 90ed5a84dacba82c79fc1b64794f88c3eecc719b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= Date: Mon, 15 Jan 2024 15:05:13 -0500 Subject: [PATCH] upgrade some dependencies (#2838) * upgrade some deps * update .github/workflows/preview-apk.yml --- .github/workflows/preview-apk.yml | 15 ++++++----- build.gradle | 44 ++++++++++++++++--------------- gradle.properties | 5 +++- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.github/workflows/preview-apk.yml b/.github/workflows/preview-apk.yml index d7f294da9..b838276a7 100644 --- a/.github/workflows/preview-apk.yml +++ b/.github/workflows/preview-apk.yml @@ -11,17 +11,18 @@ jobs: uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 with: working-directory: jni/deltachat-core-rust - - uses: actions/setup-java@v1.4.3 + - uses: actions/setup-java@v3 with: - java-version: 11 - - uses: android-actions/setup-android@v2 - - uses: actions/cache@v2 + java-version: 17 + distribution: 'temurin' + - uses: android-actions/setup-android@v3 + - uses: actions/cache@v3 with: path: | ~/.gradle/caches @@ -48,7 +49,7 @@ jobs: run: ./gradlew --no-daemon assembleGplayDebug - name: Upload APK - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: app-preview.apk path: 'build/outputs/apk/gplay/debug/*.apk' diff --git a/build.gradle b/build.gradle index 67a52f4f6..76324245d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' version '7.4.2' + id 'com.android.application' version '8.1.4' } repositories { @@ -15,22 +15,22 @@ repositories { dependencies { implementation 'androidx.sharetarget:sharetarget:1.2.0' - implementation 'androidx.webkit:webkit:1.5.0' + implementation 'androidx.webkit:webkit:1.8.0' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.10.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation ('androidx.preference:preference:1.2.0') { + implementation ('androidx.preference:preference:1.2.1') { exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel' exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx' } implementation 'androidx.legacy:legacy-preference-v14:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.3.5' + implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.work:work-runtime:2.7.1' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' + implementation 'androidx.work:work-runtime:2.8.1' implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' // plays video and audio implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' @@ -44,7 +44,7 @@ dependencies { implementation 'com.caverock:androidsvg-aar:1.4' // SVG support. implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' - annotationProcessor 'androidx.annotation:annotation:1.5.0' + annotationProcessor 'androidx.annotation:annotation:1.7.0' implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity. implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19 @@ -86,7 +86,7 @@ dependencies { android { namespace "org.thoughtcrime.securesms" flavorDimensions "none" - compileSdkVersion 33 + compileSdk 34 // Set NDK version to strip native libraries. // Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`, @@ -130,18 +130,16 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - exclude 'LICENSE.txt' - exclude 'LICENSE' - exclude 'NOTICE' - exclude 'asm-license.txt' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' - doNotStrip '*/mips/*.so' - doNotStrip '*/mips64/*.so' + jniLibs { + keepDebugSymbols += ['*/mips/*.so', '*/mips64/*.so'] + } + resources { + excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE'] + } } + signingConfigs { debug { // add `DC_DEBUG_STORE_FILE=/path/to/debug.keystore` to `~/.gradle/gradle.properties` @@ -216,6 +214,10 @@ android { lint { abortOnError false } + buildFeatures { + renderScript true + aidl true + } } diff --git a/gradle.properties b/gradle.properties index 2510a2d94..f6503cb12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx4608m \ No newline at end of file +org.gradle.jvmargs=-Xmx4608m