diff options
| author | Albin <albin@mullvad.net> | 2022-09-09 16:43:42 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-09-13 17:08:34 +0200 |
| commit | ca1297b1dcd1b34ef3ce7b8123ed7b1298af4d40 (patch) | |
| tree | fc7111458ade5f4ed4370365fb68558a46cfe154 /android | |
| parent | 49c3a16d927dd9f47a4b8d3780a25a7c5716bc6a (diff) | |
| download | mullvadvpn-ca1297b1dcd1b34ef3ce7b8123ed7b1298af4d40.tar.xz mullvadvpn-ca1297b1dcd1b34ef3ce7b8123ed7b1298af4d40.zip | |
Add empty talpid subproject
Talpid classes will be moved in a following commit.
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 2 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 5 | ||||
| -rw-r--r-- | android/settings.gradle.kts | 1 | ||||
| -rw-r--r-- | android/talpid/build.gradle.kts | 45 | ||||
| -rw-r--r-- | android/talpid/src/main/AndroidManifest.xml | 2 |
5 files changed, 55 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 44ea1f7f32..3ee58ed4f5 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -167,6 +167,8 @@ play { } dependencies { + implementation(project(Dependencies.Mullvad.talpid)) + implementation(Dependencies.androidMaterial) implementation(Dependencies.commonsValidator) implementation(Dependencies.AndroidX.appcompat) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 300ffb7dd9..901df77c10 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -86,6 +86,7 @@ object Dependencies { const val aaptWindows = "com.android.tools.build:aapt2:${Versions.Plugin.aapt}:windows" const val android = "com.android.tools.build:gradle:${Versions.Plugin.android}" const val androidApplicationId = "com.android.application" + const val androidLibraryId = "com.android.library" const val androidTestId = "com.android.test" const val playPublisher = "com.github.triplet.gradle:play-publisher:${Versions.Plugin.playPublisher}" @@ -98,4 +99,8 @@ object Dependencies { const val dependencyCheckId = "org.owasp.dependencycheck" const val gradleVersionsId = "com.github.ben-manes.versions" } + + object Mullvad { + const val talpid = ":talpid" + } } diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index cc8e04d837..ba0f7d8f61 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -1,2 +1,3 @@ include(":app") include(":e2e") +include(":talpid") diff --git a/android/talpid/build.gradle.kts b/android/talpid/build.gradle.kts new file mode 100644 index 0000000000..3a26122296 --- /dev/null +++ b/android/talpid/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + id(Dependencies.Plugin.androidLibraryId) + id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.kotlinParcelizeId) +} + +android { + compileSdkVersion(Versions.Android.compileSdkVersion) + + defaultConfig { + minSdkVersion(Versions.Android.minSdkVersion) + targetSdkVersion(Versions.Android.targetSdkVersion) + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + sourceSets { + getByName("main") { + java.srcDirs("src/main/kotlin/") + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = Versions.jvmTarget + } +} + +configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> { + // Skip the lintClassPath configuration, which relies on many dependencies that has been flagged + // to have CVEs, as it's related to the lint tooling rather than the project's compilation class + // path. The alternative would be to suppress specific CVEs, however that could potentially + // result in suppressed CVEs in project compilation class path. + skipConfigurations = listOf("lintClassPath") +} + +dependencies { + implementation(Dependencies.AndroidX.coreKtx) + implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) + implementation(Dependencies.Kotlin.stdlib) + implementation(Dependencies.KotlinX.coroutinesAndroid) +} diff --git a/android/talpid/src/main/AndroidManifest.xml b/android/talpid/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..1ee361e94f --- /dev/null +++ b/android/talpid/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest package="net.mullvad.mullvadvpn.talpid" /> |
