diff options
| author | Albin <albin@mullvad.net> | 2023-08-23 13:39:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-23 16:31:47 +0200 |
| commit | c1a9231a7bea6dc00639b12cb96f893956af985a (patch) | |
| tree | 199336e951544ee260f5df925da7488026140090 /android | |
| parent | 4f1531bd941bd57ff8452702718a9c34bc14bb74 (diff) | |
| download | mullvadvpn-c1a9231a7bea6dc00639b12cb96f893956af985a.tar.xz mullvadvpn-c1a9231a7bea6dc00639b12cb96f893956af985a.zip | |
Create empty theme lib
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 1 | ||||
| -rw-r--r-- | android/lib/theme/build.gradle.kts | 49 | ||||
| -rw-r--r-- | android/lib/theme/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 7 |
5 files changed, 56 insertions, 3 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 56b6480210..9d39ef8117 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -233,6 +233,7 @@ dependencies { implementation(project(Dependencies.Mullvad.modelLib)) implementation(project(Dependencies.Mullvad.resourceLib)) implementation(project(Dependencies.Mullvad.talpidLib)) + implementation(project(Dependencies.Mullvad.themeLib)) implementation(Dependencies.androidMaterial) implementation(Dependencies.commonsValidator) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index d171b55cc7..353314105e 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -98,6 +98,7 @@ object Dependencies { const val modelLib = ":lib:model" const val resourceLib = ":lib:resource" const val talpidLib = ":lib:talpid" + const val themeLib = ":lib:theme" } object Plugin { diff --git a/android/lib/theme/build.gradle.kts b/android/lib/theme/build.gradle.kts new file mode 100644 index 0000000000..d5efe5c96f --- /dev/null +++ b/android/lib/theme/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) +} + +android { + namespace = "net.mullvad.mullvadvpn.lib.theme" + compileSdk = Versions.Android.compileSdkVersion + + defaultConfig { + minSdk = Versions.Android.minSdkVersion + } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = Versions.jvmTarget + } + + lint { + lintConfig = file("${rootProject.projectDir}/config/lint.xml") + abortOnError = true + warningsAsErrors = true + } +} + +configurations.all { + resolutionStrategy { + // Hold back emoji2 since newer versions require api level 34 which is not yet stable. + force("androidx.emoji2:emoji2:1.3.0") + } +} + +dependencies { + implementation(Dependencies.Compose.material3) + implementation(Dependencies.Compose.ui) + implementation(Dependencies.Kotlin.stdlib) +} diff --git a/android/lib/theme/src/main/AndroidManifest.xml b/android/lib/theme/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..cc947c5679 --- /dev/null +++ b/android/lib/theme/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest /> diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 6ddce2d9b1..606fb8d4dd 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -4,12 +4,13 @@ include( ":tile" ) include( - ":lib:common:", + ":lib:common", ":lib:endpoint", ":lib:ipc", - ":lib:model:", + ":lib:model", ":lib:resource", - ":lib:talpid:" + ":lib:talpid", + ":lib:theme" ) include( ":test", |