From ff19b36a9dd07246645421beda768a012916d6b5 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Tue, 2 Aug 2022 23:45:54 +0530
Subject: [PATCH] all: finalize migration

---
 android/build.gradle.kts |  5 ++---
 settings.gradle.kts      | 18 ++----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index fe82f25e..fadbc8d4 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -1,4 +1,3 @@
-@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
 
 plugins {
@@ -6,7 +5,6 @@ plugins {
   id("dev.msfjarvis.claw.rename-artifacts")
   id("dev.msfjarvis.claw.kotlin-android")
   id("dev.msfjarvis.claw.kotlin-kapt")
-  alias(libs.plugins.compose)
   alias(libs.plugins.hilt)
 }
 
@@ -17,6 +15,7 @@ android {
     versionCode = 1
     versionName = "1.0"
   }
+  buildFeatures { compose = true }
   composeOptions {
     useLiveLiterals = false
     kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
@@ -33,13 +32,13 @@ android {
 dependencies {
   kapt(libs.androidx.hilt.compiler)
   kapt(libs.dagger.hilt.compiler)
-  implementation(compose.material3)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.database)
   implementation(libs.accompanist.swiperefresh)
   implementation(libs.accompanist.sysuicontroller)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.hilt.work)
   implementation(libs.androidx.lifecycle.compose)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c3fe5232..309ec419 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -97,24 +97,10 @@ rootProject.name = "Claw"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 include(
+  "android",
   "api",
+  "benchmark",
   "common",
   "database",
   "model",
 )
-
-// include(":android")
-//
-// include(":api")
-//
-// include(":benchmark")
-//
-// include(":common")
-//
-// include(":database")
-//
-// include(":desktop")
-//
-// include(":model")
-//
-// include(":paparazzi-tests")