Merge pull request #1288 from chrisbanes/cb/circuit

Migrate to Circuit
chrisbanes · May 30, 2023 · 6d81143 · 6d81143
2 parents 29eb186 + d838857
commit 6d81143
Show file tree

Hide file tree

Showing 97 changed files with 2,109 additions and 1,817 deletions.
diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 plugins {
     id("app.tivi.android.application")
     id("app.tivi.kotlin.android")
@@ -148,12 +146,6 @@ androidComponents {
     }
 }
 
-tasks.withType<KotlinCompilationTask<*>> {
-    compilerOptions {
-        freeCompilerArgs.add("-opt-in=com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi")
-    }
-}
-
 dependencies {
     implementation(projects.core.base)
     implementation(projects.core.analytics)
@@ -184,13 +176,13 @@ dependencies {
     implementation(projects.ui.settings)
     implementation(projects.ui.upnext)
 
+    implementation(libs.circuit.overlay)
+
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(libs.androidx.activity.activity)
     implementation(libs.androidx.activity.compose)
 
-    implementation(libs.androidx.navigation.compose)
-
     implementation(libs.androidx.emoji)
 
     implementation(libs.compose.foundation.foundation)
@@ -203,9 +195,6 @@ dependencies {
 
     lintChecks(libs.slack.lint.compose)
 
-    implementation(libs.accompanist.navigation.animation)
-    implementation(libs.accompanist.navigation.material)
-
     implementation(libs.timber)
 
     implementation(libs.kotlin.coroutines.android)