diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 2978d9756..4f3b634c9 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
@@ -21,12 +23,6 @@ android {
         }
     }
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.benchmark.macro.ExperimentalBaselineProfilesApi"
-        )
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
diff --git a/benchmark/src/main/java/org/michaelbel/movies/benchmark/StartupBenchmark.kt b/benchmark/src/main/java/org/michaelbel/movies/benchmark/StartupBenchmark.kt
index 3e12abcde..1ee0cbeea 100644
--- a/benchmark/src/main/java/org/michaelbel/movies/benchmark/StartupBenchmark.kt
+++ b/benchmark/src/main/java/org/michaelbel/movies/benchmark/StartupBenchmark.kt
@@ -1,5 +1,8 @@
+@file:SuppressLint("NewApi")
+
 package org.michaelbel.movies.benchmark
 
+import android.annotation.SuppressLint
 import androidx.benchmark.macro.BaselineProfileMode
 import androidx.benchmark.macro.CompilationMode
 import androidx.benchmark.macro.StartupMode
diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts
index d29cda026..aba232438 100644
--- a/core/interactor/build.gradle.kts
+++ b/core/interactor/build.gradle.kts
@@ -1,4 +1,5 @@
 @Suppress("dsl_scope_violation")
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -21,12 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.paging.ExperimentalPagingApi"
-        )
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
diff --git a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
index d2d26c5ef..9513dacc1 100644
--- a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
+++ b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/impl/MovieInteractorImpl.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalPagingApi::class)
+
 package org.michaelbel.movies.interactor.impl
 
+import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
diff --git a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
index 1058d8426..16a2cd4e8 100644
--- a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
+++ b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/FeedMoviesRemoteMediator.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalPagingApi::class)
+
 package org.michaelbel.movies.interactor.remote
 
+import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
diff --git a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
index b5ed2bd4d..9fef79b20 100644
--- a/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
+++ b/core/interactor/src/main/kotlin/org/michaelbel/movies/interactor/remote/SearchMoviesRemoteMediator.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalPagingApi::class)
+
 package org.michaelbel.movies.interactor.remote
 
+import androidx.paging.ExperimentalPagingApi
 import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
diff --git a/core/widget/build.gradle.kts b/core/widget/build.gradle.kts
index 9eb0adaf7..a1b6cfbc2 100644
--- a/core/widget/build.gradle.kts
+++ b/core/widget/build.gradle.kts
@@ -36,12 +36,6 @@ android {
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
     }
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     lint {
         quiet = true
         abortOnError = false
diff --git a/core/widget/src/main/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt b/core/widget/src/main/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
index fcce064a3..96e4f9075 100644
--- a/core/widget/src/main/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
+++ b/core/widget/src/main/kotlin/org/michaelbel/movies/widget/configure/AppWidgetConfigureActivityContent.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.widget.configure
 
 import androidx.activity.SystemBarStyle
@@ -6,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
diff --git a/core/work/build.gradle.kts b/core/work/build.gradle.kts
index ee9198048..218c2b964 100644
--- a/core/work/build.gradle.kts
+++ b/core/work/build.gradle.kts
@@ -22,12 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-        )
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
diff --git a/core/work/src/main/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt b/core/work/src/main/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
index b8f2694bb..a7fc8b424 100644
--- a/core/work/src/main/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
+++ b/core/work/src/main/kotlin/org/michaelbel/movies/work/MoviesDatabaseWorker.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalSerializationApi::class)
+
 package org.michaelbel.movies.work
 
 import android.content.Context
@@ -7,6 +9,7 @@ import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import org.michaelbel.movies.common.dispatchers.MoviesDispatchers
diff --git a/feature/account-impl/build.gradle.kts b/feature/account-impl/build.gradle.kts
index 0c921ad72..b19edc193 100644
--- a/feature/account-impl/build.gradle.kts
+++ b/feature/account-impl/build.gradle.kts
@@ -22,12 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
index 291a34b52..a0b013da7 100644
--- a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
+++ b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.account.ui
 
 import androidx.compose.foundation.background
 import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
diff --git a/feature/auth-impl/build.gradle.kts b/feature/auth-impl/build.gradle.kts
index 4dcaf9aeb..be05c1954 100644
--- a/feature/auth-impl/build.gradle.kts
+++ b/feature/auth-impl/build.gradle.kts
@@ -22,12 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
index 0d4b793a9..923d60a43 100644
--- a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
+++ b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.auth.ui
 
 import androidx.compose.foundation.background
 import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
