Skip to content

Commit

Permalink
Update to new gradle, fix exposed minor bug.
Browse files Browse the repository at this point in the history
New version number.
  • Loading branch information
DonnKey committed Dec 24, 2020
1 parent e5133e9 commit 64c875c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ android {
multiDexEnabled true
minSdkVersion 17
targetSdkVersion 29
versionCode 11
versionCode 12
versionName getVersionName()
}
buildTypes {
Expand Down Expand Up @@ -101,33 +101,33 @@ 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"

// implementation 'com.flurry.android:analytics:6.9.2' Disabled: see analytics/StatsLogger.java
// 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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<string name="status_name_check">Badanie:</string>
<string name="status_name_error">Błąd:</string>
<string name="dialog_cannot_make_group">Nie można utworzyć katalogu grupy.</string>
<string name="cannot_rename_group">Zmiana nazwy %s na %s nie powiodła się.</string>
<string name="cannot_rename_group">Zmiana nazwy %1$s na %2$s nie powiodła się.</string>
<string name="grouping_error">Błędy podczas grupowania plików.</string>
<string name="group_file_not_directory">Plik niekatalogowy rozgrupowany - powinien zostać usunięty z %1$s.</string>
<string name="could_not_ungroup_file">Nie można rozgrupować książki %1$s. Plik zip?</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<string name="dialog_illegal_group">Must group at least two books</string>
<string name="dialog_colliding_group">Group already exists; no action</string>
<string name="dialog_cannot_make_group">Unable to create group directory.</string>
<string name="cannot_rename_group">Renaming %s to %s failed.</string>
<string name="cannot_rename_group">Renaming %1$s to %2$s failed.</string>
<string name="grouping_error">Errors while grouping files.</string>
<string name="group_file_not_directory">A non-directory file was ungrouped - it should be removed from %1$s.</string>
<string name="could_not_ungroup_file">Book %1$s could not be ungrouped. A zip file?</string>
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 64c875c

Please sign in to comment.