diff options
| author | Albin <albin@mullvad.net> | 2023-07-26 10:26:46 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-27 10:38:58 +0200 |
| commit | cdd42a19f8978164916c352ca94948f30f96da3e (patch) | |
| tree | ae9af274dd5cb77915683a14917d9e44cd0424ad /android | |
| parent | 6d57800a24833e53c5cc161d9afb4dffe4381365 (diff) | |
| download | mullvadvpn-cdd42a19f8978164916c352ca94948f30f96da3e.tar.xz mullvadvpn-cdd42a19f8978164916c352ca94948f30f96da3e.zip | |
Add empty common module
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/common/build.gradle.kts | 35 | ||||
| -rw-r--r-- | android/lib/common/lint-baseline.xml | 4 | ||||
| -rw-r--r-- | android/lib/common/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 1 |
6 files changed, 43 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 835aa9cba0..9476042841 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -208,6 +208,7 @@ play { } dependencies { + implementation(project(Dependencies.Mullvad.commonLib)) implementation(project(Dependencies.Mullvad.endpointLib)) implementation(project(Dependencies.Mullvad.modelLib)) implementation(project(Dependencies.Mullvad.talpidLib)) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index c68925ee68..13cf0b2f72 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -89,6 +89,7 @@ object Dependencies { } object Mullvad { + const val commonLib = ":lib:common" const val endpointLib = ":lib:endpoint" const val modelLib = ":lib:model" const val talpidLib = ":lib:talpid" diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts new file mode 100644 index 0000000000..0861441e05 --- /dev/null +++ b/android/lib/common/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.kotlinParcelizeId) +} + +android { + namespace = "net.mullvad.mullvadvpn.lib.common" + compileSdk = Versions.Android.compileSdkVersion + + defaultConfig { + minSdk = Versions.Android.minSdkVersion + targetSdk = Versions.Android.targetSdkVersion + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = Versions.jvmTarget + } + + lint { + lintConfig = file("${rootProject.projectDir}/config/lint.xml") + baseline = file("lint-baseline.xml") + abortOnError = true + warningsAsErrors = true + } +} + +dependencies { + implementation(Dependencies.Kotlin.stdlib) +} diff --git a/android/lib/common/lint-baseline.xml b/android/lib/common/lint-baseline.xml new file mode 100644 index 0000000000..0722790eb0 --- /dev/null +++ b/android/lib/common/lint-baseline.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2"> + +</issues> diff --git a/android/lib/common/src/main/AndroidManifest.xml b/android/lib/common/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..cc947c5679 --- /dev/null +++ b/android/lib/common/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest /> diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 511cf03b9e..2e13f91b50 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -1,5 +1,6 @@ include(":app") include( + ":lib:common:", ":lib:endpoint", ":lib:model:", ":lib:talpid:" |