diff options
| author | Albin <albin@mullvad.net> | 2023-07-25 11:46:01 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-25 14:07:15 +0200 |
| commit | 38248fa9a0cbeb1414d1db07719c40b7b0992e93 (patch) | |
| tree | 3d809366167f5ba9e655b2576047953e7fb99c4e /android | |
| parent | 2db0704b43b17defa9af36c8b1459f2cab7d1b18 (diff) | |
| download | mullvadvpn-38248fa9a0cbeb1414d1db07719c40b7b0992e93.tar.xz mullvadvpn-38248fa9a0cbeb1414d1db07719c40b7b0992e93.zip | |
Add empty talpid 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/talpid/build.gradle.kts | 34 | ||||
| -rw-r--r-- | android/lib/talpid/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 13 |
5 files changed, 48 insertions, 2 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index b40bab7c92..ec787deeaa 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -209,6 +209,7 @@ play { dependencies { implementation(project(Dependencies.Mullvad.endpointLib)) + implementation(project(Dependencies.Mullvad.talpidLib)) 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 288198f47c..172aa0adda 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -90,6 +90,7 @@ object Dependencies { object Mullvad { const val endpointLib = ":lib:endpoint" + const val talpidLib = ":lib:talpid" } object Plugin { diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts new file mode 100644 index 0000000000..75ecde8e11 --- /dev/null +++ b/android/lib/talpid/build.gradle.kts @@ -0,0 +1,34 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.kotlinParcelizeId) +} + +android { + namespace = "net.mullvad.talpid" + 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(Dependencies.Kotlin.stdlib) +} diff --git a/android/lib/talpid/src/main/AndroidManifest.xml b/android/lib/talpid/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..cc947c5679 --- /dev/null +++ b/android/lib/talpid/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest /> diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index d847a97691..9e838aedfd 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -1,2 +1,11 @@ -include(":app", ":lib:endpoint") -include(":test", ":test:common", ":test:e2e", ":test:mockapi") +include(":app") +include( + ":lib:endpoint", + ":lib:talpid:" +) +include( + ":test", + ":test:common", + ":test:e2e", + ":test:mockapi" +) |
