Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ dependencies {
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.lifecycle.viewmodel.ktx)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.compose.material.icons.extended)

implementation(libs.compose.ui.tooling)
implementation(libs.compose.ui.tooling.preview)
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ org.gradle.jvmargs=-Xmx1536m
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
#android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.nonTransitiveRClass=false
android.nonFinalResIds=false

org.gradle.configuration-cache=true
21 changes: 10 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[versions]
accompanist-permissions = "0.37.3"
android-gradle-plugin = "8.13.0"
androidx-activity = "1.9.1"
androidx-datastore = "1.1.1"
androidx-lifecycle = "2.8.4"
androidx-test-ext = "1.2.1"
androidx-activity = "1.11.0"
androidx-datastore = "1.1.7"
androidx-lifecycle = "2.9.4"
androidx-test-ext = "1.3.0"
androidx-wear = "1.3.0"
androidx-wear-compose = "1.5.2"
compose = "1.6.8"
androidx-wear-compose = "1.5.3"
compose = "1.9.3"
compose-compiler = "1.5.15"
core-splashscreen = "1.0.1"
hilt = "2.57.2"
hilt-navigation-compose = "1.3.0"
horologist= "0.7.15"
kotlinx-coroutines-test = "1.8.1"
kotlinx-coroutines-test = "1.10.2"
ktlint = "1.5.0"
kotlin = "2.2.20"
ksp = "2.2.20-2.0.3"
tarsos = "2.5"
tiles-material = "1.4.0"
turbine = "0.12.3"
tiles-material = "1.5.0"
turbine = "1.2.1"
spotless = "8.0.0"
espresso = "3.6.1"
espresso = "3.7.0"

[libraries]
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist-permissions" }
Expand All @@ -41,7 +41,6 @@ androidx-wear = { module = "androidx.wear:wear", version.ref = "androidx-wear" }
compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
compose-material-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading