summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-07-25 14:03:57 +0200
committerAlbin <albin@mullvad.net>2023-07-25 16:03:51 +0200
commitea29b9309d85a29783969e7372bb1faa928dd370 (patch)
treefeb4a73d30474caef44b1584954f443d739db22b /android
parent3fb0a7b1928bd32b4454cca74a258820dce5cd15 (diff)
downloadmullvadvpn-ea29b9309d85a29783969e7372bb1faa928dd370.tar.xz
mullvadvpn-ea29b9309d85a29783969e7372bb1faa928dd370.zip
Add empty model module
Diffstat (limited to 'android')
-rw-r--r--android/app/build.gradle.kts1
-rw-r--r--android/buildSrc/src/main/kotlin/Dependencies.kt1
-rw-r--r--android/lib/model/build.gradle.kts38
-rw-r--r--android/lib/model/src/main/AndroidManifest.xml1
-rw-r--r--android/settings.gradle.kts1
5 files changed, 42 insertions, 0 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index ec787deeaa..835aa9cba0 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.modelLib))
implementation(project(Dependencies.Mullvad.talpidLib))
implementation(Dependencies.androidMaterial)
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 172aa0adda..c68925ee68 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 modelLib = ":lib:model"
const val talpidLib = ":lib:talpid"
}
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts
new file mode 100644
index 0000000000..0efad3b31f
--- /dev/null
+++ b/android/lib/model/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+ id(Dependencies.Plugin.androidLibraryId)
+ id(Dependencies.Plugin.kotlinAndroidId)
+ id(Dependencies.Plugin.kotlinParcelizeId)
+}
+
+android {
+ namespace = "net.mullvad.mullvadvpn.model"
+ 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.talpidLib))
+
+ implementation(Dependencies.jodaTime)
+ implementation(Dependencies.Kotlin.stdlib)
+ implementation(Dependencies.KotlinX.coroutinesAndroid)
+}
diff --git a/android/lib/model/src/main/AndroidManifest.xml b/android/lib/model/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..cc947c5679
--- /dev/null
+++ b/android/lib/model/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 9e838aedfd..511cf03b9e 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -1,6 +1,7 @@
include(":app")
include(
":lib:endpoint",
+ ":lib:model:",
":lib:talpid:"
)
include(