From 483e8d9310aea2e8bb88f77b89c0affdb8794427 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 12 Oct 2018 19:36:04 +0530 Subject: Migrate to AndroidX (#430) * Update gradle and external dependencies - Switch away from deprecated compile directive - Remove explicit buildToolsVersion, is defined by the gradle plugin now - Fix build in SelectFolderActivity Signed-off-by: Harsh Shandilya * Upgrade gradle plugin and wrapper to latest alpha Signed-off-by: Harsh Shandilya * Don't use alpha gradle plugin Signed-off-by: Harsh Shandilya * Migrate to AndroidX https://developer.android.com/jetpack/androidx/ Signed-off-by: Harsh Shandilya * Upgrade AndroidX dependencies to stable release Signed-off-by: Harsh Shandilya * Enable Jetifier Signed-off-by: Harsh Shandilya * SelectFolderFragment: Fix build Signed-off-by: Harsh Shandilya --- app/build.gradle | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 5c4b30d2..28895b1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,15 +4,15 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'eclipse' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.zeapo.pwdstore" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 95 versionName "1.2.0.75" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 @@ -55,11 +55,11 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:support-annotations:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.annotation:annotation:1.0.0' implementation 'org.sufficientlysecure:openpgp-api:11.0' implementation 'com.nononsenseapps:filepicker:2.4.2' implementation('org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r') { @@ -70,15 +70,15 @@ dependencies { implementation 'commons-codec:commons-codec:1.11' implementation 'com.jayway.android.robotium:robotium-solo:5.3.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // Testing-only dependencies androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'org.mockito:mockito-core:2.18.0' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' + androidTestImplementation 'androidx.test:rules:1.1.0-alpha4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-alpha4' } -- cgit v1.2.3