diff --git a/feature/details-impl/build.gradle.kts b/feature/details-impl/build.gradle.kts
index 21fbaec73..2c920d59e 100644
--- a/feature/details-impl/build.gradle.kts
+++ b/feature/details-impl/build.gradle.kts
@@ -1,4 +1,5 @@
 @Suppress("dsl_scope_violation")
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -22,13 +23,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
index faecb12fe..cc483fbd0 100644
--- a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
+++ b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsScreenContent.kt
@@ -1,8 +1,14 @@
+@file:OptIn(
+    ExperimentalMaterial3Api::class,
+    ExperimentalFoundationApi::class
+)
+
 package org.michaelbel.movies.details.ui
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -12,6 +18,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
diff --git a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
index a9ffba771..beaa067ae 100644
--- a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
+++ b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
@@ -1,9 +1,12 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.details.ui
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
diff --git a/feature/feed-impl/build.gradle.kts b/feature/feed-impl/build.gradle.kts
index 68148c03f..ed23d0de2 100644
--- a/feature/feed-impl/build.gradle.kts
+++ b/feature/feed-impl/build.gradle.kts
@@ -1,4 +1,5 @@
 @Suppress("dsl_scope_violation")
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -22,13 +23,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
index 0d4eb3795..b717473db 100644
--- a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
+++ b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/FeedViewModel.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package org.michaelbel.movies.feed
 
 import androidx.compose.runtime.getValue
@@ -7,6 +9,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
index 51836ca2f..c92987295 100644
--- a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
+++ b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.feed.ui
 
 import androidx.activity.compose.BackHandler
@@ -9,6 +11,7 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
 import androidx.compose.material3.BottomSheetScaffold
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SheetValue
diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
index 0b7bd9653..96d954680 100644
--- a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
+++ b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.feed.ui
 
 import androidx.compose.foundation.Image
@@ -5,6 +7,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
diff --git a/feature/gallery-impl/build.gradle.kts b/feature/gallery-impl/build.gradle.kts
index 9fc6eb244..84743baf3 100644
--- a/feature/gallery-impl/build.gradle.kts
+++ b/feature/gallery-impl/build.gradle.kts
@@ -1,4 +1,5 @@
 @Suppress("dsl_scope_violation")
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -22,12 +23,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt b/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
index b95a80668..937385109 100644
--- a/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
+++ b/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/ui/GalleryScreenContent.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package org.michaelbel.movies.gallery.ui
 
 import android.content.Intent
@@ -7,6 +9,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.statusBarsPadding
diff --git a/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt b/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
index 1f658d6dd..ae34ddb77 100644
--- a/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
+++ b/feature/gallery-impl/src/main/kotlin/org/michaelbel/movies/gallery/zoomable/Zoomable.kt
@@ -16,6 +16,7 @@
 
 package org.michaelbel.movies.gallery.zoomable
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.gestures.awaitEachGesture
diff --git a/feature/search-impl/build.gradle.kts b/feature/search-impl/build.gradle.kts
index b929aa94d..b644ba363 100644
--- a/feature/search-impl/build.gradle.kts
+++ b/feature/search-impl/build.gradle.kts
@@ -22,13 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     buildFeatures {
         compose = true
     }
diff --git a/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/SearchViewModel.kt b/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
index 26ecd1354..d2d2f6a4c 100644
--- a/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
+++ b/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/SearchViewModel.kt
@@ -1,8 +1,11 @@
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package org.michaelbel.movies.search
 
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt b/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
index 3cdfea1a8..8bebe169c 100644
--- a/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
+++ b/feature/search-impl/src/main/kotlin/org/michaelbel/movies/search/ui/SearchToolbar.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.search.ui
 
 import androidx.compose.foundation.clickable
@@ -9,6 +11,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SearchBar
 import androidx.compose.material3.SearchBarDefaults
diff --git a/feature/settings-impl/build.gradle.kts b/feature/settings-impl/build.gradle.kts
index c9f4a801c..986d3f492 100644
--- a/feature/settings-impl/build.gradle.kts
+++ b/feature/settings-impl/build.gradle.kts
@@ -22,12 +22,6 @@ android {
         }
     }*/
 
-    kotlinOptions {
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
-        )
-    }
-
     buildFeatures {
         buildConfig = true
         compose = true
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
index b0840afd8..ac150ee94 100644
--- a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
+++ b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.settings.ui
 
 import android.Manifest
@@ -18,6 +20,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
index edc11498d..e94799ac6 100644
--- a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
+++ b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
@@ -1,7 +1,10 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package org.michaelbel.movies.settings.ui
 
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 47d01e500..9a12251a7 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -57,9 +57,6 @@ kotlin {
 android {
     namespace = "org.michaelbel.movies.shared"
 
-    //sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    //sourceSets["main"].res.srcDirs("src/androidMain/res")
-
     defaultConfig {
         minSdk = libs.versions.min.sdk.get().toInt()
         compileSdk = libs.versions.compile.sdk.get().toInt()