diff options
author | Allan Wang <me@allanwang.ca> | 2018-12-24 00:27:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-24 00:27:25 -0500 |
commit | a380adea1052d39f23c9c4d432a9380ce347d6c4 (patch) | |
tree | cdbb6835cdc3c04df24af2323341d765f64ab2e3 /sample/build.gradle | |
parent | 98a7f378399546086e23e25514b705e037068058 (diff) | |
download | kau-a380adea1052d39f23c9c4d432a9380ce347d6c4.tar.gz kau-a380adea1052d39f23c9c4d432a9380ce347d6c4.tar.bz2 kau-a380adea1052d39f23c9c4d432a9380ce347d6c4.zip |
Migrate to androidx (#178)
* Initial refactor
* Remove alpha version usages
* Update test code
* Add tests for checkbox
* Fix invalid card import
* Remove more old support content
* Update kotlin version
* Add back kotterknife with new imports
* Update docs
* Use bold notice
* Add changelog
* Remove deprecation for kotterknife
* Remove unused dependencies
* Update changelog
Diffstat (limited to 'sample/build.gradle')
-rw-r--r-- | sample/build.gradle | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/sample/build.gradle b/sample/build.gradle index d7199a3..e9e5a2e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -27,7 +27,7 @@ android { versionName androidGitVersion.name() versionCode androidGitVersion.code() multiDexEnabled true - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } def releaseSigning = file("../files/kau.properties") @@ -101,6 +101,18 @@ android { } } } + + // See https://github.com/facebook/flipper/issues/146 + configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + def requested = details.requested + if (requested.group == "com.android.support") { + if (!requested.name.startsWith("multidex")) { + details.useVersion "26.+" + } + } + } + } } dependencies { @@ -113,17 +125,13 @@ dependencies { implementation project(':searchview') implementation project(':mediapicker') -// androidTestImplementation("com.android.support.test.espresso:espresso-core:${kau.espresso}") { -// exclude group: 'com.android.support', module: 'support-annotations' -// } -// androidTestImplementation("com.android.support.test:runner:${kau.testRunner}") { -// exclude group: 'com.android.support', module: 'support-annotations' -// } -// androidTestImplementation kauDependency.kotlinTest testImplementation kauDependency.kotlinTest testImplementation kauDependency.junit androidTestImplementation kauDependency.kotlinTest androidTestImplementation kauDependency.espresso + androidTestImplementation "androidx.test.espresso:espresso-intents:${kau.espresso}" + androidTestImplementation "androidx.test.espresso:espresso-contrib:${kau.espresso}" + androidTestImplementation kauDependency.testRules androidTestImplementation kauDependency.testRunner } |