diff --git a/app/build.gradle b/app/build.gradle index 789cb73d..a69b78e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,14 +15,14 @@ repositories { } android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "pl.pola_app" - minSdkVersion 16 - targetSdkVersion 29 - versionCode 30 - versionName "1.8" + minSdkVersion 25 + targetSdkVersion 30 + versionCode 31 + versionName "1.9.0" multiDexEnabled true } @@ -103,23 +103,23 @@ dependencies { implementation 'com.squareup.retrofit2:adapter-rxjava:2.9.0' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'io.reactivex:rxjava:1.3.8' - implementation 'com.journeyapps:zxing-android-embedded:3.6.0' + implementation 'com.journeyapps:zxing-android-embedded:4.2.0' implementation 'com.jakewharton:butterknife:10.2.3' implementation 'com.jakewharton.timber:timber:4.7.1' - implementation 'com.google.dagger:dagger:2.35' + implementation 'com.google.dagger:dagger:2.35.1' implementation 'com.squareup:otto:1.3.8' implementation 'org.parceler:parceler-api:1.1.13' implementation 'com.github.tajchert:nammu:1.2.1' - implementation 'com.google.firebase:firebase-core:18.0.3' - implementation 'com.google.firebase:firebase-crashlytics:17.4.1' + implementation 'com.google.firebase:firebase-core:19.0.0' + implementation 'com.google.firebase:firebase-crashlytics:18.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' - annotationProcessor 'com.google.dagger:dagger-compiler:2.35' + annotationProcessor 'com.google.dagger:dagger-compiler:2.35.1' annotationProcessor 'org.parceler:parceler:1.1.13' compileOnly 'javax.annotation:jsr250-api:1.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:1.+' + testImplementation 'org.mockito:mockito-core:3.9.0' testImplementation 'org.robolectric:robolectric:4.5.1' } diff --git a/build.gradle b/build.gradle index 8add3a0c..bf3d7fbd 100644 --- a/build.gradle +++ b/build.gradle @@ -4,15 +4,12 @@ buildscript { repositories { jcenter() google() - maven { - url 'https://maven.fabric.io/public' - } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'com.google.gms:google-services:4.3.5' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' + classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.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 6d3eb45b..ebcbabd5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip