etc/VancedManager
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedManager synced 2024-11-30 15:03:02 +00:00
Code Issues Projects Releases Wiki Activity

fixed conflicts

Browse source
This commit is contained in:
X1nto 2021-01-17 13:30:26 +04:00
commit 1d205bb4bb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core-ui/build.gradle.kts
View file

@ -44,7 +44,7 @@ dependencies {
implementation(kotlin("reflect")) implementation(kotlin("reflect"))
implementation("androidx.core:core-ktx:1.3.2") implementation("androidx.core:core-ktx:1.3.2")
implementation("androidx.appcompat:appcompat:1.2.0") implementation("androidx.appcompat:appcompat:1.2.0")
implementation("com.google.android.material:material:1.3.0-beta01") implementation("com.google.android.material:material:1.3.0-rc01")
//https://developer.android.com/jetpack/androidx/releases/lifecycle //https://developer.android.com/jetpack/androidx/releases/lifecycle
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0")

14
feature-home/build.gradle.kts
View file

@ -58,7 +58,7 @@ dependencies {
implementation("androidx.fragment:fragment-ktx:1.2.5") implementation("androidx.fragment:fragment-ktx:1.2.5")
implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0") implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0")
implementation("com.google.android.material:material:1.3.0-beta01") implementation("com.google.android.material:material:1.3.0-rc01")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.squareup.retrofit2:retrofit:2.9.0") implementation("com.squareup.retrofit2:retrofit:2.9.0")
@ -69,18 +69,18 @@ dependencies {
implementation("com.squareup.okhttp3:logging-interceptor:4.9.0") implementation("com.squareup.okhttp3:logging-interceptor:4.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
implementation("org.koin:koin-android:2.2.1") implementation("org.koin:koin-android:2.2.1")
implementation("org.koin:koin-android-viewmodel:2.2.1") implementation("org.koin:koin-android-viewmodel:2.2.1")
implementation("org.koin:koin-android-ext:2.2.1") implementation("org.koin:koin-android-ext:2.2.1")
testImplementation("io.kotest:kotest-runner-junit5:4.3.2") testImplementation("io.kotest:kotest-runner-junit5:4.4.0.RC1")
testImplementation("io.kotest:kotest-assertions-core:4.3.2") testImplementation("io.kotest:kotest-assertions-core:4.4.0.RC1")
testImplementation("io.kotest:kotest-property:4.3.2") testImplementation("io.kotest:kotest-property:4.4.0.RC1")
testImplementation("io.mockk:mockk:1.10.4") testImplementation("io.mockk:mockk:1.10.5")
androidTestImplementation("io.mockk:mockk-android:1.10.4") androidTestImplementation("io.mockk:mockk-android:1.10.5")
androidTestImplementation("androidx.test:core:1.3.0") androidTestImplementation("androidx.test:core:1.3.0")
androidTestImplementation("androidx.test:runner:1.3.0") androidTestImplementation("androidx.test:runner:1.3.0")
androidTestImplementation("androidx.test:rules:1.3.0") androidTestImplementation("androidx.test:rules:1.3.0")