diff options
| author | Albin <albin@mullvad.net> | 2023-07-26 13:27:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-27 10:41:29 +0200 |
| commit | e320571c388aacc74e7c9e73a54374ec189c4792 (patch) | |
| tree | 613157ff34d4a51395785f2da7824bb97f258d12 | |
| parent | a7371c625b768e042ed952696edefc04f74bf7bf (diff) | |
| download | mullvadvpn-e320571c388aacc74e7c9e73a54374ec189c4792.tar.xz mullvadvpn-e320571c388aacc74e7c9e73a54374ec189c4792.zip | |
Add empty tile service module
| -rw-r--r-- | android/app/build.gradle.kts | 2 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 2 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 5 | ||||
| -rw-r--r-- | android/tile/build.gradle.kts | 41 | ||||
| -rw-r--r-- | android/tile/src/main/AndroidManifest.xml | 1 |
5 files changed, 50 insertions, 1 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index d1fd11afee..5d5144dcd1 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -208,6 +208,8 @@ play { } dependencies { + implementation(project(Dependencies.Mullvad.tileService)) + implementation(project(Dependencies.Mullvad.commonLib)) implementation(project(Dependencies.Mullvad.endpointLib)) implementation(project(Dependencies.Mullvad.ipcLib)) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 90d1c5ca08..d25ab0eaba 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -89,6 +89,8 @@ object Dependencies { } object Mullvad { + const val tileService = ":tile" + const val commonLib = ":lib:common" const val endpointLib = ":lib:endpoint" const val ipcLib = ":lib:ipc" diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index f9946e90c6..65f4c2811e 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -1,4 +1,7 @@ -include(":app") +include( + ":app", + ":tile" +) include( ":lib:common:", ":lib:endpoint", diff --git a/android/tile/build.gradle.kts b/android/tile/build.gradle.kts new file mode 100644 index 0000000000..e7150bac7b --- /dev/null +++ b/android/tile/build.gradle.kts @@ -0,0 +1,41 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.kotlinParcelizeId) +} + +android { + namespace = "net.mullvad.mullvadvpn.tile" + 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") + abortOnError = true + warningsAsErrors = true + } +} + +dependencies { + implementation(project(Dependencies.Mullvad.commonLib)) + implementation(project(Dependencies.Mullvad.ipcLib)) + implementation(project(Dependencies.Mullvad.modelLib)) + implementation(project(Dependencies.Mullvad.resourceLib)) + implementation(project(Dependencies.Mullvad.talpidLib)) + + implementation(Dependencies.Kotlin.stdlib) + implementation(Dependencies.KotlinX.coroutinesAndroid) +} diff --git a/android/tile/src/main/AndroidManifest.xml b/android/tile/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..cc947c5679 --- /dev/null +++ b/android/tile/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest /> |