Skip to content

Commit 834bfe9

Browse files
committed
Update dependencies verions and migrate to koin v3
1 parent 8cf919f commit 834bfe9

File tree

9 files changed

+24
-26
lines changed

9 files changed

+24
-26
lines changed

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("com.android.library")
33
commonPlugins.forEach { id(it) }
4-
id("com.github.dcendents.android-maven")
4+
id("maven-publish")
55
}
66

77
group = "com.github.enginebai"

base/src/main/java/com/enginebai/base/view/BaseViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
44
import io.reactivex.disposables.CompositeDisposable
55
import io.reactivex.disposables.Disposable
66
import io.reactivex.subjects.PublishSubject
7-
import org.koin.core.KoinComponent
7+
import org.koin.core.component.KoinComponent
88

99
abstract class BaseViewModel : ViewModel(), KoinComponent {
1010
private val disposables = CompositeDisposable()

build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
buildscript {
44
repositories {
55
google()
6-
jcenter()
76
mavenCentral()
87
}
98
dependencies {
109
classpath(Dependencies.androidGradlePlugin)
1110
classpath(Dependencies.Kotlin.gradlePlugin)
1211
classpath(Dependencies.Navigation.safeArgs)
13-
classpath(Dependencies.androidMaven)
1412
// NOTE: Do not place your application dependencies here; they belong
1513
// in the individual module build.gradle files
1614
}
@@ -19,8 +17,7 @@ buildscript {
1917
allprojects {
2018
repositories {
2119
google()
22-
jcenter()
23-
20+
mavenCentral()
2421
}
2522
}
2623

buildSrc/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
repositories {
22
mavenCentral()
33
google()
4-
jcenter()
54
}
65

76
plugins {
@@ -19,10 +18,10 @@ plugins {
1918

2019
dependencies {
2120
// Depend on the android gradle plugin, since we want to access it in our plugin
22-
implementation("com.android.tools.build:gradle:4.2.2")
21+
implementation("com.android.tools.build:gradle:7.0.2")
2322

2423
// Depend on the kotlin plugin, since we want to access it in our plugin
25-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
24+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30")
2625

2726
// Depend on the default Gradle API since we want to build a custom plugin
2827
implementation(gradleApi())

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ object Dependencies {
88

99
const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradle}"
1010
const val material = "com.google.android.material:material:${Versions.material}"
11-
const val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${Versions.androidMaven}"
1211

1312
const val rxJava = "io.reactivex.rxjava2:rxjava:${Versions.rxJava}"
1413
const val rxAndroid = "io.reactivex.rxjava2:rxandroid:${Versions.rxAndroid}"
@@ -41,9 +40,8 @@ object Dependencies {
4140
}
4241

4342
object Koin {
44-
const val android = "org.koin:koin-android:${Versions.koin}"
45-
const val viewModel = "org.koin:koin-androidx-viewmodel:${Versions.koin}"
46-
const val test = "org.koin:koin-test:${Versions.koin}"
43+
const val android = "io.insert-koin:koin-android:${Versions.koin}"
44+
const val test = "io.insert-koin:koin-test:${Versions.koin}"
4745
}
4846

4947
object Retrofit {
@@ -108,7 +106,6 @@ fun Project.importCommonDependencies() {
108106
implementation(Dependencies.material)
109107

110108
implementation(Dependencies.Koin.android)
111-
implementation(Dependencies.Koin.viewModel)
112109

113110
implementation(Dependencies.Logging.logger)
114111
implementation(Dependencies.Logging.timber)

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
object Versions {
2-
const val kotlin = "1.3.72"
3-
const val androidGradle = "4.0.0"
4-
const val material = "1.0.0"
2+
const val kotlin = "1.5.30"
3+
const val androidGradle = "7.0.2"
4+
const val material = "1.4.0"
55
const val rxJava = "2.2.19"
66
const val rxAndroid = "2.1.1"
77
const val gson = "2.8.6"
8-
const val okhttp = "4.7.2"
8+
const val okhttp = "4.9.0"
99
const val retrofit = "2.9.0"
10-
const val koin = "2.1.5"
11-
const val timber = "4.7.1"
10+
const val koin = "3.1.2"
11+
const val timber = "5.0.1"
1212
const val logger = "2.2.0"
1313
const val epoxy = "3.11.0"
14-
const val androidMaven = "2.1"
1514

1615
// Test frameworks
1716
const val junit = "4.12"
@@ -24,9 +23,9 @@ object Versions {
2423
}
2524

2625
object AndroidX {
27-
const val appCompat = "1.1.0"
26+
const val appCompat = "1.3.1"
2827
const val core = "1.3.0"
29-
const val constraintLayout = "1.1.3"
28+
const val constraintLayout = "2.1.0"
3029
}
3130

3231
object App {
@@ -37,9 +36,9 @@ object Versions {
3736
}
3837

3938
object ArchitectureComponents {
40-
const val lifecycle = "2.1.0"
39+
const val lifecycle = "2.3.1"
4140
const val paging = "2.1.2"
42-
const val room = "2.2.5"
41+
const val room = "2.3.0"
4342
const val navigation = "2.3.0"
4443
}
4544

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

jitpack.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
jdk: openjdk11

0 commit comments

Comments
 (0)