diff options
| author | Albin <albin@mullvad.net> | 2021-09-16 16:00:35 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2021-10-04 13:21:22 +0200 |
| commit | d735b36a819cde2f7e3dd8b60281b641bbf531dc (patch) | |
| tree | c50da0e32b0c2cd374a6a30bc87d964f32b6df9e /android | |
| parent | 8ff5fb4524cb436253f83c7b14ff61cbc2c0a946 (diff) | |
| download | mullvadvpn-d735b36a819cde2f7e3dd8b60281b641bbf531dc.tar.xz mullvadvpn-d735b36a819cde2f7e3dd8b60281b641bbf531dc.zip | |
Migrate from JCenter to mavenCentral
JCenter has been sunset and should no longer be relied on as per:
https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
The migration also required the following changes:
* Updated Koin maven group id as per the official documentation at:
https://insert-koin.io/docs/setup/v2/
* Bump MockK version due to old versions of one of its dependencies'
(dexmaker) not being available at mavenCentral.
* Fix mockK instrumentation lib issue.
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle | 20 | ||||
| -rw-r--r-- | android/src/androidTest/AndroidManifest.xml | 8 |
2 files changed, 18 insertions, 10 deletions
diff --git a/android/build.gradle b/android/build.gradle index 8a7d7e2a16..278bef878e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -124,8 +124,8 @@ play { } repositories { - jcenter() google() + mavenCentral() } dependencies { @@ -142,18 +142,18 @@ dependencies { implementation "joda-time:joda-time:2.10.2" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3" - implementation "org.koin:koin-core:$koinVersion" - implementation "org.koin:koin-core-ext:$koinVersion" - implementation "org.koin:koin-androidx-fragment:$koinVersion" - implementation "org.koin:koin-androidx-scope:$koinVersion" - implementation "org.koin:koin-androidx-viewmodel:$koinVersion" + implementation "io.insert-koin:koin-core:$koinVersion" + implementation "io.insert-koin:koin-core-ext:$koinVersion" + implementation "io.insert-koin:koin-androidx-fragment:$koinVersion" + implementation "io.insert-koin:koin-androidx-scope:$koinVersion" + implementation "io.insert-koin:koin-androidx-viewmodel:$koinVersion" /* Test dependencies */ testImplementation "io.mockk:mockk:$mockkVersion" testImplementation "junit:junit:4.13" testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3" - testImplementation "org.koin:koin-test:$koinVersion" + testImplementation "io.insert-koin:koin-test:$koinVersion" /* UI test dependencies */ debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion" @@ -161,7 +161,7 @@ dependencies { androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.ext:junit:1.1.2" androidTestImplementation "io.mockk:mockk-android:$mockkVersion" - androidTestImplementation "org.koin:koin-test:$koinVersion" + androidTestImplementation "io.insert-koin:koin-test:$koinVersion" androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" // debugImplementation because LeakCanary should only run in debug builds. // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' @@ -173,11 +173,11 @@ buildscript { fragmentVersion = "1.3.2" koinVersion = '2.2.2' kotlinVersion = '1.4.31' - mockkVersion = '1.10.6' + mockkVersion = '1.12.0' } repositories { - jcenter() google() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" diff --git a/android/src/androidTest/AndroidManifest.xml b/android/src/androidTest/AndroidManifest.xml new file mode 100644 index 0000000000..41b8daf8c8 --- /dev/null +++ b/android/src/androidTest/AndroidManifest.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="net.mullvad.mullvadvpn.test"> + + <!-- Required on certain Android versions and/or ABIs + https://github.com/mockk/mockk/issues/297#issuecomment-641361770 --> + <application android:extractNativeLibs="true" /> +</manifest> |