Bump dependencies

.github/workflows/build.yml

@@ -22,11 +22,11 @@ jobs:
       - name: Checkout repositoryy
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache
@@ -47,11 +47,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache
@@ -78,11 +78,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache

.github/workflows/release.yml

@@ -18,11 +18,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache
@@ -61,11 +61,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache
@@ -127,11 +127,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup java 17
+      - name: Setup java 21
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Setup gradle
         uses: ./.github/workflows/gradle-cache

build-logic/src/main/kotlin/Plugins.kt

@@ -10,6 +10,7 @@ object Plugins {
     const val KSP = "com.google.devtools.ksp"
     const val HILT = "dagger.hilt.android.plugin"
     const val JACOCO = "org.gradle.jacoco"
+    const val COMPOSE_COMPILER = "org.jetbrains.kotlin.plugin.compose"
 
     const val SOMOVIE_ANDROID_APPLICATION = "somovie.android.application"
     const val SOMOVIE_ANDROID_LIBRARY = "somovie.android.library"

build-logic/src/main/kotlin/plugin/AndroidApplicationPlugin.kt

@@ -11,7 +11,6 @@ import plugin.util.configureAndroid
 import plugin.util.configureKotlinOptions
 import java.util.Properties
 
-@Suppress("UnstableApiUsage")
 class AndroidApplicationPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {

build-logic/src/main/kotlin/plugin/AndroidComposePlugin.kt

@@ -2,6 +2,7 @@
 
 package plugin
 
+import Plugins
 import debugImplementation
 import getLibsVersionCatalog
 import implementation
@@ -13,18 +14,18 @@ import plugin.util.getCommonExtension
 class AndroidComposePlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
+            with(pluginManager) {
+                apply(Plugins.JACOCO)
+                apply(Plugins.COMPOSE_COMPILER)
+            }
+
             val libs = getLibsVersionCatalog()
             val commonExtension = getCommonExtension()
 
             commonExtension.apply {
                 buildFeatures {
                     compose = true
                 }
-
-                composeOptions {
-                    kotlinCompilerExtensionVersion =
-                        libs.findVersion("androidxComposeCompiler").get().toString()
-                }
             }
 
             dependencies {

build-logic/src/main/kotlin/plugin/AndroidFeaturePlugin.kt

@@ -36,7 +36,6 @@ class AndroidFeaturePlugin : Plugin<Project> {
                 implementation(project(":ui:common"))
                 implementation(project(":ui:component"))
                 implementation(project(":ui:theme"))
-                implementation(libs.findLibrary("accompanist.navigationAnimation").get())
                 implementation(libs.findLibrary("androidx.constraintlayout.compose").get())
                 implementation(libs.findLibrary("androidx.lifecycle.runtime").get())
                 implementation(libs.findLibrary("androidx.lifecycle.viewmodel").get())

build-logic/src/main/kotlin/plugin/JacocoMergeAllReportsPlugin.kt

@@ -5,12 +5,12 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import getLibsVersionCatalog
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
+import plugin.util.capitalized
 import plugin.util.configureJacoco
 
 class JacocoMergeAllReportsPlugin : Plugin<Project> {

build-logic/src/main/kotlin/plugin/JacocoPlugin.kt

@@ -3,9 +3,9 @@ package plugin
 import Plugins
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.kotlin.dsl.register
 import org.gradle.testing.jacoco.tasks.JacocoReport
+import plugin.util.capitalized
 import plugin.util.configureJacoco
 import plugin.util.getAndroidComponentsExtension
 

build-logic/src/main/kotlin/plugin/util/Android.kt

@@ -9,7 +9,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = AppConfig.COMPILE_SDK_VERSION
@@ -24,8 +24,8 @@ internal fun Project.configureAndroid(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
+            sourceCompatibility = JavaVersion.VERSION_21
+            targetCompatibility = JavaVersion.VERSION_21
         }
 
         buildTypes {

build-logic/src/main/kotlin/plugin/util/Extension.kt

@@ -9,14 +9,16 @@ import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.findByType
 
-internal fun Project.getCommonExtension(): CommonExtension<*, *, *, *, *> =
+internal fun Project.getCommonExtension(): CommonExtension<*, *, *, *, *, *> =
     (
         extensions.findByType<LibraryExtension>()
             ?: extensions.findByType<ApplicationExtension>()
-        ) as CommonExtension<*, *, *, *, *>
+        ) as CommonExtension<*, *, *, *, *, *>
 
 internal fun Project.getAndroidComponentsExtension(): AndroidComponentsExtension<*, *, *> =
     (
         extensions.findByType<LibraryAndroidComponentsExtension>()
             ?: extensions.findByType<ApplicationAndroidComponentsExtension>()
         ) as AndroidComponentsExtension<*, *, *>
+
+internal fun String.capitalized() = this.replaceFirstChar { it.uppercase() }

build-logic/src/main/kotlin/plugin/util/Jacoco.kt

@@ -1,7 +1,6 @@
 package plugin.util
 
 import org.gradle.api.Project
-import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.testing.jacoco.tasks.JacocoReport
 
 internal fun JacocoReport.configureJacoco(project: Project, variantName: String) {
@@ -14,12 +13,12 @@ internal fun JacocoReport.configureJacoco(project: Project, variantName: String)
 
     val javaClasses = projects
         .map { proj ->
-            project.fileTree("${proj.buildDir}/intermediates/javac/$variantName/classes/com")
+            project.fileTree("${proj.layout.buildDirectory.asFile}/intermediates/javac/$variantName/classes/com")
         }
         .onEach { it.exclude(coverageExclusions) }
     val kotlinClasses = projects
         .map { proj ->
-            project.fileTree("${proj.buildDir}/tmp/kotlin-classes/$variantName")
+            project.fileTree("${proj.layout.buildDirectory.asFile}/tmp/kotlin-classes/$variantName")
         }
         .onEach { it.exclude(coverageExclusions) }
 
@@ -36,7 +35,7 @@ internal fun JacocoReport.configureJacoco(project: Project, variantName: String)
 
     val executions = projects
         .map { proj ->
-            proj.fileTree(proj.buildDir).apply {
+            proj.fileTree(proj.layout.buildDirectory.asFile).apply {
                 include(
                     "/outputs/code_coverage/${variantName}AndroidTest/connected/**/coverage.ec",
                     "/outputs/unit_test_code_coverage/${variantName}UnitTest/test${variantName.capitalized()}UnitTest.exec",

build-logic/src/main/kotlin/plugin/util/KotlinOptions.kt

@@ -1,35 +1,41 @@
 package plugin.util
 
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinOptions() {
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_17.toString()
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
+
+            freeCompilerArgs.add(
+                "-opt-in=" +
+                    "kotlin.Experimental," +
+                    "kotlinx.coroutines.ExperimentalCoroutinesApi," +
+                    "kotlinx.coroutines.FlowPreview," +
+                    "androidx.paging.ExperimentalPagingApi," +
+                    "androidx.compose.foundation.layout.ExperimentalLayoutApi," +
+                    "androidx.compose.material.ExperimentalMaterialApi",
+            )
 
-            freeCompilerArgs =
-                freeCompilerArgs + (
-                    "-opt-in=" +
-                        "kotlin.Experimental," +
-                        "kotlinx.coroutines.ExperimentalCoroutinesApi," +
-                        "kotlinx.coroutines.FlowPreview," +
-                        "androidx.paging.ExperimentalPagingApi"
-                    )
             if (project.findProperty("composeCompilerReports") == "true") {
-                freeCompilerArgs = freeCompilerArgs + listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
-                        project.buildDir.absolutePath + "/compose_compiler",
+                freeCompilerArgs.addAll(
+                    listOf(
+                        "-P",
+                        "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
+                            project.layout.buildDirectory.asFile.get().absolutePath + "/compose_compiler",
+                    ),
                 )
             }
             if (project.findProperty("composeCompilerMetrics") == "true") {
-                freeCompilerArgs = freeCompilerArgs + listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
-                        project.buildDir.absolutePath + "/compose_compiler",
+                freeCompilerArgs.addAll(
+                    listOf(
+                        "-P",
+                        "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
+                            project.layout.buildDirectory.asFile.get().absolutePath + "/compose_compiler",
+                    ),
                 )
             }
         }

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.spotless)
     alias(libs.plugins.detekt)
     alias(libs.plugins.gradleversions)

feature/home/container/src/main/kotlin/com/louisfn/somovie/feature/home/container/HomeBottomSheetItem.kt

@@ -2,13 +2,16 @@ package com.louisfn.somovie.feature.home.container
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.List
+import androidx.compose.material.icons.automirrored.filled.List
 import androidx.compose.material.icons.filled.Movie
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.Swipe
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.louisfn.somovie.feature.home.account.AccountNavigation
-import com.louisfn.somovie.feature.home.container.HomeBottomSheetItem.*
+import com.louisfn.somovie.feature.home.container.HomeBottomSheetItem.Account
+import com.louisfn.somovie.feature.home.container.HomeBottomSheetItem.Discover
+import com.louisfn.somovie.feature.home.container.HomeBottomSheetItem.Explore
+import com.louisfn.somovie.feature.home.container.HomeBottomSheetItem.WatchList
 import com.louisfn.somovie.feature.home.discover.DiscoverNavigation
 import com.louisfn.somovie.feature.home.explore.ExploreNavigation
 import com.louisfn.somovie.feature.home.watchlist.WatchlistDestination
@@ -21,7 +24,7 @@ sealed class HomeBottomSheetItem(
     val icon: ImageVector,
 ) {
     object Explore : HomeBottomSheetItem(ExploreNavigation, R.string.home_explore, Icons.Default.Movie)
-    object WatchList : HomeBottomSheetItem(WatchlistDestination, R.string.home_watchlist, Icons.Default.List)
+    object WatchList : HomeBottomSheetItem(WatchlistDestination, R.string.home_watchlist, Icons.AutoMirrored.Filled.List)
     object Discover : HomeBottomSheetItem(DiscoverNavigation, R.string.home_discover, Icons.Default.Swipe)
     object Account : HomeBottomSheetItem(AccountNavigation, R.string.home_account, Icons.Default.Settings)
 }

feature/home/container/src/main/kotlin/com/louisfn/somovie/feature/home/container/HomeDestination.kt

@@ -1,8 +1,7 @@
 package com.louisfn.somovie.feature.home.container
 
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.navigation.NavGraphBuilder
-import com.google.accompanist.navigation.animation.composable
+import androidx.navigation.compose.composable
 import com.louisfn.somovie.domain.model.ExploreCategory
 import com.louisfn.somovie.domain.model.Movie
 import com.louisfn.somovie.ui.common.navigation.NavigationDestination
@@ -11,7 +10,6 @@ object HomeDestination : NavigationDestination {
     override val route: String = "home"
 }
 
-@OptIn(ExperimentalAnimationApi::class)
 fun NavGraphBuilder.homeGraph(
     showDetails: (Movie) -> Unit,
     showMore: (ExploreCategory) -> Unit,

feature/home/discover/src/main/kotlin/com/louisfn/somovie/feature/home/discover/DiscoverScreen.kt

@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.FractionalThreshold
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
@@ -126,7 +124,6 @@ private fun BoxScope.DiscoverContent(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun BoxScope.DiscoverSwipeContainer(
     items: ImmutableList<MovieItem>,
@@ -138,7 +135,7 @@ private fun BoxScope.DiscoverSwipeContainer(
     SwipeContainer(
         items = ImmutableList(items.take(MaxMovieItemToPreload)),
         itemKey = MovieItem::id,
-        thresholdConfig = FractionalThreshold(SwipeFractionalThreshold),
+        fractionalThreshold = SwipeFractionalThreshold,
         onDragging = { _, direction, ratio ->
             draggingState = DraggingState(direction, ratio)
         },

feature/home/watchlist/src/main/kotlin/com/louisfn/somovie/feature/home/watchlist/WatchListScreen.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalMaterialApi::class)
-
 package com.louisfn.somovie.feature.home.watchlist
 
 import android.content.res.Resources
@@ -28,7 +26,6 @@ import androidx.compose.material.DismissDirection
 import androidx.compose.material.DismissState
 import androidx.compose.material.DismissValue
 import androidx.compose.material.Divider
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
@@ -208,7 +205,7 @@ private fun LogInContent(logInManager: LogInManager, modifier: Modifier = Modifi
                         .align(Alignment.TopCenter)
                         .padding(16.dp),
                 )
-                Button(modifier = Modifier.align(Alignment.Center))
+                Button(Modifier.align(Alignment.Center))
             }
         },
     )