From d2ae1567beabc90c8b8cab2aa7aa7b5214e4c736 Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 12 Aug 2022 19:01:59 +0800 Subject: [PATCH] import jetpack compose --- app/build.gradle | 19 +++++++++++++++++++ build.gradle | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7319290c9..528d5aa90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,6 +86,14 @@ android { } } + buildFeatures { + compose true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.3.0" + } + namespace 'com.hippo.ehviewer' } @@ -109,6 +117,16 @@ dependencies { implementation "androidx.collection:collection:$collection_version" implementation "androidx.collection:collection-ktx:$collection_version" + def compose_version = "1.3.0-alpha03" + implementation "androidx.compose.animation:animation:$compose_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.runtime:runtime:$compose_version" + implementation "androidx.compose.runtime:runtime-saveable:$compose_version" + implementation "androidx.compose.ui:ui:$compose_version" + + implementation "androidx.compose.material3:material3:1.0.0-alpha16" + implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha03" implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0" @@ -177,4 +195,5 @@ dependencies { configurations.all { exclude group: 'dev.rikka.rikkax.appcompat', module: 'appcompat' exclude group: 'dev.rikka.rikkax.material', module: 'material' + exclude group: 'androidx.compose.material' } diff --git a/build.gradle b/build.gradle index a21539dbe..99f56fa9d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' version '7.2.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20-Beta' apply false - id 'com.google.devtools.ksp' version '1.7.20-Beta-1.0.6' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false + id 'com.google.devtools.ksp' version '1.7.10-1.0.6' apply false } task clean(type: Delete) {