Merge branch 'migrate-android-talpid-to-dedicated-subproject'

21 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" />
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index 51ed63bd0a..51ed63bd0a 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
index 150382bb1a..150382bb1a 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 7a9160c684..7a9160c684 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
index 8937bd0122..8937bd0122 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
index 5efb1bcb1c..5efb1bcb1c 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
index 5c081b392e..5c081b392e 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
index 79e8ce544c..79e8ce544c 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
index a8490b48bf..a8490b48bf 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
index 7efd3f7763..7efd3f7763 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
index 365ac0811b..365ac0811b 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
index 2c5ba00bf5..2c5ba00bf5 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
index f5b79bdfd5..f5b79bdfd5 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
index 51fa8ac461..51fa8ac461 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
index fb038f1243..fb038f1243 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifierExtensions.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/EventNotifierExtensions.kt
index 454cae6133..454cae6133 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifierExtensions.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/EventNotifierExtensions.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt
index d310deb884..d310deb884 100644
--- a/android/app/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt
+++ b/android/talpid/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt