Skip to content

Commit 0882075

Browse files
mattcreasertylerjroach
mattcreaser
and
tylerjroach
authored
chore: Move to versions toml and remove some unneeded dependencies (#2556)
Co-authored-by: Tyler Roach <[email protected]>
1 parent c6534e7 commit 0882075

File tree

27 files changed

+364
-393
lines changed

27 files changed

+364
-393
lines changed

‎annotations/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
}
3131

3232
dependencies {
33-
implementation(dependency.kotlin.stdlib)
33+
implementation(libs.kotlin.stdlib)
3434
}
3535

3636
afterEvaluate {

‎aws-analytics-pinpoint/build.gradle.kts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ dependencies {
2929
implementation(project(":aws-core"))
3030
implementation(project(":aws-pinpoint-core"))
3131

32-
implementation(dependency.androidx.appcompat)
33-
implementation(dependency.aws.pinpoint)
34-
implementation(dependency.kotlin.serializationJson)
32+
implementation(libs.androidx.appcompat)
33+
implementation(libs.aws.pinpoint)
34+
implementation(libs.kotlin.serializationJson)
3535

36-
testImplementation(testDependency.junit)
37-
testImplementation(testDependency.mockk)
38-
testImplementation(testDependency.mockito)
39-
testImplementation(testDependency.mockitoinline)
40-
testImplementation(testDependency.robolectric)
41-
testImplementation(testDependency.androidx.test.junit)
42-
testImplementation(testDependency.androidx.test.core)
43-
testImplementation(testDependency.kotlin.test.coroutines)
36+
testImplementation(libs.test.junit)
37+
testImplementation(libs.test.mockk)
38+
testImplementation(libs.test.mockito.core)
39+
testImplementation(libs.test.mockito.inline)
40+
testImplementation(libs.test.robolectric)
41+
testImplementation(libs.test.androidx.junit)
42+
testImplementation(libs.test.androidx.core)
43+
testImplementation(libs.test.kotlin.coroutines)
4444
testImplementation(project(":aws-analytics-pinpoint"))
4545

4646
androidTestImplementation(project(":testutils"))
47-
androidTestImplementation(testDependency.androidx.test.core)
47+
androidTestImplementation(libs.test.androidx.core)
4848
androidTestImplementation(project(":aws-auth-cognito"))
49-
androidTestImplementation(testDependency.androidx.test.runner)
50-
androidTestImplementation(testDependency.kotlin.test.coroutines)
51-
androidTestImplementation(testDependency.androidx.test.junit)
49+
androidTestImplementation(libs.test.androidx.runner)
50+
androidTestImplementation(libs.test.kotlin.coroutines)
51+
androidTestImplementation(libs.test.androidx.junit)
5252
androidTestImplementation(project(":aws-analytics-pinpoint"))
5353
}

‎aws-api-appsync/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ dependencies {
2727
implementation(project(":core"))
2828
implementation(project(":aws-core"))
2929

30-
implementation(dependency.androidx.annotation)
31-
implementation(dependency.androidx.core)
32-
implementation(dependency.gson)
30+
implementation(libs.androidx.annotation)
31+
implementation(libs.androidx.core)
32+
implementation(libs.gson)
3333

34-
testImplementation(testDependency.junit)
35-
testImplementation(testDependency.robolectric)
36-
testImplementation(testDependency.jsonassert)
34+
testImplementation(libs.test.junit)
35+
testImplementation(libs.test.robolectric)
36+
testImplementation(libs.test.jsonassert)
3737
testImplementation(project(":testmodels"))
3838
testImplementation(project(":testutils"))
3939
}

‎aws-api/build.gradle.kts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@ dependencies {
2828
api(project(":aws-core"))
2929
implementation(project(":aws-api-appsync"))
3030

31-
implementation(dependency.androidx.appcompat)
32-
implementation(dependency.aws.signing)
33-
implementation(dependency.gson)
34-
implementation(dependency.okhttp)
31+
implementation(libs.androidx.appcompat)
32+
implementation(libs.aws.signing)
33+
implementation(libs.gson)
34+
implementation(libs.okhttp)
3535

3636
testImplementation(project(":testutils"))
3737
testImplementation(project(":testmodels"))
38-
testImplementation(testDependency.androidx.test.core)
39-
testImplementation(testDependency.jsonassert)
40-
testImplementation(testDependency.junit)
41-
testImplementation(testDependency.mockito)
42-
testImplementation(testDependency.mockwebserver)
43-
testImplementation(dependency.rxjava)
44-
testImplementation(testDependency.robolectric)
38+
testImplementation(libs.test.androidx.core)
39+
testImplementation(libs.test.jsonassert)
40+
testImplementation(libs.test.junit)
41+
testImplementation(libs.test.mockito.core)
42+
testImplementation(libs.test.mockwebserver)
43+
testImplementation(libs.rxjava)
44+
testImplementation(libs.test.robolectric)
4545

4646
androidTestImplementation(project(":testutils"))
4747
androidTestImplementation(project(":testmodels"))
48-
androidTestImplementation(testDependency.androidx.test.core)
48+
androidTestImplementation(libs.test.androidx.core)
4949
androidTestImplementation(project(":aws-auth-cognito"))
50-
androidTestImplementation(testDependency.androidx.test.runner)
51-
androidTestImplementation(testDependency.androidx.test.junit)
52-
androidTestImplementation(dependency.rxjava)
50+
androidTestImplementation(libs.test.androidx.runner)
51+
androidTestImplementation(libs.test.androidx.junit)
52+
androidTestImplementation(libs.rxjava)
5353
}

‎aws-auth-cognito/build.gradle.kts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,38 @@ dependencies {
2828
implementation(project(":core"))
2929
implementation(project(":aws-core"))
3030
implementation(project(":aws-auth-plugins-core"))
31-
implementation(dependency.kotlin.coroutines)
32-
implementation(dependency.kotlin.serializationJson)
33-
implementation(dependency.androidx.appcompat)
34-
implementation(dependency.androidx.security)
35-
implementation(dependency.androidx.browser)
31+
implementation(libs.kotlin.coroutines)
32+
implementation(libs.kotlin.serializationJson)
33+
implementation(libs.androidx.appcompat)
34+
implementation(libs.androidx.security)
35+
implementation(libs.androidx.browser)
3636

37-
implementation(dependency.aws.http)
38-
implementation(dependency.aws.cognitoidentity)
39-
implementation(dependency.aws.cognitoidentityprovider)
37+
implementation(libs.aws.http)
38+
implementation(libs.aws.cognitoidentity)
39+
implementation(libs.aws.cognitoidentityprovider)
4040

4141
testImplementation(project(":testutils"))
4242
//noinspection GradleDependency
43-
testImplementation(testDependency.json)
43+
testImplementation(libs.test.json)
4444

45-
testImplementation(testDependency.kotlin.test.junit)
46-
testImplementation(testDependency.kotlin.test.kotlinTest)
47-
testImplementation(testDependency.kotlin.test.coroutines)
45+
testImplementation(libs.test.kotlin.junit)
46+
testImplementation(libs.test.kotlin.kotlinTest)
47+
testImplementation(libs.test.kotlin.coroutines)
4848

49-
testImplementation(dependency.gson)
50-
testImplementation(testDependency.junit)
51-
testImplementation(testDependency.mockito)
52-
testImplementation(testDependency.mockk)
53-
testImplementation(testDependency.robolectric)
54-
testImplementation(testDependency.androidx.test.core)
55-
testImplementation(testDependency.kotlin.reflection)
49+
testImplementation(libs.gson)
50+
testImplementation(libs.test.junit)
51+
testImplementation(libs.test.mockito.core)
52+
testImplementation(libs.test.mockk)
53+
testImplementation(libs.test.robolectric)
54+
testImplementation(libs.test.androidx.core)
55+
testImplementation(libs.test.kotlin.reflection)
5656

57-
androidTestImplementation(dependency.gson)
57+
androidTestImplementation(libs.gson)
5858
//noinspection GradleDependency
59-
androidTestImplementation(testDependency.aws.sdk.core)
60-
androidTestImplementation(testDependency.androidx.test.runner)
61-
androidTestImplementation(testDependency.androidx.test.junit)
62-
androidTestImplementation(testDependency.kotlin.test.coroutines)
59+
androidTestImplementation(libs.test.aws.sdk.core)
60+
androidTestImplementation(libs.test.androidx.runner)
61+
androidTestImplementation(libs.test.androidx.junit)
62+
androidTestImplementation(libs.test.kotlin.coroutines)
6363
androidTestImplementation(project(":aws-api"))
6464
androidTestImplementation(project(":testutils"))
6565
}

‎aws-auth-plugins-core/build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ dependencies {
2828
implementation(project(":core"))
2929
implementation(project(":aws-core"))
3030

31-
implementation(dependency.aws.http)
32-
implementation(dependency.aws.credentials)
33-
implementation(dependency.aws.cognitoidentity)
31+
implementation(libs.aws.http)
32+
implementation(libs.aws.credentials)
33+
implementation(libs.aws.cognitoidentity)
3434

35-
implementation(dependency.kotlin.serializationJson)
35+
implementation(libs.kotlin.serializationJson)
3636

37-
testImplementation(testDependency.junit)
38-
testImplementation(testDependency.mockk)
39-
testImplementation(testDependency.kotlin.test.junit)
40-
testImplementation(testDependency.kotlin.test.coroutines)
37+
testImplementation(libs.test.junit)
38+
testImplementation(libs.test.mockk)
39+
testImplementation(libs.test.kotlin.junit)
40+
testImplementation(libs.test.kotlin.coroutines)
4141
}

‎aws-core/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ android {
3131

3232
dependencies {
3333
implementation(project(":core"))
34-
implementation(dependency.kotlin.stdlib)
35-
implementation(dependency.kotlin.coroutines)
34+
implementation(libs.kotlin.stdlib)
35+
implementation(libs.kotlin.coroutines)
3636

37-
implementation(dependency.aws.credentials)
37+
implementation(libs.aws.credentials)
3838
// slf4j dependency is added to fix https://github.com/awslabs/aws-sdk-kotlin/issues/993#issuecomment-1678885524
39-
implementation(dependency.slf4j)
39+
implementation(libs.slf4j)
4040
}
4141

4242
afterEvaluate {

‎aws-datastore/build.gradle.kts‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,33 @@ dependencies {
2828
implementation(project(":aws-core"))
2929
implementation(project(":aws-api-appsync"))
3030

31-
implementation(dependency.androidx.appcompat)
32-
implementation(dependency.gson)
33-
implementation(dependency.rxjava)
34-
implementation(dependency.rxandroid)
35-
implementation(dependency.uuidgen)
31+
implementation(libs.androidx.appcompat)
32+
implementation(libs.gson)
33+
implementation(libs.rxjava)
34+
implementation(libs.uuidgen)
3635

3736
testImplementation(project(":testmodels"))
3837
testImplementation(project(":testutils"))
39-
testImplementation(testDependency.jsonassert)
40-
testImplementation(testDependency.junit)
41-
testImplementation(testDependency.mockito)
42-
testImplementation(testDependency.robolectric)
43-
testImplementation(testDependency.androidx.test.core)
44-
testImplementation(testDependency.mockk)
45-
46-
androidTestImplementation(testDependency.mockito)
38+
testImplementation(libs.test.jsonassert)
39+
testImplementation(libs.test.junit)
40+
testImplementation(libs.test.mockito.core)
41+
testImplementation(libs.test.robolectric)
42+
testImplementation(libs.test.androidx.core)
43+
testImplementation(libs.test.mockk)
44+
45+
androidTestImplementation(libs.test.mockito.core)
4746
androidTestImplementation(project(":testmodels"))
4847
androidTestImplementation(project(":testutils"))
4948
androidTestImplementation(project(":aws-api"))
5049
androidTestImplementation(project(":aws-datastore"))
51-
androidTestImplementation(dependency.androidx.annotation)
52-
androidTestImplementation(testDependency.androidx.test.core)
53-
androidTestImplementation(testDependency.androidx.test.runner)
54-
androidTestImplementation(testDependency.androidx.test.junit)
50+
androidTestImplementation(libs.androidx.annotation)
51+
androidTestImplementation(libs.test.androidx.core)
52+
androidTestImplementation(libs.test.androidx.runner)
53+
androidTestImplementation(libs.test.androidx.junit)
5554
androidTestImplementation(project(":aws-auth-cognito"))
56-
androidTestImplementation(dependency.rxjava)
57-
androidTestImplementation(dependency.okhttp)
58-
androidTestImplementation(dependency.oauth2)
55+
androidTestImplementation(libs.rxjava)
56+
androidTestImplementation(libs.okhttp)
57+
androidTestImplementation(libs.oauth2)
5958
}
6059

6160
afterEvaluate {

‎aws-datastore/src/main/java/com/amplifyframework/datastore/syncengine/SchedulerProvider.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*/
1515
package com.amplifyframework.datastore.syncengine
1616

17-
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
1817
import io.reactivex.rxjava3.core.Scheduler
1918
import io.reactivex.rxjava3.schedulers.Schedulers
2019

@@ -24,11 +23,9 @@ import io.reactivex.rxjava3.schedulers.Schedulers
2423
interface SchedulerProvider {
2524
fun io(): Scheduler
2625
fun computation(): Scheduler
27-
fun ui(): Scheduler
2826
}
2927

3028
class ProdSchedulerProvider : SchedulerProvider {
3129
override fun computation() = Schedulers.computation()
32-
override fun ui() = AndroidSchedulers.mainThread()
3330
override fun io() = Schedulers.io()
3431
}

‎aws-datastore/src/test/java/com/amplifyframework/datastore/syncengine/TestSchedulerProvider.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
package com.amplifyframework.datastore.syncengine
22

3-
import io.reactivex.rxjava3.schedulers.Schedulers
43
import io.reactivex.rxjava3.schedulers.TestScheduler
54

6-
class TrampolineSchedulerProvider : SchedulerProvider {
7-
override fun computation() = Schedulers.trampoline()
8-
override fun ui() = Schedulers.trampoline()
9-
override fun io() = Schedulers.trampoline()
10-
}
11-
125
class TestSchedulerProvider(private val scheduler: TestScheduler) : SchedulerProvider {
136
override fun computation() = scheduler
14-
override fun ui() = scheduler
157
override fun io() = scheduler
168
}

0 commit comments

Comments
 (0)