From c81f9bcf63284e93742411a3966a86c7c108fb96 Mon Sep 17 00:00:00 2001 From: sebastien46 <57289288+sebastien46@users.noreply.github.com> Date: Fri, 23 Feb 2024 10:16:57 +0000 Subject: [PATCH] chore: Update Dependencies (#68) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Dependencies Signed-off-by: Sébastien Delord <57289288+sebastien46@users.noreply.github.com> * Update Github Actions * Update some more dependencies I missed * Use Static versions of Jetpack Libraries * Update Material Icon * Fix Material Icon Import --------- Signed-off-by: Sébastien Delord <57289288+sebastien46@users.noreply.github.com> --- .github/workflows/main.yml | 8 ++-- app/build.gradle.kts | 38 +++++++++---------- .../foode/ui/screens/AboutScreen.kt | 4 +- build.gradle.kts | 8 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f382fb..aa8dbe4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 @@ -35,7 +35,7 @@ jobs: - name: Build APK run: bash ./gradlew assembleReleaseGithub --stacktrace - name: Upload APK - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: release path: app/build/outputs/apk/releaseGithub/ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 46b00ff..a87c0e9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.application") kotlin("android") id("com.google.devtools.ksp") - kotlin("plugin.serialization") version "1.8.21" + kotlin("plugin.serialization") version "1.9.22" } android { @@ -63,7 +63,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.7" + kotlinCompilerExtensionVersion = "1.5.9" } packaging { resources { @@ -73,30 +73,30 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.10.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.activity:activity-compose:1.7.1") - implementation(platform("androidx.compose:compose-bom:2023.05.01")) - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.ui:ui-graphics") - implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.compose.material3:material3") + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + implementation("androidx.activity:activity-compose:1.8.2") + implementation(platform("androidx.compose:compose-bom:2024.02.00")) + implementation("androidx.compose.ui:ui:1.6.1") + implementation("androidx.compose.ui:ui-graphics:1.6.1") + implementation("androidx.compose.ui:ui-tooling-preview:1.6.1") + implementation("androidx.compose.material3:material3:1.2.0") - debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-tooling:1.6.1") - implementation("androidx.compose.material3:material3-window-size-class:1.1.0") + implementation("androidx.compose.material3:material3-window-size-class:1.2.0") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1") - implementation("androidx.navigation:navigation-compose:2.7.0-alpha01") - implementation("androidx.compose.material:material-icons-extended:1.4.3") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") + implementation("androidx.navigation:navigation-compose:2.7.7") + implementation("androidx.compose.material:material-icons-extended:1.6.1") // Coil - implementation("io.coil-kt:coil-compose:2.3.0") - implementation("io.coil-kt:coil-svg:2.3.0") + implementation("io.coil-kt:coil-compose:2.5.0") + implementation("io.coil-kt:coil-svg:2.5.0") implementation("androidx.appcompat:appcompat:1.6.1") // Room - val roomVersion = "2.5.1" + val roomVersion = "2.6.1" implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") @@ -104,7 +104,7 @@ dependencies { ksp("androidx.room:room-compiler:$roomVersion") implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") implementation("com.github.yuriy-budiyev:code-scanner:2.3.2") diff --git a/app/src/main/java/app/suhasdissa/foode/ui/screens/AboutScreen.kt b/app/src/main/java/app/suhasdissa/foode/ui/screens/AboutScreen.kt index 7cacd04..9c008ba 100644 --- a/app/src/main/java/app/suhasdissa/foode/ui/screens/AboutScreen.kt +++ b/app/src/main/java/app/suhasdissa/foode/ui/screens/AboutScreen.kt @@ -3,7 +3,7 @@ package app.suhasdissa.foode.ui.screens import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ContactSupport +import androidx.compose.material.icons.automirrored.filled.ContactSupport import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.NewReleases @@ -66,7 +66,7 @@ fun AboutScreen( "https://github.com/SuhasDissa/Food-E-App/issues" ) }, - icon = Icons.Default.ContactSupport + icon = Icons.AutoMirrored.Default.ContactSupport ) } item { diff --git a/build.gradle.kts b/build.gradle.kts index 46a54a3..34805c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.0.0" apply false - id("com.android.library") version "8.0.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.21" apply false - id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false + id("org.jetbrains.kotlin.android") version "1.9.22" apply false + id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c9b0f7a..f7c42a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists