diff --git a/app/build.gradle b/app/build.gradle index 19289370..36b520bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,16 +66,16 @@ coveralls { jacocoReportPath 'build/reports/jacoco/jacocoTestReleaseUnitTestReport/jacocoTestReleaseUnitTestReport.xml' } -def dagger_version = '2.35.1' +def dagger_version = '2.38.1' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.4.0-alpha01' - implementation 'androidx.media:media:1.3.1' - implementation 'androidx.core:core-ktx:1.6.0-beta01' - implementation 'androidx.recyclerview:recyclerview:1.2.0' - implementation "androidx.work:work-runtime-ktx:2.6.0-alpha02" - implementation 'org.osmdroid:osmdroid-android:6.1.10' + implementation 'androidx.appcompat:appcompat:1.4.0-alpha03' + implementation 'androidx.media:media:1.4.1' + implementation 'androidx.core:core-ktx:1.7.0-alpha01' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation "androidx.work:work-runtime-ktx:2.6.0-rc01" + implementation 'org.osmdroid:osmdroid-android:6.1.11' // Dagger2 implementation "com.google.dagger:dagger:$dagger_version" @@ -85,14 +85,14 @@ dependencies { compileOnly 'javax.annotation:jsr250-api:1.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.assertj:assertj-core:3.19.0' - testImplementation 'io.mockk:mockk:1.11.0' + testImplementation 'org.assertj:assertj-core:3.20.2' + testImplementation 'io.mockk:mockk:1.12.0' testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" testImplementation 'org.robolectric:robolectric:4.5.1' - testImplementation 'androidx.test:core:1.3.0' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'androidx.test:core:1.4.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } kapt.includeCompileClasspath = false diff --git a/build.gradle b/build.gradle index 3ae1cdb4..10804d5f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.5.21' repositories { google() mavenCentral() @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.hiya:jacoco-android:0.2" classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e46a359f..1f2832da 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.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip