Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/github_actions/dawidd6/action-…
Browse files Browse the repository at this point in the history
…download-artifact-7
  • Loading branch information
vitorhugods authored Dec 4, 2024
2 parents f92db5f + 674bc9e commit 1b4c270
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private val LightWireColorScheme = WireColorScheme(
primaryVariant = WireColorPalette.LightBlue50, onPrimaryVariant = WireColorPalette.LightBlue500,
inversePrimary = WireColorPalette.DarkBlue500,
error = WireColorPalette.LightRed500, onError = Color.White,
errorVariant = WireColorPalette.LightRed200, onErrorVariant = WireColorPalette.LightRed500,
errorVariant = WireColorPalette.LightRed50, onErrorVariant = WireColorPalette.LightRed500,
warning = WireColorPalette.LightAmber500, onWarning = Color.White,
highlight = WireColorPalette.DarkAmber200, onHighlight = Color.Black,
positive = WireColorPalette.LightGreen500, onPositive = Color.White,
Expand Down
38 changes: 19 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ grgitCore = "5.2.2"
kotlin = "1.9.23"

# KotlinX
coroutines = "1.8.0"
coroutines = "1.9.0"
ktx-dateTime = "0.5.0"
ktx-immutableCollections = "0.3.8"
ktx-serialization = "1.6.3"
Expand All @@ -19,7 +19,7 @@ google-gms = "4.4.2"
gms-location = "21.3.0"
android-gradlePlugin = "8.5.2"
desugaring = "2.1.3"
firebaseBOM = "33.4.0"
firebaseBOM = "33.6.0"
fragment = "1.5.6"
resaca = "3.0.0"
bundlizer = "0.8.0"
Expand All @@ -34,25 +34,25 @@ androidx-dataStore = "1.1.1"
androidx-exif = "1.3.7"
androidx-emoji = "1.5.0"
androidx-jetpack = "1.1.0"
androidx-lifecycle = "2.8.5"
androidx-paging3 = "3.3.2"
androidx-paging3Compose = "3.3.2"
androidx-lifecycle = "2.8.7"
androidx-paging3 = "3.3.4"
androidx-paging3Compose = "3.3.4"
androidx-splashscreen = "1.0.1"
androidx-workManager = "2.9.1"
androidx-browser = "1.8.0"
androidx-biometric = "1.1.0"
androidx-startup = "1.1.1"
androidx-compose-runtime = "1.7.1"
androidx-startup = "1.2.0"
androidx-compose-runtime = "1.7.2"
compose-qr = "1.0.1"

# Compose
composeBom = "2024.10.00"
composeBom = "2024.11.00"
compose-activity = "1.9.3"
compose-compiler = "1.5.13"
compose-constraint = "1.0.1"
compose-constraint = "1.1.0"
compose-navigation = "2.7.7" # adjusted to work with compose-destinations "1.9.54"
compose-destinations = "1.10.2"
screenshot = "0.0.1-alpha07"
screenshot = "0.0.1-alpha08"

# Hilt
hilt = "2.51.1"
Expand Down Expand Up @@ -87,16 +87,16 @@ leakCanary = "2.14"
ksp = "1.9.23-1.0.20"

# Benchmark
benchmark-macro-junit4 = "1.3.0"
profileinstaller = "1.3.1"
benchmark-macro-junit4 = "1.3.3"
profileinstaller = "1.4.1"

# Testing
androidx-espresso = "3.5.1"
androidx-test-core = "1.5.0"
androidx-test-extensions = "1.1.5"
androidx-test-orchestrator = "1.4.2"
androidx-test-rules = "1.5.0"
androidx-test-runner = "1.5.2"
androidx-espresso = "3.6.1"
androidx-test-core = "1.6.1"
androidx-test-extensions = "1.2.1"
androidx-test-orchestrator = "1.5.1"
androidx-test-rules = "1.6.1"
androidx-test-runner = "1.6.2"
androidx-test-uiAutomator = "2.3.0"
androidx-text-archCore = "2.2.0"
junit4 = "4.13.2"
Expand All @@ -105,7 +105,7 @@ kluent = "1.73"
mockk = "1.13.10"
okio = "3.9.0"
turbine = "1.2.0"
robolectric = "4.12.1"
robolectric = "4.12.2"
hamcrest = "3.0"

[plugins]
Expand Down

0 comments on commit 1b4c270

Please sign in to comment.