Merge branch 'release30' into 'master'

Release 30

See merge request pixeldroid/PixelDroid!578
This commit is contained in:
Matthieu 2024-02-14 21:23:13 +00:00
commit afe6f71152
2 changed files with 7 additions and 6 deletions

View File

@ -30,7 +30,7 @@ android {
}
defaultConfig {
minSdkVersion 23
versionCode 29
versionCode 30
targetSdkVersion 34
versionName "1.0.beta" + versionCode
@ -136,13 +136,13 @@ dependencies {
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
implementation "androidx.browser:browser:1.7.0"
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
@ -198,7 +198,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:1.6'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.7'
implementation project(path: ':scrambler')
implementation project(path: ':pixel_common')

View File

@ -0,0 +1 @@
Fix bug that was breaking the image editing feature in release mode