Skip to content

Commit 1efd594

Browse files
vmadalinvmadalin
authored
Update project dependencies and remove build warnings (#4)
* Update project dependencies and remove build warnings
1 parent 1328e32 commit 1efd594

13 files changed

+42
-45
lines changed

‎.lint/config.xml

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<lint>
33
<issue id="GoogleAppIndexingWarning" severity="ignore"/>
44
<issue id="UnusedResources" severity="ignore"/>
5+
<issue id="ObsoleteLintCustomCheck" severity="ignore"/>
6+
<issue id="UnknownNullness" severity="ignore"/>
7+
<issue id="WrongConstant" severity="ignore"/>
58
<issue id="InvalidPackage" severity="ignore">
69
<ignore path="**/**.jar"/>
710
</issue>

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[![Codecov](https://codecov.io/gh/VMadalin/kotlin-sample-app/coverage.svg)](https://codecov.io/gh/VMadalin/kotlin-sample-app)
44
[![Codacy](https://api.codacy.com/project/badge/Grade/5970b6648df0465588f9781ae6e3332e)](https://www.codacy.com/manual/VMadalin/kotlin-sample-app?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=VMadalin/kotlin-sample-app&amp;utm_campaign=Badge_Grade)
55
[![CodeStyle](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
6-
[![Kotlin Version](https://img.shields.io/badge/kotlin-1.3.50-blue.svg)](http://kotlinlang.org/)
7-
[![Gradle](https://img.shields.io/badge/gradle-5.6.2-blue.svg)](https://lv.binarybabel.org/catalog/gradle/latest)
6+
[![Kotlin Version](https://img.shields.io/badge/kotlin-1.3.61-blue.svg)](http://kotlinlang.org/)
7+
[![Gradle](https://img.shields.io/badge/gradle-6.1-blue.svg)](https://lv.binarybabel.org/catalog/gradle/latest)
88
[![API](https://img.shields.io/badge/API-21%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=21)
99
[![License](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)](http://www.apache.org/licenses/LICENSE-2.0)
1010

‎app/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ android {
9999
BuildModules.Features.CHARACTERS_FAVORITES
100100
)
101101

102-
dataBinding {
103-
isEnabled = true
102+
buildFeatures{
103+
dataBinding = true
104104
}
105105

106106
androidExtensions {

‎buildSrc/build.gradle.kts

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ kotlinDslPluginOptions {
3535
}
3636

3737
object PluginsVersions {
38-
const val GRADLE_ANDROID = "3.5.1"
39-
const val GRADLE_VERSIONS = "0.22.0"
40-
const val KOTLIN = "1.3.50"
41-
const val NAVIGATION = "2.1.0-beta02"
38+
const val GRADLE_ANDROID = "4.0.0-alpha06"
39+
const val GRADLE_VERSIONS = "0.27.0"
40+
const val KOTLIN = "1.3.61"
41+
const val NAVIGATION = "2.1.0"
4242
const val JACOCO = "0.16.0-SNAPSHOT"
43-
const val FABRIC = "1.31.0"
43+
const val FABRIC = "1.31.2"
4444
const val DOKKA = "0.10.0"
45-
const val KTLINT = "0.34.2"
46-
const val SPOTLESS = "3.24.1"
47-
const val DETEKT = "1.0.1"
45+
const val KTLINT = "0.36.0"
46+
const val SPOTLESS = "3.26.1"
47+
const val DETEKT = "1.2.2"
4848
}
4949

5050
dependencies {

‎buildSrc/src/main/kotlin/BuildDependenciesVersions.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@
1818
* Configuration version of all build dependencies
1919
*/
2020
object BuildDependenciesVersions {
21-
const val KOTLIN = "1.3.50"
21+
const val KOTLIN = "1.3.61"
2222
const val APPCOMPAT = "1.1.0"
2323
const val MATERIAL = "1.1.0-beta01"
24-
const val COROUTINES = "1.3.2"
25-
const val ROOM = "2.2.0"
26-
const val RECYCLE_VIEW = "1.1.0-alpha06"
24+
const val COROUTINES = "1.3.3"
25+
const val ROOM = "2.2.3"
26+
const val RECYCLE_VIEW = "1.1.0"
2727
const val NAVIGATION = "2.1.0"
2828
const val LIFECYCLE = "2.1.0"
2929
const val CORE_KTX = "1.1.0"
3030
const val FRAGMENT_KTX = "1.2.0-alpha02"
3131
const val CONSTRAIN_LAYOUT = "1.1.3"
3232
const val SWIPE_REFRESH_LAYOUT = "1.1.0-alpha02"
33-
const val PAGING = "2.1.0"
34-
const val DAGGER = "2.24"
33+
const val PAGING = "2.1.1"
34+
const val DAGGER = "2.25.3"
3535
const val TIMBER = "4.7.1"
36-
const val RETROFIT = "2.6.2"
36+
const val RETROFIT = "2.7.0"
3737
const val LOGGING = "4.2.2"
38-
const val MOSHI = "1.8.0"
38+
const val MOSHI = "1.9.2"
3939
const val COIL = "0.8.0"
4040
const val CRASHLYTICS = "2.10.1"
4141
const val PLAY_CORE = "1.6.4"
42-
const val LEAKCANARY = "2.0-beta-2"
42+
const val LEAKCANARY = "2.0"
4343
const val DATABINDING = "3.1.4"
4444
const val AUTO_SERVICE = "1.0-rc4"
4545

@@ -48,10 +48,10 @@ object BuildDependenciesVersions {
4848
const val EXT = "1.1.1"
4949
const val ARCH_CORE = "2.1.0"
5050
const val JUNIT = "4.12"
51-
const val ROBOELECTRIC = "4.3"
51+
const val ROBOELECTRIC = "4.3.1"
5252
const val MOCKITO = "2.2.0"
5353
const val MOCKK = "1.9.3"
54-
const val ASSERTJ = "3.13.2"
54+
const val ASSERTJ = "3.14.0"
5555
const val ESPRESSO = "3.2.0"
5656
const val FRAGMENT_TEST = "1.2.0-alpha02"
5757
const val MOCK_WEB_SERVER = "4.2.2"

‎buildSrc/src/main/kotlin/commons/android-dynamic-feature.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import extensions.addTestsDependencies
2727
import extensions.implementation
2828
import extensions.testImplementation
2929
import extensions.kapt
30-
import gradle.kotlin.dsl.accessors._8fbe50ab46e72ba67087bf0fa5fe6568.testImplementation
3130

3231
plugins {
3332
id("com.android.dynamic-feature")
@@ -58,8 +57,8 @@ android {
5857
jvmTarget = JavaVersion.VERSION_1_8.toString()
5958
}
6059

61-
dataBinding {
62-
isEnabled = true
60+
buildFeatures{
61+
dataBinding = true
6362
}
6463

6564
androidExtensions {

‎buildSrc/src/main/kotlin/commons/android-library.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ android {
5454
jvmTarget = JavaVersion.VERSION_1_8.toString()
5555
}
5656

57-
dataBinding {
58-
isEnabled = true
57+
buildFeatures{
58+
dataBinding = true
5959
}
6060

6161
androidExtensions {

‎buildSrc/src/main/kotlin/plugins/detekt.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ apply<DetektPlugin>()
2424
configure<DetektExtension> {
2525
input = project.files("src/main/kotlin")
2626
config = files("$rootDir/.detekt/config.yml")
27-
filters = ".*build.*,.*/resources/.*,.*/tmp/.*"
2827
reports {
2928
xml {
3029
enabled = true

‎buildSrc/src/main/kotlin/plugins/ktlint.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package plugins
1919
val ktlint: Configuration by configurations.creating
2020

2121
dependencies {
22-
ktlint("com.pinterest:ktlint:0.34.2")
22+
ktlint("com.pinterest:ktlint:0.36.0")
2323
}
2424

2525
tasks {

‎gradle.properties

-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,3 @@ kapt.use.worker.api=true
2525
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2626
android.useAndroidX=true
2727
android.enableJetifier=true
28-
29-
# Code shrinker to make it faster and more efficient
30-
# https://android-developers.googleblog.com/2018/11/r8-new-code-shrinker-from-google-is.html
31-
android.enableR8 = true
32-
android.enableR8.libraries = true

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip

‎libraries/test_utils/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import dependencies.Dependencies
1818
import dependencies.TestDependencies
1919
import dependencies.AnnotationProcessorsDependencies
2020
import extensions.implementation
21+
import extensions.kapt
2122

2223
plugins {
2324
id("commons.android-library")
@@ -40,5 +41,5 @@ dependencies {
4041
implementation(TestDependencies.EXT)
4142
implementation(TestDependencies.MOCK_WEB_SERVER)
4243

43-
annotationProcessor(AnnotationProcessorsDependencies.AUTO_SERVICE)
44+
kapt(AnnotationProcessorsDependencies.AUTO_SERVICE)
4445
}

‎settings.gradle.kts

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616

1717
include(
18-
BuildModules.APP,
19-
BuildModules.CORE,
20-
BuildModules.Features.HOME,
21-
BuildModules.Features.CHARACTERS_LIST,
22-
BuildModules.Features.CHARACTERS_FAVORITES,
23-
BuildModules.Libraries.TEST_UTILS,
24-
BuildModules.Commons.UI,
25-
BuildModules.Commons.VIEWS
18+
":app",
19+
":core",
20+
":features:home",
21+
":features:characters_list",
22+
":features:characters_favorites",
23+
":libraries:test_utils",
24+
":commons:ui",
25+
":commons:views"
2626
)
2727

2828
rootProject.buildFileName = "build.gradle.kts"

0 commit comments

Comments
 (0)