Skip to content

Commit

Permalink
Upgrading deps and gradle to 8.4 (#1271)
Browse files Browse the repository at this point in the history
  • Loading branch information
dessalines authored Nov 2, 2023
1 parent 4e89bbd commit d54e1fa
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 23 deletions.
36 changes: 18 additions & 18 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ dependencies {
implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")

// LiveData
implementation("androidx.compose.runtime:runtime-livedata:1.5.3")
implementation("androidx.compose.runtime:runtime-livedata:1.5.4")
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")

// Images
implementation("io.coil-kt:coil-compose:2.4.0")
implementation("io.coil-kt:coil-gif:2.4.0")
implementation("io.coil-kt:coil-svg:2.4.0")
implementation("io.coil-kt:coil-compose:2.5.0")
implementation("io.coil-kt:coil-gif:2.5.0")
implementation("io.coil-kt:coil-svg:2.5.0")
// Allows for proper subsampling of large images
implementation("me.saket.telephoto:zoomable-image-coil:0.7.0-20230922.054002-2")
// Animated dropdowns
Expand All @@ -139,40 +139,40 @@ dependencies {
implementation("com.github.FunkyMuse:Crashy:1.2.0")

// To use Kotlin annotation processing tool
ksp("androidx.room:room-compiler:2.5.2")
ksp("androidx.room:room-compiler:2.6.0")

implementation("androidx.room:room-runtime:2.5.2")
annotationProcessor("androidx.room:room-compiler:2.5.2")
implementation("androidx.room:room-runtime:2.6.0")
annotationProcessor("androidx.room:room-compiler:2.6.0")

// optional - Kotlin Extensions and Coroutines support for Room
implementation("androidx.room:room-ktx:2.5.2")
implementation("androidx.room:room-ktx:2.6.0")

// optional - Test helpers
testImplementation("androidx.room:room-testing:2.5.2")
testImplementation("androidx.room:room-testing:2.6.0")
testImplementation("pl.pragmatists:JUnitParams:1.1.1")
androidTestImplementation("androidx.room:room-testing:2.5.2")
androidTestImplementation("androidx.room:room-testing:2.6.0")

// optional - Paging 3 Integration
implementation("androidx.room:room-paging:2.5.2")
implementation("androidx.room:room-paging:2.6.0")

implementation("io.arrow-kt:arrow-core:1.2.1")
// Unfortunately, ui tooling, and the markdown thing, still brings in the other material2 dependencies
implementation("androidx.compose.material3:material3:1.1.2")
implementation("androidx.compose.material3:material3-window-size-class:1.1.2")

implementation("org.ocpsoft.prettytime:prettytime:5.0.6.Final")
implementation("androidx.navigation:navigation-compose:2.7.4")
implementation("androidx.navigation:navigation-compose:2.7.5")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
testImplementation("androidx.arch.core:core-testing:2.2.0")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")

implementation("androidx.compose.ui:ui:1.5.3")
implementation("androidx.compose.ui:ui-tooling-preview:1.5.3")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.3")
debugImplementation("androidx.compose.ui:ui-tooling:1.5.3")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.5.3")
implementation("androidx.compose.material:material-icons-extended:1.5.3")
implementation("androidx.compose.ui:ui:1.5.4")
implementation("androidx.compose.ui:ui-tooling-preview:1.5.4")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.4")
debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.5.4")
implementation("androidx.compose.material:material-icons-extended:1.5.4")

implementation("androidx.activity:activity-compose:1.8.0")
testImplementation("junit:junit:4.13.2")
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ baselineProfile {
dependencies {
implementation("androidx.test.ext:junit:1.1.5")
implementation("androidx.test.espresso:espresso-core:3.5.1")
implementation("androidx.test.uiautomator:uiautomator:2.3.0-alpha04")
implementation("androidx.benchmark:benchmark-macro-junit4:1.2.0-rc02")
implementation("androidx.test.uiautomator:uiautomator:2.3.0-alpha05")
implementation("androidx.benchmark:benchmark-macro-junit4:1.2.0")
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down

0 comments on commit d54e1fa

Please sign in to comment.