diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index 0fb728e95..dad199547 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -9,20 +9,20 @@ androidx.appcompat:appcompat:1.7.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 -androidx.browser:browser:1.8.0 +androidx.browser:browser:1.9.0 androidx.collection:collection-jvm:1.5.0 androidx.collection:collection-ktx:1.5.0 androidx.collection:collection:1.5.0 -androidx.compose.animation:animation-android:1.10.0-beta02 -androidx.compose.animation:animation-core-android:1.10.0-beta02 -androidx.compose.animation:animation-core:1.10.0-beta02 -androidx.compose.animation:animation-graphics-android:1.10.0-beta02 -androidx.compose.animation:animation-graphics:1.10.0-beta02 -androidx.compose.animation:animation:1.10.0-beta02 -androidx.compose.foundation:foundation-android:1.10.0-beta02 -androidx.compose.foundation:foundation-layout-android:1.10.0-beta02 -androidx.compose.foundation:foundation-layout:1.10.0-beta02 -androidx.compose.foundation:foundation:1.10.0-beta02 +androidx.compose.animation:animation-android:1.10.0 +androidx.compose.animation:animation-core-android:1.10.0 +androidx.compose.animation:animation-core:1.10.0 +androidx.compose.animation:animation-graphics-android:1.10.0 +androidx.compose.animation:animation-graphics:1.10.0 +androidx.compose.animation:animation:1.10.0 +androidx.compose.foundation:foundation-android:1.10.0 +androidx.compose.foundation:foundation-layout-android:1.10.0 +androidx.compose.foundation:foundation-layout:1.10.0 +androidx.compose.foundation:foundation:1.10.0 androidx.compose.material3.adaptive:adaptive-android:1.3.0-alpha05 androidx.compose.material3.adaptive:adaptive-layout-android:1.3.0-alpha05 androidx.compose.material3.adaptive:adaptive-layout:1.3.0-alpha05 @@ -31,41 +31,41 @@ androidx.compose.material3.adaptive:adaptive-navigation3-android:1.3.0-alpha05 androidx.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha05 androidx.compose.material3.adaptive:adaptive-navigation:1.3.0-alpha05 androidx.compose.material3.adaptive:adaptive:1.3.0-alpha05 -androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1 -androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1 -androidx.compose.material3:material3-android:1.3.1 -androidx.compose.material3:material3:1.3.1 -androidx.compose.material:material-android:1.7.8 +androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0 +androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0 +androidx.compose.material3:material3-android:1.4.0 +androidx.compose.material3:material3:1.4.0 +androidx.compose.material:material-android:1.10.0 androidx.compose.material:material-icons-core-android:1.7.8 androidx.compose.material:material-icons-core:1.7.8 androidx.compose.material:material-icons-extended-android:1.7.8 androidx.compose.material:material-icons-extended:1.7.8 -androidx.compose.material:material-ripple-android:1.7.8 -androidx.compose.material:material-ripple:1.7.8 -androidx.compose.material:material:1.7.8 -androidx.compose.runtime:runtime-android:1.10.0-beta02 -androidx.compose.runtime:runtime-annotation-android:1.10.0-beta02 -androidx.compose.runtime:runtime-annotation:1.10.0-beta02 -androidx.compose.runtime:runtime-retain-android:1.10.0-beta02 -androidx.compose.runtime:runtime-retain:1.10.0-beta02 -androidx.compose.runtime:runtime-saveable-android:1.10.0-beta02 -androidx.compose.runtime:runtime-saveable:1.10.0-beta02 -androidx.compose.runtime:runtime:1.10.0-beta02 -androidx.compose.ui:ui-android:1.10.0-beta02 -androidx.compose.ui:ui-geometry-android:1.10.0-beta02 -androidx.compose.ui:ui-geometry:1.10.0-beta02 -androidx.compose.ui:ui-graphics-android:1.10.0-beta02 -androidx.compose.ui:ui-graphics:1.10.0-beta02 -androidx.compose.ui:ui-text-android:1.10.0-beta02 -androidx.compose.ui:ui-text:1.10.0-beta02 -androidx.compose.ui:ui-tooling-preview-android:1.10.0-beta02 -androidx.compose.ui:ui-tooling-preview:1.10.0-beta02 -androidx.compose.ui:ui-unit-android:1.10.0-beta02 -androidx.compose.ui:ui-unit:1.10.0-beta02 -androidx.compose.ui:ui-util-android:1.10.0-beta02 -androidx.compose.ui:ui-util:1.10.0-beta02 -androidx.compose.ui:ui:1.10.0-beta02 -androidx.compose:compose-bom:2025.02.00 +androidx.compose.material:material-ripple-android:1.10.0 +androidx.compose.material:material-ripple:1.10.0 +androidx.compose.material:material:1.10.0 +androidx.compose.runtime:runtime-android:1.10.0 +androidx.compose.runtime:runtime-annotation-android:1.10.0 +androidx.compose.runtime:runtime-annotation:1.10.0 +androidx.compose.runtime:runtime-retain-android:1.10.0 +androidx.compose.runtime:runtime-retain:1.10.0 +androidx.compose.runtime:runtime-saveable-android:1.10.0 +androidx.compose.runtime:runtime-saveable:1.10.0 +androidx.compose.runtime:runtime:1.10.0 +androidx.compose.ui:ui-android:1.10.0 +androidx.compose.ui:ui-geometry-android:1.10.0 +androidx.compose.ui:ui-geometry:1.10.0 +androidx.compose.ui:ui-graphics-android:1.10.0 +androidx.compose.ui:ui-graphics:1.10.0 +androidx.compose.ui:ui-text-android:1.10.0 +androidx.compose.ui:ui-text:1.10.0 +androidx.compose.ui:ui-tooling-preview-android:1.10.0 +androidx.compose.ui:ui-tooling-preview:1.10.0 +androidx.compose.ui:ui-unit-android:1.10.0 +androidx.compose.ui:ui-unit:1.10.0 +androidx.compose.ui:ui-util-android:1.10.0 +androidx.compose.ui:ui-util:1.10.0 +androidx.compose.ui:ui:1.10.0 +androidx.compose:compose-bom:2025.12.00 androidx.concurrent:concurrent-futures-ktx:1.1.0 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.17.0 @@ -74,24 +74,24 @@ androidx.core:core:1.17.0 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.0.0 -androidx.datastore:datastore-android:1.1.3 -androidx.datastore:datastore-core-android:1.1.3 -androidx.datastore:datastore-core-okio-jvm:1.1.3 -androidx.datastore:datastore-core-okio:1.1.3 -androidx.datastore:datastore-core:1.1.3 -androidx.datastore:datastore-preferences-android:1.1.3 -androidx.datastore:datastore-preferences-core-jvm:1.1.3 -androidx.datastore:datastore-preferences-core:1.1.3 -androidx.datastore:datastore-preferences-external-protobuf:1.1.3 -androidx.datastore:datastore-preferences-proto:1.1.3 -androidx.datastore:datastore-preferences:1.1.3 -androidx.datastore:datastore:1.1.3 +androidx.datastore:datastore-android:1.2.0 +androidx.datastore:datastore-core-android:1.2.0 +androidx.datastore:datastore-core-okio-jvm:1.2.0 +androidx.datastore:datastore-core-okio:1.2.0 +androidx.datastore:datastore-core:1.2.0 +androidx.datastore:datastore-preferences-android:1.2.0 +androidx.datastore:datastore-preferences-core-android:1.2.0 +androidx.datastore:datastore-preferences-core:1.2.0 +androidx.datastore:datastore-preferences-external-protobuf:1.2.0 +androidx.datastore:datastore-preferences-proto:1.2.0 +androidx.datastore:datastore-preferences:1.2.0 +androidx.datastore:datastore:1.2.0 androidx.documentfile:documentfile:1.0.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.dynamicanimation:dynamicanimation:1.0.0 androidx.emoji2:emoji2-views-helper:1.4.0 androidx.emoji2:emoji2:1.4.0 -androidx.exifinterface:exifinterface:1.3.7 +androidx.exifinterface:exifinterface:1.4.1 androidx.fragment:fragment:1.5.4 androidx.graphics:graphics-path:1.0.1 androidx.hilt:hilt-common:1.3.0 @@ -136,20 +136,20 @@ androidx.navigationevent:navigationevent:1.0.1 androidx.print:print:1.0.0 androidx.profileinstaller:profileinstaller:1.4.1 androidx.resourceinspection:resourceinspection-annotation:1.0.1 -androidx.room:room-common-jvm:2.7.0-rc01 -androidx.room:room-common:2.7.0-rc01 -androidx.room:room-ktx:2.7.0-rc01 -androidx.room:room-runtime-android:2.7.0-rc01 -androidx.room:room-runtime:2.7.0-rc01 +androidx.room:room-common-jvm:2.8.4 +androidx.room:room-common:2.8.4 +androidx.room:room-ktx:2.8.4 +androidx.room:room-runtime-android:2.8.4 +androidx.room:room-runtime:2.8.4 androidx.savedstate:savedstate-android:1.4.0 androidx.savedstate:savedstate-compose-android:1.4.0 androidx.savedstate:savedstate-compose:1.4.0 androidx.savedstate:savedstate-ktx:1.4.0 androidx.savedstate:savedstate:1.4.0 -androidx.sqlite:sqlite-android:2.5.0-rc01 -androidx.sqlite:sqlite-framework-android:2.5.0-rc01 -androidx.sqlite:sqlite-framework:2.5.0-rc01 -androidx.sqlite:sqlite:2.5.0-rc01 +androidx.sqlite:sqlite-android:2.6.2 +androidx.sqlite:sqlite-framework-android:2.6.2 +androidx.sqlite:sqlite-framework:2.6.2 +androidx.sqlite:sqlite:2.6.2 androidx.startup:startup-runtime:1.2.0 androidx.tracing:tracing-ktx:1.2.0 androidx.tracing:tracing:1.2.0 @@ -158,11 +158,11 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0 androidx.vectordrawable:vectordrawable:1.1.0 androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.viewpager:viewpager:1.0.0 -androidx.window:window-core-android:1.5.0 -androidx.window:window-core:1.5.0 -androidx.window:window:1.5.0 -androidx.work:work-runtime:2.10.0 -com.google.accompanist:accompanist-drawablepainter:0.36.0 +androidx.window:window-core-android:1.5.1 +androidx.window:window-core:1.5.1 +androidx.window:window:1.5.1 +androidx.work:work-runtime:2.11.0 +com.google.accompanist:accompanist-drawablepainter:0.37.3 com.google.code.findbugs:jsr305:3.0.2 com.google.dagger:dagger-lint-aar:2.57.2 com.google.dagger:dagger:2.57.2 @@ -171,25 +171,26 @@ com.google.dagger:hilt-core:2.57.2 com.google.guava:listenablefuture:1.0 com.jakewharton.timber:timber:5.0.1 com.squareup.okhttp3:okhttp:4.12.0 -com.squareup.okio:okio-jvm:3.10.2 -com.squareup.okio:okio:3.10.2 -com.squareup.retrofit2:converter-kotlinx-serialization:2.11.0 -com.squareup.retrofit2:retrofit:2.11.0 -com.webtoonscorp.android:readmore-foundation:1.5.6 -com.webtoonscorp.android:readmore-material:1.5.6 -io.coil-kt.coil3:coil-android:3.1.0 -io.coil-kt.coil3:coil-compose-android:3.1.0 -io.coil-kt.coil3:coil-compose-core-android:3.1.0 -io.coil-kt.coil3:coil-compose-core:3.1.0 -io.coil-kt.coil3:coil-compose:3.1.0 -io.coil-kt.coil3:coil-core-android:3.1.0 -io.coil-kt.coil3:coil-core:3.1.0 -io.coil-kt.coil3:coil-network-core-android:3.1.0 -io.coil-kt.coil3:coil-network-core:3.1.0 -io.coil-kt.coil3:coil-network-okhttp-jvm:3.1.0 -io.coil-kt.coil3:coil-network-okhttp:3.1.0 -io.coil-kt.coil3:coil:3.1.0 -io.github.fornewid:material-motion-compose-core:1.1.3 +com.squareup.okio:okio-jvm:3.15.0 +com.squareup.okio:okio:3.15.0 +com.squareup.retrofit2:converter-kotlinx-serialization:3.0.0 +com.squareup.retrofit2:retrofit:3.0.0 +com.webtoonscorp.android:readmore-foundation:1.9.0 +com.webtoonscorp.android:readmore-material:1.9.0 +io.coil-kt.coil3:coil-android:3.3.0 +io.coil-kt.coil3:coil-compose-android:3.3.0 +io.coil-kt.coil3:coil-compose-core-android:3.3.0 +io.coil-kt.coil3:coil-compose-core:3.3.0 +io.coil-kt.coil3:coil-compose:3.3.0 +io.coil-kt.coil3:coil-core-android:3.3.0 +io.coil-kt.coil3:coil-core:3.3.0 +io.coil-kt.coil3:coil-network-core-android:3.3.0 +io.coil-kt.coil3:coil-network-core:3.3.0 +io.coil-kt.coil3:coil-network-okhttp-jvm:3.3.0 +io.coil-kt.coil3:coil-network-okhttp:3.3.0 +io.coil-kt.coil3:coil:3.3.0 +io.github.fornewid:material-motion-compose-core-android:2.0.1 +io.github.fornewid:material-motion-compose-core:2.0.1 io.github.fornewid:photo-compose:1.0.1 jakarta.inject:jakarta.inject-api:2.0.1 javax.inject:javax.inject:1 @@ -199,36 +200,32 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.5 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.5 org.jetbrains.androidx.savedstate:savedstate-compose:1.3.5 org.jetbrains.androidx.savedstate:savedstate:1.3.5 -org.jetbrains.compose.animation:animation-core:1.7.3 -org.jetbrains.compose.animation:animation:1.7.3 -org.jetbrains.compose.annotation-internal:annotation:1.7.3 -org.jetbrains.compose.collection-internal:collection:1.7.3 -org.jetbrains.compose.foundation:foundation-layout:1.7.3 -org.jetbrains.compose.foundation:foundation:1.7.3 +org.jetbrains.compose.animation:animation-core:1.8.2 +org.jetbrains.compose.animation:animation:1.8.2 +org.jetbrains.compose.annotation-internal:annotation:1.8.2 +org.jetbrains.compose.collection-internal:collection:1.8.2 +org.jetbrains.compose.foundation:foundation-layout:1.8.2 +org.jetbrains.compose.foundation:foundation:1.8.2 org.jetbrains.compose.runtime:runtime-saveable:1.9.2 org.jetbrains.compose.runtime:runtime:1.9.2 -org.jetbrains.compose.ui:ui-geometry:1.7.3 -org.jetbrains.compose.ui:ui-graphics:1.7.3 -org.jetbrains.compose.ui:ui-text:1.7.3 -org.jetbrains.compose.ui:ui-unit:1.7.3 -org.jetbrains.compose.ui:ui-util:1.7.3 -org.jetbrains.compose.ui:ui:1.7.3 -org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22 -org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22 +org.jetbrains.compose.ui:ui-geometry:1.8.2 +org.jetbrains.compose.ui:ui-graphics:1.8.2 +org.jetbrains.compose.ui:ui-text:1.8.2 +org.jetbrains.compose.ui:ui-unit:1.8.2 +org.jetbrains.compose.ui:ui-util:1.8.2 +org.jetbrains.compose.ui:ui:1.8.2 org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21 org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -org.jetbrains.kotlinx:atomicfu-jvm:0.23.2 -org.jetbrains.kotlinx:atomicfu:0.23.2 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1 -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.0 -org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0 -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.0 -org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 +org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.9.0 +org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0 org.jetbrains:annotations:23.0.0 org.jspecify:jspecify:1.0.0 diff --git a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt index 57a5f11b5..119d3ab6a 100644 --- a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt +++ b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt @@ -16,6 +16,9 @@ fun Project.configureKotlin() { // https://github.com/Kotlin/kotlinx.serialization/issues/2145#issuecomment-1653091753 "-Xstring-concat=inline", + + // https://youtrack.jetbrains.com/projects/KT/issues/KT-73255/Change-defaulting-rule-for-annotations + "-Xannotation-default-target=param-property", ) } } diff --git a/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt b/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt index 09fb24d4d..b6cc6f9c2 100644 --- a/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt +++ b/data/network/impl/src/main/java/soup/movie/data/network/impl/di/NetworkModule.kt @@ -24,7 +24,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import kotlinx.serialization.json.Json import okhttp3.Cache -import okhttp3.MediaType +import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.converter.kotlinx.serialization.asConverterFactory @@ -59,7 +59,7 @@ interface NetworkModule { ): MovieApiService { return Retrofit.Builder() .baseUrl(BuildConfig.API_BASE_URL) - .addConverterFactory(json.asConverterFactory(MediaType.get("application/json"))) + .addConverterFactory(json.asConverterFactory("application/json".toMediaType())) .client(okHttpClient) .build() .create(MovieApiService::class.java) diff --git a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt index 64264e706..668cdab41 100644 --- a/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt +++ b/feature/home/impl/src/main/java/soup/movie/feature/home/impl/HomeScreen.kt @@ -19,11 +19,9 @@ import androidx.activity.compose.BackHandler import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredHeight -import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.material3.BottomSheetScaffold import androidx.compose.material3.ExperimentalMaterial3Api @@ -152,9 +150,7 @@ fun HomeScreen( } else { viewModel.onHomeTabSelected(homeTab) } - } - .fillMaxHeight() - .wrapContentHeight(), + }, ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29bece98b..d0b24037e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] # Android -androidGradlePlugin = "8.13.1" +androidGradlePlugin = "8.13.2" # Kotlin kotlin = "2.2.21" -coroutines = "1.10.1" -serialization = "1.8.0" +coroutines = "1.10.2" +serialization = "1.9.0" ksp = "2.3.2" # Dagger @@ -17,29 +17,28 @@ androidxhilt = "1.3.0" androidx-activity = "1.12.1" androidx-appcompat = "1.7.1" androidx-benchmark = "1.3.3" -androidx-browser = "1.8.0" +androidx-browser = "1.9.0" androidx-core = "1.17.0" -androidx-datastore = "1.1.3" +androidx-datastore = "1.2.0" androidx-lifecycle = "2.10.0" -androidx-navigation = "2.9.6" androidx-navigation3 = "1.0.0" androidx-profileinstaller = "1.4.1" -androidx-room = "2.7.0-rc01" +androidx-room = "2.8.4" androidx-startup = "1.2.0" -androidx-window = "1.4.0-beta02" -androidx-work = "2.10.0" +androidx-window = "1.5.1" +androidx-work = "2.11.0" # Compose -compose-bom = "2025.02.00" +compose-bom = "2025.12.00" compose-material3-adaptive = "1.3.0-alpha05" -readmore = "1.5.6" -materialmotion = "1.1.3" +readmore = "1.9.0" +materialmotion = "2.0.1" photo-compose = "1.0.1" # Etc -coil = "3.1.0" +coil = "3.3.0" dependencyGuard = "0.5.0" -retrofit = "2.11.0" +retrofit = "3.0.0" timber = "5.0.1" @@ -79,8 +78,6 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", androidx-lifecycle-compiler = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" } -androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" } - androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "androidx-navigation3" } androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }