mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 09:49:21 +02:00
upgrade some dependencies (#2838)
* upgrade some deps * update .github/workflows/preview-apk.yml
This commit is contained in:
parent
3a88e70945
commit
90ed5a84da
3 changed files with 35 additions and 29 deletions
15
.github/workflows/preview-apk.yml
vendored
15
.github/workflows/preview-apk.yml
vendored
|
@ -11,17 +11,18 @@ jobs:
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
uses: styfle/cancel-workflow-action@0.9.1
|
||||||
with:
|
with:
|
||||||
access_token: ${{ github.token }}
|
access_token: ${{ github.token }}
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- uses: Swatinem/rust-cache@v1
|
- uses: Swatinem/rust-cache@v2
|
||||||
with:
|
with:
|
||||||
working-directory: jni/deltachat-core-rust
|
working-directory: jni/deltachat-core-rust
|
||||||
- uses: actions/setup-java@v1.4.3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
java-version: 11
|
java-version: 17
|
||||||
- uses: android-actions/setup-android@v2
|
distribution: 'temurin'
|
||||||
- uses: actions/cache@v2
|
- uses: android-actions/setup-android@v3
|
||||||
|
- uses: actions/cache@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
~/.gradle/caches
|
~/.gradle/caches
|
||||||
|
@ -48,7 +49,7 @@ jobs:
|
||||||
run: ./gradlew --no-daemon assembleGplayDebug
|
run: ./gradlew --no-daemon assembleGplayDebug
|
||||||
|
|
||||||
- name: Upload APK
|
- name: Upload APK
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: app-preview.apk
|
name: app-preview.apk
|
||||||
path: 'build/outputs/apk/gplay/debug/*.apk'
|
path: 'build/outputs/apk/gplay/debug/*.apk'
|
||||||
|
|
44
build.gradle
44
build.gradle
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '7.4.2'
|
id 'com.android.application' version '8.1.4'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -15,22 +15,22 @@ repositories {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'androidx.sharetarget:sharetarget:1.2.0'
|
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.multidex:multidex:2.0.1'
|
||||||
implementation 'androidx.appcompat:appcompat:1.5.1'
|
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||||
implementation 'com.google.android.material:material:1.7.0'
|
implementation 'com.google.android.material:material:1.10.0'
|
||||||
implementation 'androidx.legacy:legacy-support-v13:1.0.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'
|
||||||
exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
|
exclude group: 'androidx.lifecycle', module:'lifecycle-viewmodel-ktx'
|
||||||
}
|
}
|
||||||
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
|
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-extensions:2.2.0'
|
||||||
implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1'
|
implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
|
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
|
||||||
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
|
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
|
||||||
implementation 'androidx.work:work-runtime:2.7.1'
|
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-core:2.9.6' // plays video and audio
|
||||||
implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6'
|
implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.6'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||||
|
@ -44,7 +44,7 @@ dependencies {
|
||||||
implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
|
implementation 'com.caverock:androidsvg-aar:1.4' // SVG support.
|
||||||
implementation 'com.github.bumptech.glide:glide:4.12.0'
|
implementation 'com.github.bumptech.glide:glide:4.12.0'
|
||||||
annotationProcessor 'com.github.bumptech.glide:compiler: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.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.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
|
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 {
|
android {
|
||||||
namespace "org.thoughtcrime.securesms"
|
namespace "org.thoughtcrime.securesms"
|
||||||
flavorDimensions "none"
|
flavorDimensions "none"
|
||||||
compileSdkVersion 33
|
compileSdk 34
|
||||||
|
|
||||||
// Set NDK version to strip native libraries.
|
// Set NDK version to strip native libraries.
|
||||||
// Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
|
// Even though we compile our libraries outside Gradle with `scripts/ndk-make.sh`,
|
||||||
|
@ -130,17 +130,15 @@ android {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
exclude 'LICENSE.txt'
|
jniLibs {
|
||||||
exclude 'LICENSE'
|
keepDebugSymbols += ['*/mips/*.so', '*/mips64/*.so']
|
||||||
exclude 'NOTICE'
|
|
||||||
exclude 'asm-license.txt'
|
|
||||||
exclude 'META-INF/LICENSE'
|
|
||||||
exclude 'META-INF/NOTICE'
|
|
||||||
doNotStrip '*/mips/*.so'
|
|
||||||
doNotStrip '*/mips64/*.so'
|
|
||||||
}
|
}
|
||||||
|
resources {
|
||||||
|
excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
debug {
|
debug {
|
||||||
|
@ -216,6 +214,10 @@ android {
|
||||||
lint {
|
lint {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
}
|
}
|
||||||
|
buildFeatures {
|
||||||
|
renderScript true
|
||||||
|
aidl true
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
android.defaults.buildfeatures.buildconfig=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
android.nonFinalResIds=false
|
||||||
|
android.nonTransitiveRClass=false
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
org.gradle.jvmargs=-Xmx4608m
|
org.gradle.jvmargs=-Xmx4608m
|
Loading…
Add table
Add a link
Reference in a new issue