Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit 626ef5b

Browse files
ianhanniballakeianhanniballake
committed
Remove dependency on legacy-support-core-utils
Test: ./run_all_tests.sh
1 parent 9c5c077 commit 626ef5b

15 files changed

Lines changed: 1 addition & 47 deletions

File tree

‎BasicRxJavaSample/app/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ dependencies {
4545
testImplementation deps.junit
4646
testImplementation deps.hamcrest
4747
testImplementation deps.arch_core.testing
48-
testImplementation deps.mockito.all
49-
50-
// Resolve conflicts between main and local unit tests
51-
testImplementation deps.annotations
52-
testImplementation deps.core_utils
48+
testImplementation deps.mockito.core
5349

5450
// Android Testing Support Library's runner and rules
5551
androidTestImplementation deps.atsl.ext_junit

‎BasicRxJavaSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎BasicRxJavaSampleKotlin/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎BasicSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎GithubBrowserSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎LiveDataSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎NavigationAdvancedSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎NavigationBasicSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎PagingSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

‎PagingWithNetworkSample/versions.gradle‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ versions.benchmark = "1.0.0"
3535
versions.cardview = "1.0.0"
3636
versions.constraint_layout = "2.0.0-alpha2"
3737
versions.core_ktx = "1.1.0"
38-
versions.core_utils = "1.0.0"
3938
versions.coroutines = "1.3.3"
4039
versions.dagger = "2.16"
4140
versions.dexmaker = "2.2.0"
@@ -105,8 +104,6 @@ deps.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.c
105104

106105
deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
107106

108-
deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
109-
110107
def coroutines = [:]
111108
coroutines.android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.coroutines"
112109
coroutines.test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutines"

0 commit comments

Comments
 (0)