Skip to content

Commit 90568c3

Browse files
vmadalinvmadalin
authored
Merge pull request #29 from VMadalin/fix/update-dependencies
Update dependencies #26
2 parents 29eecff + cfdf1b2 commit 90568c3

File tree

70 files changed

+679
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+679
-717
lines changed

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[![Codecov](https://codecov.io/gh/VMadalin/android-modular-architecture/coverage.svg)](https://codecov.io/gh/VMadalin/android-modular-architecture)
44
[![Codacy](https://api.codacy.com/project/badge/Grade/5970b6648df0465588f9781ae6e3332e)](https://www.codacy.com/manual/VMadalin/kotlin-sample-app?utm_source=github.com&utm_medium=referral&utm_content=VMadalin/kotlin-sample-app&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.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)
6+
[![Kotlin Version](https://img.shields.io/badge/kotlin-1.4.10-blue.svg)](http://kotlinlang.org/)
7+
[![Gradle](https://img.shields.io/badge/gradle-6.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

@@ -47,7 +47,7 @@ The project received different mentions/reference from Android Developer Communi
4747

4848
### Environment setup
4949

50-
First off, you require the latest Android Studio 3.5.3 (or newer) to be able to build the app.
50+
First off, you require the latest Android Studio 4.1.0 (or newer) to be able to build the app.
5151

5252
You need to supply keys for Marvel API. You can find information about how to gain access by using the [link](https://developer.marvel.com).
5353

@@ -229,7 +229,6 @@ This project takes advantage of many popular libraries, plugins and tools of the
229229
- [Espresso](https://developer.android.com/training/testing/espresso) - to write concise, beautiful, and reliable Android UI tests
230230
- [Robolectric](https://github.com/robolectric/robolectric) - industry-standard unit testing framework for Android.
231231
- [JUnit](https://github.com/junit-team/junit4) - a simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks.
232-
- [Mockito](https://github.com/nhaarman/mockito-kotlin) - most popular Mocking framework for unit tests written in Java.
233232
- [Mockk](https://github.com/mockk/mockk) - provides DSL to mock behavior. Built from zero to fit Kotlin language.
234233
- [AndroidX](https://github.com/android/android-test) - the androidx test library provides an extensive framework for testing Android apps.
235234
- [and more...](https://github.com/VMadalin/kotlin-sample-app/blob/master/buildSrc/src/main/kotlin/dependencies/TestDependencies.kt)

‎app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151

5252
vectorDrawables.useSupportLibrary = BuildAndroidConfig.SUPPORT_LIBRARY_VECTOR_DRAWABLES
5353
testInstrumentationRunner = BuildAndroidConfig.TEST_INSTRUMENTATION_RUNNER
54-
testInstrumentationRunnerArguments = BuildAndroidConfig.TEST_INSTRUMENTATION_RUNNER_ARGUMENTS
54+
testInstrumentationRunnerArguments.putAll(BuildAndroidConfig.TEST_INSTRUMENTATION_RUNNER_ARGUMENTS)
5555
}
5656

5757
buildTypes {
@@ -82,8 +82,8 @@ android {
8282
BuildModules.Features.CHARACTERS_FAVORITES
8383
)
8484

85-
dataBinding {
86-
isEnabled = true
85+
buildFeatures {
86+
dataBinding = true
8787
}
8888

8989
androidExtensions {

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:layout_height="match_parent"
88
tools:context=".SampleMainActivity">
99

10-
<fragment
10+
<androidx.fragment.app.FragmentContainerView
1111
android:id="@+id/nav_host_fragment"
1212
android:name="androidx.navigation.fragment.NavHostFragment"
1313
android:layout_width="match_parent"
@@ -17,6 +17,7 @@
1717
app:layout_constraintTop_toTopOf="parent"
1818
app:layout_constraintBottom_toTopOf="parent"
1919
app:defaultNavHost="true"
20-
app:navGraph="@navigation/navigation_app_graph" />
20+
app:navGraph="@navigation/navigation_app_graph"
21+
tools:ignore="UnusedIds"/>
2122

2223
</androidx.constraintlayout.widget.ConstraintLayout>

‎buildSrc/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ kotlinDslPluginOptions {
3434
}
3535

3636
object PluginsVersions {
37-
const val GRADLE_ANDROID = "3.5.3"
38-
const val GRADLE_VERSIONS = "0.27.0"
39-
const val KOTLIN = "1.3.61"
40-
const val NAVIGATION = "2.1.0"
37+
const val GRADLE_ANDROID = "4.1.0"
38+
const val GRADLE_VERSIONS = "0.33.0"
39+
const val KOTLIN = "1.4.10"
40+
const val NAVIGATION = "2.3.0"
4141
const val JACOCO = "0.16.0"
4242
const val DOKKA = "0.10.0"
43-
const val KTLINT = "0.36.0"
44-
const val SPOTLESS = "3.26.1"
45-
const val DETEKT = "1.2.2"
43+
const val KTLINT = "0.39.0"
44+
const val SPOTLESS = "5.6.1"
45+
const val DETEKT = "1.14.1"
4646
const val GRAPH_GENERATOR = "0.6.0-SNAPSHOT"
4747
}
4848

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

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,38 @@
1818
* Configuration version of all build dependencies
1919
*/
2020
object BuildDependenciesVersions {
21-
const val KOTLIN = "1.3.61"
22-
const val APPCOMPAT = "1.1.0"
23-
const val MATERIAL = "1.1.0-beta01"
24-
const val COROUTINES = "1.3.3"
25-
const val ROOM = "2.2.3"
21+
const val KOTLIN = "1.4.10"
22+
const val APPCOMPAT = "1.2.0"
23+
const val MATERIAL = "1.2.1"
24+
const val COROUTINES = "1.3.9"
25+
const val ROOM = "2.2.5"
2626
const val RECYCLE_VIEW = "1.1.0"
27-
const val NAVIGATION = "2.1.0"
28-
const val LIFECYCLE = "2.1.0"
29-
const val CORE_KTX = "1.1.0"
30-
const val FRAGMENT_KTX = "1.2.0-alpha02"
31-
const val CONSTRAIN_LAYOUT = "1.1.3"
32-
const val SWIPE_REFRESH_LAYOUT = "1.1.0-alpha02"
33-
const val PAGING = "2.1.1"
34-
const val DAGGER = "2.25.3"
27+
const val NAVIGATION = "2.3.0"
28+
const val LIFECYCLE = "2.2.0"
29+
const val CORE_KTX = "1.3.2"
30+
const val FRAGMENT_KTX = "1.2.5"
31+
const val CONSTRAIN_LAYOUT = "2.0.2"
32+
const val SWIPE_REFRESH_LAYOUT = "1.1.0"
33+
const val PAGING = "2.1.2"
34+
const val DAGGER = "2.29.1"
3535
const val TIMBER = "4.7.1"
36-
const val RETROFIT = "2.7.0"
37-
const val LOGGING = "4.2.2"
38-
const val MOSHI = "1.9.2"
39-
const val COIL = "0.8.0"
40-
const val PLAY_CORE = "1.6.4"
41-
const val LEAKCANARY = "2.0"
36+
const val RETROFIT = "2.9.0"
37+
const val LOGGING = "4.9.0"
38+
const val MOSHI = "1.11.0"
39+
const val COIL = "0.13.0"
40+
const val PLAY_CORE = "1.8.2"
41+
const val LEAKCANARY = "2.5"
4242
const val DATABINDING = "3.1.4"
43-
const val AUTO_SERVICE = "1.0-rc4"
4443

4544
// Tests
46-
const val TEST = "1.2.0"
47-
const val EXT = "1.1.1"
45+
const val TEST = "1.3.0"
46+
const val EXT = "1.1.2"
4847
const val ARCH_CORE = "2.1.0"
49-
const val JUNIT = "4.12"
50-
const val ROBOELECTRIC = "4.3.1"
51-
const val MOCKITO = "2.2.0"
52-
const val MOCKK = "1.9.3"
53-
const val ASSERTJ = "3.14.0"
54-
const val ESPRESSO = "3.2.0"
55-
const val FRAGMENT_TEST = "1.2.0-alpha02"
56-
const val MOCK_WEB_SERVER = "4.2.2"
48+
const val JUNIT = "4.13.1"
49+
const val ROBOELECTRIC = "4.4"
50+
const val MOCKK = "1.10.2"
51+
const val ASSERTJ = "3.17.2"
52+
const val ESPRESSO = "3.3.0"
53+
const val FRAGMENT_TEST = "1.2.5"
54+
const val MOCK_WEB_SERVER = "4.9.0"
5755
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ plugins {
3939
id("com.vanniktech.dependency.graph.generator")
4040
}
4141

42+
allOpen {
43+
// allows mocking for classes w/o directly opening them for release builds
44+
annotation("com.vmadalin.core.annotations.OpenClass")
45+
}
46+
4247
android {
4348
compileSdkVersion(BuildAndroidConfig.COMPILE_SDK_VERSION)
4449

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ android {
5555
jvmTarget = JavaVersion.VERSION_1_8.toString()
5656
}
5757

58-
dataBinding {
59-
isEnabled = true
58+
buildFeatures {
59+
dataBinding = true
6060
}
6161

6262
androidExtensions {

‎buildSrc/src/main/kotlin/dependencies/AnnotationProcessorsDependencies.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ object AnnotationProcessorsDependencies {
2424
const val DAGGER = "com.google.dagger:dagger-compiler:${BuildDependenciesVersions.DAGGER}"
2525
const val DATABINDING = "com.android.databinding:compiler:${BuildDependenciesVersions.DATABINDING}"
2626
const val ROOM = "androidx.room:room-compiler:${BuildDependenciesVersions.ROOM}"
27-
const val AUTO_SERVICE = "com.google.auto.service:auto-service:${BuildDependenciesVersions.AUTO_SERVICE}"
2827
}

‎buildSrc/src/main/kotlin/dependencies/TestAndroidDependencies.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package dependencies
2222
*/
2323
object TestAndroidDependencies {
2424
const val LEAKCANARY = "com.squareup.leakcanary:leakcanary-android-instrumentation:${BuildDependenciesVersions.LEAKCANARY}"
25-
const val MOCKITO = "com.nhaarman.mockitokotlin2:mockito-kotlin:${BuildDependenciesVersions.MOCKITO}"
2625
const val ESPRESSO = "androidx.test.espresso:espresso-core:${BuildDependenciesVersions.ESPRESSO}"
2726
const val RUNNER = "androidx.test:runner:${BuildDependenciesVersions.TEST}"
2827
const val RULES = "androidx.test:rules:${BuildDependenciesVersions.TEST}"

‎buildSrc/src/main/kotlin/dependencies/TestDependencies.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package dependencies
2222
*/
2323
object TestDependencies {
2424
const val JUNIT = "junit:junit:${BuildDependenciesVersions.JUNIT}"
25-
const val MOCKITO = "com.nhaarman.mockitokotlin2:mockito-kotlin:${BuildDependenciesVersions.MOCKITO}"
2625
const val MOCKK = "io.mockk:mockk:${BuildDependenciesVersions.MOCKK}"
2726
const val ASSERTJ = "org.assertj:assertj-core:${BuildDependenciesVersions.ASSERTJ}"
2827
const val ROBOELECTRIC = "org.robolectric:robolectric:${BuildDependenciesVersions.ROBOELECTRIC}"

0 commit comments

Comments
 (0)