diff --git a/app/build.gradle b/app/build.gradle index 10402201..82463192 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,7 +70,7 @@ android { multiDexEnabled true minSdkVersion 17 targetSdkVersion 29 - versionCode 11 + versionCode 12 versionName getVersionName() } buildTypes { @@ -101,15 +101,15 @@ dependencies { // To successfully use Firebase you'll need to download google-services.json from // your Firebase account (it's custom for each Firebase project/app). It should not // be checked in publicly. - implementation 'com.google.firebase:firebase-core:17.5.0' - implementation 'com.google.firebase:firebase-analytics:17.5.0' - implementation 'com.google.firebase:firebase-crashlytics:17.2.1' + implementation 'com.google.firebase:firebase-core:18.0.0' + implementation 'com.google.firebase:firebase-analytics:18.0.0' + implementation 'com.google.firebase:firebase-crashlytics:17.3.0' implementation 'org.greenrobot:eventbus:3.2.0' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation "androidx.work:work-runtime:2.4.0" @@ -117,17 +117,17 @@ dependencies { // If restored, proguard-rules.pro will need to be updated. // guava-jre does not work - must use -android - implementation 'com.google.guava:guava:29.0-android' + implementation 'com.google.guava:guava:30.1-android' implementation 'com.google.android.exoplayer:exoplayer-core:2.10.5' - implementation 'com.google.dagger:dagger:2.28.3' + implementation 'com.google.dagger:dagger:2.30.1' - implementation 'com.google.android.material:material:1.3.0-alpha02' + implementation 'com.google.android.material:material:1.3.0-beta01' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - annotationProcessor 'com.google.dagger:dagger-compiler:2.28.3' + annotationProcessor 'com.google.dagger:dagger-compiler:2.30.1' implementation 'com.sun.mail:android-mail:1.6.5' implementation 'com.sun.mail:android-activation:1.6.5' @@ -142,7 +142,7 @@ dependencies { implementation 'org.apache.commons:commons-text:1.9' implementation 'org.apache.commons:commons-compress:1.20' implementation 'org.apache.commons:commons-io:1.3.2' - implementation 'commons-net:commons-net:3.7' + implementation 'commons-net:commons-net:20030805.205232' // https://github.com/guardian/Option - needed by dirchooser (at runtime) // dirchooser only needed 4.4 and below diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index aa4931c7..ba1153ce 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -255,7 +255,7 @@ Badanie: Błąd: Nie można utworzyć katalogu grupy. - Zmiana nazwy %s na %s nie powiodła się. + Zmiana nazwy %1$s na %2$s nie powiodła się. Błędy podczas grupowania plików. Plik niekatalogowy rozgrupowany - powinien zostać usunięty z %1$s. Nie można rozgrupować książki %1$s. Plik zip? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8016144..64d36326 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -285,7 +285,7 @@ Must group at least two books Group already exists; no action Unable to create group directory. - Renaming %s to %s failed. + Renaming %1$s to %2$s failed. Errors while grouping files. A non-directory file was ungrouped - it should be removed from %1$s. Book %1$s could not be ungrouped. A zip file? diff --git a/build.gradle b/build.gradle index 53ff0cb0..ded9ae0e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' - classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.1' + classpath 'com.google.gms:google-services:4.3.4' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b16c34a..b64a7c1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Dec 08 15:44:39 PST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip