cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to androidx

Browse Source
This commit is contained in:
Vincent Breitmoser
2019-11-15 12:09:08 +01:00
parent 5cd210831b
commit 5172002f0e
343 changed files with 946 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenKeychain/build.gradle
View File

@@ -7,12 +7,12 @@ dependencies {
// NOTE: libraries are pinned to a specific build, see below
// from local Android SDK
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.annotation:annotation:1.1.0'
// JCenter etc.
implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
@@ -29,7 +29,7 @@ dependencies {
implementation 'com.jpardogo.materialtabstrip:library:1.1.1'
implementation 'com.getbase:floatingactionbutton:1.10.1'
implementation 'com.nispok:snackbar:2.11.0'
implementation 'com.cocosw:bottomsheet:1.3.1@aar'
implementation 'com.cocosw:bottomsheet:1.5.0@aar'
// RecyclerView
implementation 'eu.davidea:flexible-adapter:5.0.5'
@@ -60,7 +60,7 @@ dependencies {
implementation project(':extern:bouncycastle:prov')
implementation project(':extern:MaterialChipsInput')
implementation "android.arch.work:work-runtime:1.0.0-alpha02"
implementation 'androidx.work:work-runtime:2.2.0'
// Unit tests in the local JVM with Robolectric
// https://developer.android.com/training/testing/unit-testing/local-unit-tests.html
@@ -75,14 +75,14 @@ dependencies {
// UI testing with Espresso
// Force usage of support libs in the test app, since they are internally used by the runner module.
// https://github.com/googlesamples/android-testing/blob/master/ui/espresso/BasicSample/app/build.gradle#L28
androidTestCompile 'com.android.support:support-annotations:27.1.1'
androidTestCompile 'com.android.support:appcompat-v7:27.1.1'
androidTestCompile 'com.android.support:design:27.1.1'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2.2') {
androidTestCompile 'androidx.annotation:annotation:1.0.0'
androidTestCompile 'androidx.appcompat:appcompat:1.0.0'
androidTestCompile 'com.google.android.material:material:1.0.0'
androidTestCompile 'androidx.test.ext:junit:1.1.1'
androidTestCompile 'androidx.test:rules:1.1.1'
androidTestCompile 'androidx.test.espresso:espresso-core:3.1.0'
androidTestCompile 'androidx.test.espresso:espresso-intents:3.1.0'
androidTestCompile ('androidx.test.espresso:espresso-contrib:3.1.0') {
exclude group: 'com.android.support', module: 'appcompat'
exclude group: 'com.android.support', module: 'support-v4'
exclude module: 'recyclerview-v7'
@@ -96,11 +96,11 @@ dependencies {
annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:0.2.5"
implementation 'com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.5'
implementation "android.arch.lifecycle:extensions:1.0.0"
annotationProcessor "android.arch.lifecycle:compiler:1.0.0"
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
implementation "android.arch.persistence:db-framework:1.0.0"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.sqlite:sqlite-framework:2.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
// for debugging the db. don't enable by default, this will expose the database no the network!
// debugImplementation 'com.amitshekhar.android:debug-db:1.0.3'
@@ -117,7 +117,7 @@ android {
applicationId "org.sufficientlysecure.keychain"
// the androidjunitrunner is broken regarding coverage, see here:
// https://code.google.com/p/android/issues/detail?id=170607
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// this workaround runner fixes the coverage problem, BUT doesn't work
// with android studio single test execution. use it to generate coverage
// data, but keep the other one otherwis