diff options
| author | Albin <albin@mullvad.net> | 2022-05-31 10:56:34 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-06-15 10:25:32 +0200 |
| commit | 49fa983fe3f08214a374a0860d1cb02d5a7d7d89 (patch) | |
| tree | 01d6f658a17b49d7973ce0d0060b47021b5e80d5 /android | |
| parent | d184669f0f932f08dd9c8f45d3d241e10daa77f4 (diff) | |
| download | mullvadvpn-49fa983fe3f08214a374a0860d1cb02d5a7d7d89.tar.xz mullvadvpn-49fa983fe3f08214a374a0860d1cb02d5a7d7d89.zip | |
Add compose dependencies
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 15 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 12 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 8 |
3 files changed, 35 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 2e0f62423e..afd32e22e7 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -83,6 +83,15 @@ android { } } + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerVersion = Versions.kotlin + kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion + } + compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -164,6 +173,12 @@ dependencies { implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.AndroidX.lifecycleViewmodelKtx) implementation(Dependencies.AndroidX.recyclerview) + implementation(Dependencies.Compose.constrainLayout) + implementation(Dependencies.Compose.foundation) + implementation(Dependencies.Compose.viewModelLifecycle) + implementation(Dependencies.Compose.material) + implementation(Dependencies.Compose.uiController) + implementation(Dependencies.Compose.ui) implementation(Dependencies.jodaTime) implementation(Dependencies.Koin.core) implementation(Dependencies.Koin.coreExt) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 6d019cadf9..dc5458f729 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -39,6 +39,18 @@ object Dependencies { "androidx.test:orchestrator:${Versions.AndroidX.test}" } + object Compose { + const val constrainLayout = + "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}" + const val foundation = "androidx.compose.foundation:foundation:${Versions.Compose.base}" + const val viewModelLifecycle = + "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}" + const val material = "androidx.compose.material:material:${Versions.Compose.base}" + const val uiController = + "com.google.accompanist:accompanist-systemuicontroller:${Versions.Compose.uiController}" + const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" + } + object Koin { const val core = "io.insert-koin:koin-core:${Versions.koin}" const val coreExt = "io.insert-koin:koin-core-ext:${Versions.koin}" diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 4101a4f572..fcdf7573e7 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -5,6 +5,7 @@ object Versions { const val jvmTarget = "1.8" const val koin = "2.2.3" const val kotlin = "1.5.31" + const val kotlinCompilerExtensionVersion = "1.0.5" const val kotlinx = "1.5.2" const val leakCanary = "2.8.1" const val mockk = "1.12.3" @@ -32,6 +33,13 @@ object Versions { const val uiautomator = "2.2.0" } + object Compose { + const val base = "1.1.1" + const val viewModelLifecycle = "2.4.1" + const val uiController = "0.23.1" + const val constrainLayout = "1.0.1" + } + object Plugin { const val android = "4.2.2" const val playPublisher = "2.7.5" |
