1
0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2024-12-27 23:40:38 +01:00

Merge branch 'release38' into 'master'

Update dependencies & release

See merge request pixeldroid/PixelDroid!609
This commit is contained in:
Matthieu 2024-10-19 14:03:18 +00:00
commit 8e6df0d9d4
2 changed files with 18 additions and 15 deletions

View File

@ -46,7 +46,7 @@ android {
defaultConfig {
minSdkVersion 23
targetSdkVersion 34
versionCode 37
versionCode 38
versionName "1.0.beta" + versionCode
//TODO add resConfigs("en", "fr", "ja",...) ?
@ -182,7 +182,7 @@ dependencies {
implementation 'androidx.hilt:hilt-common:1.2.0'
implementation 'androidx.hilt:hilt-work:1.2.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
/**
* AndroidX dependencies:
@ -192,23 +192,23 @@ dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
implementation "androidx.browser:browser:1.8.0"
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
implementation 'androidx.navigation:navigation-fragment-ktx:2.8.3'
implementation 'androidx.navigation:navigation-ui-ktx:2.8.3'
implementation 'androidx.paging:paging-runtime-ktx:3.3.2'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.4"
implementation "androidx.annotation:annotation:1.8.2"
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.6'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.6"
implementation "androidx.annotation:annotation:1.9.0"
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "androidx.activity:activity-ktx:1.9.1"
implementation 'androidx.fragment:fragment-ktx:1.8.2'
implementation "androidx.activity:activity-ktx:1.9.3"
implementation 'androidx.fragment:fragment-ktx:1.8.4'
implementation 'androidx.work:work-runtime-ktx:2.9.1'
implementation 'androidx.media2:media2-widget:1.3.0'
implementation 'androidx.media2:media2-player:1.3.0'
@ -257,7 +257,7 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
implementation 'com.github.connyduck:sparkbutton:4.1.0'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:4.0'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:4.2'
implementation project(path: ':scrambler')
implementation project(path: ':pixel_common')

View File

@ -0,0 +1,3 @@
* AMOLED dark mode
* Sync NSFW setting with server
* Update dependencies and translations