Add empty project :lib:endpoint

7 files changed, 40 insertions, 1 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index fca19d5917..d267e0cd6a 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -67,10 +67,12 @@ android {
             initWith(buildTypes.getByName("release"))
             isMinifyEnabled = false
             signingConfig = null
+            matchingFallbacks += "release"
         }
 
         create("leakCanary") {
             initWith(buildTypes.getByName("debug"))
+            matchingFallbacks += "debug"
         }
     }
 
@@ -176,6 +178,8 @@ play {
 }
 
 dependencies {
+    implementation(project(Dependencies.Mullvad.endpointLib))
+
     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 3e70469220..48a0ef6b41 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -86,6 +86,10 @@ object Dependencies {
         const val android = "io.mockk:mockk-android:${Versions.mockk}"
     }
 
+    object Mullvad {
+        const val endpointLib = ":lib:endpoint"
+    }
+
     object Plugin {
         const val aaptLinux = "com.android.tools.build:aapt2:${Versions.Plugin.androidAapt}:linux"
         const val aaptOsx = "com.android.tools.build:aapt2:${Versions.Plugin.androidAapt}:osx"
diff --git a/android/lib/build.gradle.kts b/android/lib/build.gradle.kts
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/android/lib/build.gradle.kts
diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts
new file mode 100644
index 0000000000..d289749704
--- /dev/null
+++ b/android/lib/endpoint/build.gradle.kts
@@ -0,0 +1,28 @@
+plugins {
+    id(Dependencies.Plugin.androidLibraryId)
+    id(Dependencies.Plugin.kotlinAndroidId)
+    id(Dependencies.Plugin.kotlinParcelizeId)
+}
+
+android {
+    namespace = "net.mullvad.mullvadvpn.lib.endpoint"
+    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
+    }
+}
+
+dependencies {
+    implementation(Dependencies.Kotlin.stdlib)
+}
diff --git a/android/lib/endpoint/src/main/AndroidManifest.xml b/android/lib/endpoint/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..cc947c5679
--- /dev/null
+++ b/android/lib/endpoint/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 931e398bdc..755fa4bbb6 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -1,2 +1,2 @@
-include(":app")
+include(":app", ":lib:endpoint")
 include(":test", ":test:common", ":test:e2e")
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 569d858dfd..78d0124aa9 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -32,6 +32,8 @@ androidComponents {
 }
 
 dependencies {
+    implementation(project(Dependencies.Mullvad.endpointLib))
+
     implementation(Dependencies.AndroidX.testCore)
     implementation(Dependencies.AndroidX.testRunner)
     implementation(Dependencies.AndroidX.testRules)