From bac83aa1c7b368d0736fc4dc9bd167dbedb971e0 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 22 Apr 2020 12:09:10 -0400 Subject: [PATCH] Rearrange dependencies and update some --- app/build.gradle | 89 ++++++++++++++++++++++-------------------------- build.gradle | 16 +++------ 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6a76e789..d51c78f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,6 @@ android { targetSdkVersion 29 versionCode 33 versionName "3.0.3" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -17,73 +16,67 @@ android { } } compileOptions { - sourceCompatibility = '1.8' - targetCompatibility = '1.8' + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } -repositories { - maven { - url "http://dl.bintray.com/rilixtech/maven" - } - mavenCentral() - google() - jcenter() -} - dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha05' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.legacy:legacy-support-v13:1.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'com.google.android.exoplayer:exoplayer:2.10.4' implementation 'androidx.browser:browser:1.2.0' - implementation 'com.alexvasilkov:gesture-views:2.5.2' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'com.github.bumptech.glide:glide:4.10.0' - implementation 'com.github.pwittchen:swipe-rx2:0.3.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0' - // Room components - implementation "androidx.room:room-runtime:$rootProject.roomVersion" - annotationProcessor "androidx.room:room-compiler:$rootProject.roomVersion" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // Lifecycle components - implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archLifecycleVersion" - annotationProcessor "androidx.lifecycle:lifecycle-common-java8:$rootProject.archLifecycleVersion" - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.14' - implementation 'com.squareup.retrofit2:retrofit:2.6.2' - implementation 'com.squareup.retrofit2:converter-scalars:2.6.2' - implementation 'jp.wasabeef:glide-transformations:4.0.0' - implementation 'com.google.dagger:dagger:2.25.2' - annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2' - implementation 'com.jakewharton:butterknife:10.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' - implementation 'com.github.santalu:aspect-ratio-imageview:1.0.6' + def lifecycleVersion = '2.2.0' + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion" + annotationProcessor "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion" implementation 'androidx.paging:paging-runtime:2.1.2' + implementation 'androidx.preference:preference:1.1.1' + // Room components + def roomVersion = '2.2.5' + implementation "androidx.room:room-runtime:$roomVersion" + annotationProcessor "androidx.room:room-compiler:$roomVersion" + implementation 'androidx.work:work-runtime:2.3.4' + implementation 'com.google.android.material:material:1.2.0-alpha05' + + implementation 'com.google.android.exoplayer:exoplayer-core:2.10.4' + implementation 'com.google.android.exoplayer:exoplayer-hls:2.10.4' + implementation 'com.google.android.exoplayer:exoplayer-ui:2.10.4' + implementation 'com.alexvasilkov:gesture-views:2.6.0' + implementation 'com.github.bumptech.glide:glide:4.10.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0' + implementation 'com.github.pwittchen:swipe-rx2:0.3.0' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation 'io.reactivex.rxjava2:rxjava:2.2.19' + implementation 'com.squareup.retrofit2:retrofit:2.7.2' + implementation 'com.squareup.retrofit2:converter-scalars:2.7.2' + implementation 'jp.wasabeef:glide-transformations:4.1.0' + implementation 'com.google.dagger:dagger:2.27' + annotationProcessor 'com.google.dagger:dagger-compiler:2.27' + implementation 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' + implementation 'com.github.santalu:aspect-ratio-imageview:1.0.9' implementation 'com.lsjwzh:materialloadingprogressbar:0.5.8-RELEASE' implementation 'io.noties.markwon:core:4.3.1' implementation 'io.noties.markwon:linkify:4.3.1' implementation 'io.noties.markwon:ext-strikethrough:4.3.1' - implementation "io.noties.markwon:simple-ext:4.3.1" - implementation "io.noties.markwon:recycler-table:4.3.1" + implementation 'io.noties.markwon:simple-ext:4.3.1' + implementation 'io.noties.markwon:recycler-table:4.3.1' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' - implementation 'com.github.Ferfalk:SimpleSearchView:0.1.4' - implementation 'org.greenrobot:eventbus:3.1.1' - implementation 'com.libRG:customtextview:2.2' + implementation 'com.github.Ferfalk:SimpleSearchView:0.1.5' + implementation 'org.greenrobot:eventbus:3.2.0' + implementation 'com.libRG:customtextview:2.4' implementation 'com.github.Deishelon:RoundedBottomSheet:1.0.1' - implementation 'com.github.livefront:bridge:v1.2.0' + implementation 'com.github.livefront:bridge:v1.2.1' implementation 'com.evernote:android-state:1.4.1' annotationProcessor 'com.evernote:android-state-processor:1.4.1' - implementation 'androidx.work:work-runtime:2.3.4' - implementation 'androidx.preference:preference:1.1.0' implementation 'com.nex3z:flow-layout:1.3.0' implementation 'com.r0adkll:slidableactivity:2.1.0' implementation 'com.atlassian.commonmark:commonmark:0.13.1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'me.zhanghai.android.fastscroll:library:1.1.2' + + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/build.gradle b/build.gradle index 21615e4c..b8837c77 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' - + classpath 'com.android.tools.build:gradle:3.6.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,9 +17,10 @@ allprojects { repositories { google() jcenter() - maven { url 'https://jitpack.io' } - maven { url 'https://dl.bintray.com/sysdata/maven' } - maven { url 'http://repo.pageturner-reader.org' } + maven { url "https://jitpack.io" } + maven { url "https://dl.bintray.com/sysdata/maven" } + maven { url "https://dl.bintray.com/rilixtech/maven/" } + maven { url "http://repo.pageturner-reader.org" } mavenCentral() } } @@ -29,8 +28,3 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } - -ext { - roomVersion = '2.2.5' - archLifecycleVersion = '2.2.0' -} \ No newline at end of file