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

Commit b3b4572

Browse files
committed
chore: deps ordering
1 parent aa45aea commit b3b4572

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

buildSrc/src/main/java/Libs.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ object Libs {
1919
const val ACTIVITY_KTX = "androidx.activity:activity-ktx"
2020
const val APPCOMPAT = "androidx.appcompat:appcompat"
2121
const val APP_STARTUP = "androidx.startup:startup-runtime"
22-
const val PROFILE_INSTALLER = "androidx.profileinstaller:profileinstaller"
2322
const val ARCH_TESTING = "androidx.arch.core:core-testing"
2423
const val ARCORE = "com.google.ar:core"
2524
const val BENCHMARK = "androidx.benchmark:benchmark-junit4"
@@ -79,6 +78,7 @@ object Libs {
7978
const val OKHTTP = "com.squareup.okhttp3:okhttp"
8079
const val OKHTTP_LOGGING_INTERCEPTOR = "com.squareup.okhttp3:logging-interceptor"
8180
const val OKIO = "com.squareup.okio:okio"
81+
const val PROFILE_INSTALLER = "androidx.profileinstaller:profileinstaller"
8282
const val ROOM_COMPILER = "androidx.room:room-compiler"
8383
const val ROOM_KTX = "androidx.room:room-ktx"
8484
const val ROOM_RUNTIME = "androidx.room:room-runtime"
@@ -88,7 +88,7 @@ object Libs {
8888
const val THREETENABP = "com.jakewharton.threetenabp:threetenabp"
8989
const val THREETENBP = "org.threeten:threetenbp"
9090
const val TIMBER = "com.jakewharton.timber:timber"
91+
const val UI_AUTOMATOR = "androidx.test.uiautomator:uiautomator"
9192
const val VIEWMODEL_COMPOSE = "androidx.lifecycle:lifecycle-viewmodel-compose"
9293
const val VIEWPAGER2 = "androidx.viewpager2:viewpager2"
93-
const val UI_AUTOMATOR = "androidx.test.uiautomator:uiautomator"
9494
}

buildSrc/src/main/java/Versions.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ object Versions {
2323
const val TARGET_SDK = 30
2424
const val MIN_SDK = 21
2525

26-
const val ANDROID_GRADLE_PLUGIN = "7.1.2"
26+
const val ANDROID_GRADLE_PLUGIN = "7.2.0"
2727
const val BENCHMARK = "1.1.0-rc01"
28-
const val PROFILE_INSTALLER = "1.2.0-alpha02"
2928
const val COMPOSE = "1.1.1"
3029
const val FIREBASE_CRASHLYTICS = "2.3.0"
3130
const val GOOGLE_SERVICES = "4.3.3"
31+
const val HILT_AGP = "2.40.5"
3232
const val KOTLIN = "1.6.10"
3333
const val NAVIGATION = "2.4.1"
34-
const val HILT_AGP = "2.40.5"
34+
const val PROFILE_INSTALLER = "1.2.0-alpha02"
3535

3636
// TODO: Remove this once the version for
3737
// "org.threeten:threetenbp:${Versions.threetenbp}:no-tzdb" using java-platform in the

depconstraints/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ val appcompat = "1.1.0"
2323
val activity = "1.2.0-rc01"
2424
val activityCompose = "1.3.0-alpha03"
2525
val appStartup = "1.1.0-beta01"
26-
val profileInstaller = Versions.PROFILE_INSTALLER
2726
val cardview = "1.0.0"
2827
val archTesting = "2.0.0"
2928
val arcore = "1.7.0"
@@ -65,6 +64,7 @@ val okhttp = "3.10.0"
6564
val okio = "1.14.0"
6665
val pageIndicator = "1.3.0"
6766
val playCore = "1.6.5"
67+
val profileInstaller = Versions.PROFILE_INSTALLER
6868
val room = "2.4.2"
6969
val rules = "1.1.1"
7070
val runner = "1.2.0"
@@ -81,7 +81,6 @@ dependencies {
8181
api("${Libs.ACTIVITY_KTX}:$activity")
8282
api("${Libs.APPCOMPAT}:$appcompat")
8383
api("${Libs.APP_STARTUP}:$appStartup")
84-
api("${Libs.PROFILE_INSTALLER}:$profileInstaller")
8584
api("${Libs.CARDVIEW}:$cardview")
8685
api("${Libs.ARCH_TESTING}:$archTesting")
8786
api("${Libs.ARCORE}:$arcore")
@@ -137,6 +136,7 @@ dependencies {
137136
api("${Libs.MOCKITO_KOTLIN}:$mockitoKotlin")
138137
api("${Libs.NAVIGATION_FRAGMENT_KTX}:${Versions.NAVIGATION}")
139138
api("${Libs.NAVIGATION_UI_KTX}:${Versions.NAVIGATION}")
139+
api("${Libs.PROFILE_INSTALLER}:$profileInstaller")
140140
api("${Libs.ROOM_KTX}:$room")
141141
api("${Libs.ROOM_RUNTIME}:$room")
142142
api("${Libs.ROOM_COMPILER}:$room")
@@ -150,9 +150,9 @@ dependencies {
150150
api("${Libs.THREETENABP}:$threetenabp")
151151
api("${Libs.THREETENBP}:${Versions.THREETENBP}")
152152
api("${Libs.TIMBER}:$timber")
153+
api("${Libs.UI_AUTOMATOR}:$uiAutomator")
153154
api("${Libs.VIEWPAGER2}:$viewpager2")
154155
api("${Libs.VIEWMODEL_COMPOSE}:$viewModelCompose")
155-
api("${Libs.UI_AUTOMATOR}:$uiAutomator")
156156
}
157157
}
158158

0 commit comments

Comments
 (0)