From b6b862d4c341d08452d8b5a1548823dae29795b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Fri, 7 Jun 2019 14:12:52 +0200 Subject: [PATCH] Organize AndroidX libraries (#404) --- .travis.yml | 6 +++--- app/build.gradle | 53 ++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c40f615..863e23e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -#branches: -# only: -# - develop +branches: + only: + - develop android: licenses: diff --git a/app/build.gradle b/app/build.gradle index 915d9a76..c4f9ac36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,18 +98,23 @@ play { } dependencies { - implementation 'io.github.wulkanowy:api:0.9.1' + implementation "io.github.wulkanowy:api:0.9.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "androidx.legacy:legacy-support-v4:1.0.0" + implementation "androidx.core:core:1.0.2" implementation "androidx.appcompat:appcompat:1.0.2" - implementation 'androidx.multidex:multidex:2.0.1' + implementation "androidx.fragment:fragment:1.0.0" + implementation "androidx.annotation:annotation:1.1.0" + implementation "androidx.multidex:multidex:2.0.1" - implementation "androidx.cardview:cardview:1.0.0" - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "androidx.viewpager:viewpager:1.0.0" + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + implementation "androidx.constraintlayout:constraintlayout:1.1.3" + implementation "androidx.coordinatorlayout:coordinatorlayout:1.0.0" implementation "com.google.android.material:material:1.1.0-alpha07" - implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f' - implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' + implementation "com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f" + implementation "com.github.PhilJay:MPAndroidChart:v3.1.0" implementation "androidx.work:work-runtime:2.0.1" implementation "androidx.work:work-rxjava2:2.0.1" @@ -121,51 +126,51 @@ dependencies { implementation "com.google.dagger:dagger-android-support:2.23.1" kapt "com.google.dagger:dagger-compiler:2.23.1" kapt "com.google.dagger:dagger-android-processor:2.23.1" - implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0' - kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0' + implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0" + kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0" implementation "eu.davidea:flexible-adapter:5.1.0" implementation "eu.davidea:flexible-adapter-ui:1.0.0" implementation "com.aurelhubert:ahbottomnavigation:2.3.4" - implementation 'com.ncapdevi:frag-nav:3.2.0' + implementation "com.ncapdevi:frag-nav:3.2.0" - implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.3' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3" + implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation "io.reactivex.rxjava2:rxjava:2.2.9" - implementation 'com.google.code.gson:gson:2.8.5' + implementation "com.google.code.gson:gson:2.8.5" implementation "com.jakewharton.threetenabp:threetenabp:1.2.1" implementation "com.jakewharton.timber:timber:4.7.1" implementation "at.favre.lib:slf4j-timber:1.0.1" implementation "com.squareup.okhttp3:logging-interceptor:3.12.3" implementation "com.mikepenz:aboutlibraries:6.2.3" - implementation 'com.takisoft.preferencex:preferencex:1.0.0' + implementation "com.takisoft.preferencex:preferencex:1.0.0" - playImplementation 'com.google.firebase:firebase-core:16.0.9' - playImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' + playImplementation "com.google.firebase:firebase-core:16.0.9" + playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1" - releaseImplementation 'fr.o80.chucker:library-no-op:2.0.4' + releaseImplementation "fr.o80.chucker:library-no-op:2.0.4" - debugImplementation 'fr.o80.chucker:library:2.0.4' + debugImplementation "fr.o80.chucker:library:2.0.4" debugImplementation "com.amitshekhar.android:debug-db:1.0.6" testImplementation "junit:junit:4.12" testImplementation "io.mockk:mockk:1.9.2" - testImplementation 'org.threeten:threetenbp:1.4.0' + testImplementation "org.threeten:threetenbp:1.4.0" testImplementation "org.mockito:mockito-core:2.28.2" testImplementation("org.mockito:mockito-inline:2.28.2") { - exclude group: 'org.mockito', module: 'mockito-core' + exclude group: "org.mockito", module: "mockito-core" } - androidTestImplementation 'androidx.test:core:1.2.0' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation "androidx.test:core:1.2.0" + androidTestImplementation "androidx.test:runner:1.2.0" + androidTestImplementation "androidx.test.ext:junit:1.1.1" androidTestImplementation "io.mockk:mockk-android:1.9.2" androidTestImplementation "androidx.room:room-testing:2.1.0-rc01" androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" androidTestImplementation "org.mockito:mockito-core:2.28.2" - androidTestImplementation('org.mockito:mockito-android:2.28.2') { + androidTestImplementation("org.mockito:mockito-android:2.28.2") { exclude group: 'org.mockito', module: 'mockito-core' } }