diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index f2128a6293..43078e5da9 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -93,6 +93,9 @@ android { } dependencies { + val composeBom = platform(libs.androidx.compose.bom) + implementation(composeBom) + androidTestImplementation(composeBom) coreLibraryDesugaring(libs.core.jdk.desugaring) implementation(libs.kotlin.stdlib) implementation(libs.kotlinx.coroutines.android) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 9d862e93a0..4d5008b288 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -3,34 +3,30 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.25.1" -androidGradlePlugin = "7.2.2" -androidx-activity-compose = "1.5.1" -androidx-appcompat = "1.5.0" +accompanist = "0.26.5-rc" +androidGradlePlugin = "7.3.1" +androidx-activity-compose = "1.6.0" +androidx-appcompat = "1.5.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.0-beta04" +androidx-compose-bom = "2022.10.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.8.0" +androidx-corektx = "1.9.0" androidx-lifecycle-compose = "2.5.1" -androidx-lifecycle-runtime-compose = "2.6.0-alpha02" # merge with above when not alpha -androidx-navigation = "2.5.1" +androidx-lifecycle-runtime-compose = "2.6.0-alpha03" +androidx-navigation = "2.5.2" androidx-palette = "1.0.0" -androidx-test = "1.3.0" -androidx-test-espresso = "3.3.0" +androidx-test = "1.4.0" +androidx-test-espresso = "3.5.0-alpha06" # Alpha for Compose bugfix and to match upstream, https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:gradle/libs.versions.toml;l=30 androidx-test-ext-junit = "1.1.3" androidx-test-ext-truth = "1.4.0" -androidx-window = "1.1.0-alpha03" +androidx-window = "1.1.0-alpha04" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.0" # @keep compileSdk = "33" -compose = "1.3.0-rc01" -compose-compiler = "1.3.0" -# @pin to be updated manually - check JetChat tests -compose-material3 = "1.0.0-alpha15" -# @pin to be updated manually - check JetChat tests -compose-materialWindow = "1.0.0-alpha15" +compose-compiler = "1.3.2" compose-snapshot = "-" coroutines = "1.6.4" google-maps = "18.1.0" @@ -39,14 +35,14 @@ hiltExt = "1.0.0" # @pin When updating to AGP 7.3.0-beta03 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions jdkDesugar = "1.1.5" junit = "4.13.2" -kotlin = "1.7.10" +kotlin = "1.7.20" maps-compose = "2.5.3" -material = "1.7.0-beta01" +material = "1.8.0-alpha01" # @keep minSdk = "21" okhttp = "4.10.0" # @pin Bump to latest after Espresso 3.5.0 goes stable (due to https://github.com/robolectric/robolectric/issues/6593) -roboelectric = "4.5.1" +robolectric = "4.5.1" rome = "1.18.0" room = "2.5.0-alpha02" secrets = "2.0.1" @@ -65,24 +61,25 @@ androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } androidx-benchmark-macrobenchmark = { module = "androidx.benchmark:benchmark-macro", version.ref = "androidx-benchmark" } androidx-benchmark-macrobenchmark-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark-junit4" } -androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } -androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "compose" } -androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" } -androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } -androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" } -androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "compose-materialWindow" } -androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" } -androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose" } -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } -androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts", version.ref = "compose" } -androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose" } -androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" } -androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } -androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" } -androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "compose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" } +androidx-compose-animation = { module = "androidx.compose.animation:animation" } +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } +androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } +androidx-compose-material = { module = "androidx.compose.material:material" } +androidx-compose-material-iconsExtended = { module = "androidx.compose.material:material-icons-extended" } +androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +androidx-compose-materialWindow = { module = "androidx.compose.material3:material3-window-size-class" } +androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } +androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } +androidx-compose-ui = { module = "androidx.compose.ui:ui" } +androidx-compose-ui-googlefonts = { module = "androidx.compose.ui:ui-text-google-fonts" } +androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" } +androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } +androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } +androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } @@ -124,7 +121,7 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" } okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } -robolectric = { module = "org.robolectric:robolectric", version.ref = "roboelectric" } +robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" } rometools-rome = { module = "com.rometools:rome", version.ref = "rome" } secrets-gradlePlugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secrets" }