diff --git a/app/build.gradle.kts b/app/build.gradle.kts index db5ac7c8e..b6ad3e415 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,7 +30,7 @@ android { } buildConfigField("String", "RECAPTCHA_API_SITE_KEY", "\"6LfaxOgpAAAAAI3Sj4rtB2oAFjkRJILiGEt-LUsc\"") - buildConfigField ("String", "GITHUB_REPO_URL", "\"https://github.com/Infomaniak/android-SwissTransfer\"") + buildConfigField("String", "GITHUB_REPO_URL", "\"https://github.com/Infomaniak/android-SwissTransfer\"") } buildTypes { diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FilePreview.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FilePreview.kt index 61a9f7eb4..93397f41d 100644 --- a/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FilePreview.kt +++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/components/FilePreview.kt @@ -33,8 +33,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.Dp -import coil.compose.AsyncImage -import coil.request.ImageRequest +import coil3.compose.AsyncImage +import coil3.request.ImageRequest +import coil3.request.crossfade import com.infomaniak.library.filetypes.FileType import com.infomaniak.multiplatform_swisstransfer.common.interfaces.ui.FileUi import com.infomaniak.swisstransfer.ui.theme.LocalIsDarkMode diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 468b62c07..a6654d283 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] -activityCompose = "1.9.2" +activityCompose = "1.9.3" adaptiveLayout = "1.0.0" -agp = "8.6.1" -coilCompose = "2.7.0" -composeAlpha = "1.8.0-alpha02" -composeBom = "2024.09.02" -constraintlayoutCompose = "1.0.1" -coreKtx = "1.13.1" +agp = "8.7.2" +coilCompose = "3.0.2" +composeAlpha = "1.8.0-alpha05" +composeBom = "2024.10.01" +constraintlayoutCompose = "1.1.0" +coreKtx = "1.15.0" coreSplashscreen = "1.0.1" hiltAndroid = "2.52" -hiltAndroidx = "1.0.0" +hiltAndroidx = "1.2.0" hiltNavigationCompose = "1.2.0" junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.0.20" -lifecycleRuntimeKtx = "2.8.6" -navigation = "2.8.1" +lifecycleRuntimeKtx = "2.8.7" +navigation = "2.8.3" qrose = "1.0.1" recaptcha = "18.6.1" sentry = "4.12.0" -serialization = "1.7.1" +serialization = "1.7.3" swisstransfer = "0.7.2" -workmanager = "2.9.1" +workmanager = "2.10.0" [libraries] androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } @@ -32,7 +32,7 @@ androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constr androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } +coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" } compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeAlpha" } #TODO: To be removed when compose 1.8.0 is stable compose-material3 = { group = "androidx.compose.material3", name = "material3" } @@ -58,12 +58,12 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j junit = { group = "junit", name = "junit", version.ref = "junit" } [plugins] -sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } android-application = { id = "com.android.application", version.ref = "agp" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } # FileType module android-library = { id = "com.android.library", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 93a1a1ce5..40776e45b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jul 17 16:05:07 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists