Merge branch 'Better_Player' into dev

# Conflicts:
#	app/build.gradle
This commit is contained in:
Prathamesh More 2022-05-26 20:16:44 +05:30
commit 5d0b5b91b0
175 changed files with 2308 additions and 2845 deletions

View file

@ -15,7 +15,7 @@ android {
applicationId "code.name.monkey.retromusic"
versionCode 10584
versionName '5.8.4'
versionName '5.9.0'
buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"")
}
@ -51,8 +51,7 @@ android {
}
}
lint {
abortOnError false
disable 'MissingTranslation', 'InvalidPackage'
disable 'MissingTranslation', 'ImpliedQuantity'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@ -90,7 +89,7 @@ dependencies {
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "androidx.preference:preference-ktx:$preference_version"
implementation 'androidx.core:core-ktx:1.7.0'
@ -116,9 +115,11 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
implementation "androidx.core:core-splashscreen:1.0.0-beta02"
implementation "androidx.core:core-splashscreen:1.0.0-rc01"
implementation 'com.google.android.play:feature-delivery:2.0.0'
implementation 'com.google.android.play:review:2.0.0'
implementation 'com.google.android.play:core-ktx:1.8.1'
implementation "com.google.android.material:material:$mdc_version"
def retrofit_version = '2.9.0'
@ -165,6 +166,6 @@ dependencies {
implementation 'com.github.dhaval2404:imagepicker:2.1'
implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
implementation 'cat.ereza:customactivityoncrash:2.3.0'
implementation 'me.tankery.lib:circularSeekBar:1.3.2'
implementation 'me.tankery.lib:circularSeekBar:1.4.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
}