diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-16 14:45:57 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-17 10:32:31 +0200 |
| commit | cb6130ac5d57bd40f6d35e55c1633e9fd61031ce (patch) | |
| tree | 03e8162a57ff0d041b787ef8519f7d2ce8e15cd4 /android/lib | |
| parent | 1a1c67fc31bb4cbae0f9341b0c3046743cae661c (diff) | |
| download | mullvadvpn-cb6130ac5d57bd40f6d35e55c1633e9fd61031ce.tar.xz mullvadvpn-cb6130ac5d57bd40f6d35e55c1633e9fd61031ce.zip | |
Format build files
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/billing/build.gradle.kts | 23 | ||||
| -rw-r--r-- | android/lib/common-test/build.gradle.kts | 11 | ||||
| -rw-r--r-- | android/lib/endpoint/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/payment/build.gradle.kts | 15 |
4 files changed, 25 insertions, 28 deletions
diff --git a/android/lib/billing/build.gradle.kts b/android/lib/billing/build.gradle.kts index ea89bc6dca..c901bd53dd 100644 --- a/android/lib/billing/build.gradle.kts +++ b/android/lib/billing/build.gradle.kts @@ -19,9 +19,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = Versions.jvmTarget - } + kotlinOptions { jvmTarget = Versions.jvmTarget } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") @@ -31,11 +29,12 @@ android { packaging { resources { - pickFirsts += setOf( - // Fixes packaging error caused by: jetified-junit-* - "META-INF/LICENSE.md", - "META-INF/LICENSE-notice.md" - ) + pickFirsts += + setOf( + // Fixes packaging error caused by: jetified-junit-* + "META-INF/LICENSE.md", + "META-INF/LICENSE-notice.md", + ) } } } @@ -44,16 +43,16 @@ dependencies { implementation(libs.kotlin.stdlib) implementation(libs.kotlinx.coroutines.android) - //Billing library + // Billing library implementation(libs.android.billingclient) - //Model + // Model implementation(projects.lib.model) - //Payment library + // Payment library implementation(projects.lib.payment) - //Either + // Either implementation(libs.arrow) // Management service diff --git a/android/lib/common-test/build.gradle.kts b/android/lib/common-test/build.gradle.kts index 0f96eca415..aa0b13f76c 100644 --- a/android/lib/common-test/build.gradle.kts +++ b/android/lib/common-test/build.gradle.kts @@ -24,11 +24,12 @@ android { packaging { resources { - pickFirsts += setOf( - // Fixes packaging error caused by: jetified-junit-* - "META-INF/LICENSE.md", - "META-INF/LICENSE-notice.md" - ) + pickFirsts += + setOf( + // Fixes packaging error caused by: jetified-junit-* + "META-INF/LICENSE.md", + "META-INF/LICENSE-notice.md", + ) } } } diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts index 638be8b122..2a20310281 100644 --- a/android/lib/endpoint/build.gradle.kts +++ b/android/lib/endpoint/build.gradle.kts @@ -22,9 +22,7 @@ android { abortOnError = true warningsAsErrors = true } - buildFeatures { - buildConfig = true - } + buildFeatures { buildConfig = true } } dependencies { implementation(libs.kotlin.stdlib) } diff --git a/android/lib/payment/build.gradle.kts b/android/lib/payment/build.gradle.kts index 57a16627a1..6e4b9292d7 100644 --- a/android/lib/payment/build.gradle.kts +++ b/android/lib/payment/build.gradle.kts @@ -17,9 +17,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = Versions.jvmTarget - } + kotlinOptions { jvmTarget = Versions.jvmTarget } lint { lintConfig = file("${rootProject.projectDir}/config/lint.xml") @@ -29,11 +27,12 @@ android { packaging { resources { - pickFirsts += setOf( - // Fixes packaging error caused by: jetified-junit-* - "META-INF/LICENSE.md", - "META-INF/LICENSE-notice.md" - ) + pickFirsts += + setOf( + // Fixes packaging error caused by: jetified-junit-* + "META-INF/LICENSE.md", + "META-INF/LICENSE-notice.md", + ) } } } |