all: finalize migration

This commit is contained in:
Harsh Shandilya 2022-08-02 23:45:54 +05:30
parent cbdfa67d07
commit ff19b36a9d
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
2 changed files with 4 additions and 19 deletions

View file

@ -1,4 +1,3 @@
@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
plugins { plugins {
@ -6,7 +5,6 @@ plugins {
id("dev.msfjarvis.claw.rename-artifacts") id("dev.msfjarvis.claw.rename-artifacts")
id("dev.msfjarvis.claw.kotlin-android") id("dev.msfjarvis.claw.kotlin-android")
id("dev.msfjarvis.claw.kotlin-kapt") id("dev.msfjarvis.claw.kotlin-kapt")
alias(libs.plugins.compose)
alias(libs.plugins.hilt) alias(libs.plugins.hilt)
} }
@ -17,6 +15,7 @@ android {
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
} }
buildFeatures { compose = true }
composeOptions { composeOptions {
useLiveLiterals = false useLiveLiterals = false
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
@ -33,13 +32,13 @@ android {
dependencies { dependencies {
kapt(libs.androidx.hilt.compiler) kapt(libs.androidx.hilt.compiler)
kapt(libs.dagger.hilt.compiler) kapt(libs.dagger.hilt.compiler)
implementation(compose.material3)
implementation(projects.api) implementation(projects.api)
implementation(projects.common) implementation(projects.common)
implementation(projects.database) implementation(projects.database)
implementation(libs.accompanist.swiperefresh) implementation(libs.accompanist.swiperefresh)
implementation(libs.accompanist.sysuicontroller) implementation(libs.accompanist.sysuicontroller)
implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.compose)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.core.splashscreen) implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.hilt.work) implementation(libs.androidx.hilt.work)
implementation(libs.androidx.lifecycle.compose) implementation(libs.androidx.lifecycle.compose)

View file

@ -97,24 +97,10 @@ rootProject.name = "Claw"
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
include( include(
"android",
"api", "api",
"benchmark",
"common", "common",
"database", "database",
"model", "model",
) )
// include(":android")
//
// include(":api")
//
// include(":benchmark")
//
// include(":common")
//
// include(":database")
//
// include(":desktop")
//
// include(":model")
//
// include(":paparazzi-tests")