Permalink
Browse files

Start of moving dependencies to buildSrc

  • Loading branch information...
chrisbanes committed Jan 6, 2019
1 parent a8cd1c5 commit 5b06ce590eb713ef7ec0bfa363c71090cdf9034f
@@ -5,7 +5,7 @@
/.idea/libraries
/.idea/caches
.DS_Store
build
build/
captures
.externalNativeBuild

@@ -12,6 +12,7 @@
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/base" />
<option value="$PROJECT_DIR$/base-android" />
<option value="$PROJECT_DIR$/buildSrc" />
<option value="$PROJECT_DIR$/data" />
<option value="$PROJECT_DIR$/data-android" />
<option value="$PROJECT_DIR$/datasources" />
@@ -5,6 +5,7 @@
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/base/base.iml" filepath="$PROJECT_DIR$/base/base.iml" />
<module fileurl="file://$PROJECT_DIR$/base-android/base-android.iml" filepath="$PROJECT_DIR$/base-android/base-android.iml" />
<module fileurl="file://$PROJECT_DIR$/buildSrc/buildSrc.iml" filepath="$PROJECT_DIR$/buildSrc/buildSrc.iml" />
<module fileurl="file://$PROJECT_DIR$/data/data.iml" filepath="$PROJECT_DIR$/data/data.iml" />
<module fileurl="file://$PROJECT_DIR$/data-android/data-android.iml" filepath="$PROJECT_DIR$/data-android/data-android.iml" />
<module fileurl="file://$PROJECT_DIR$/datasources/datasources.iml" filepath="$PROJECT_DIR$/datasources/datasources.iml" />
@@ -15,6 +15,8 @@
*
*/

import app.tivi.buildsrc.Libs

ext {
ci = System.getenv("CI") == "true"
}
@@ -142,10 +144,6 @@ android {
proguardFiles 'proguard-rules.pro'
}
}

configurations.all {
resolutionStrategy.force "com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02"
}
}

dependencies {
@@ -159,80 +157,68 @@ dependencies {
implementation project(':interactors')
implementation project(":tasks")

implementation "androidx.lifecycle:lifecycle-extensions:${versions.androidx.lifecycle}"
implementation "androidx.lifecycle:lifecycle-reactivestreams:${versions.androidx.lifecycle}"
kapt "androidx.lifecycle:lifecycle-compiler:${versions.androidx.lifecycle}"

implementation "androidx.room:room-runtime:${versions.androidx.room}"

implementation "androidx.paging:paging-runtime:${versions.androidx.paging}"
implementation "androidx.paging:paging-rxjava2:${versions.androidx.paging}"

implementation "androidx.appcompat:appcompat:${versions.androidx.appcompat}"
implementation "com.google.android.material:material:${versions.material_design}"
implementation "androidx.browser:browser:${versions.androidx.browser}"
implementation "androidx.palette:palette:${versions.androidx.palette}"
implementation "androidx.recyclerview:recyclerview:${versions.androidx.recyclerview}"
implementation "androidx.emoji:emoji:${versions.androidx.emoji}"

implementation "androidx.preference:preference:${versions.androidx.preference}"

implementation "android.arch.work:work-runtime-ktx:${versions.androidx.work}"

implementation "androidx.constraintlayout:constraintlayout:${versions.androidx.constraint_layout}"

implementation "androidx.core:core-ktx:${versions.androidx.core_ktx}"

implementation "com.jakewharton.threetenabp:threetenabp:${versions.threetenabp}"
implementation Libs.AndroidX.Lifecycle.extensions
implementation Libs.AndroidX.Lifecycle.reactive
kapt Libs.AndroidX.Lifecycle.compiler

implementation "io.reactivex.rxjava2:rxjava:${versions.rx}"
implementation "io.reactivex.rxjava2:rxkotlin:${versions.rxkotlin}"
implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
implementation Libs.AndroidX.Paging.runtime
implementation Libs.AndroidX.Paging.rxjava2

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
implementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
implementation Libs.AndroidX.appcompat
implementation Libs.AndroidX.browser
implementation Libs.AndroidX.palette
implementation Libs.AndroidX.recyclerview
implementation Libs.AndroidX.emoji
implementation Libs.AndroidX.preference
implementation Libs.AndroidX.constraintlayout
implementation Libs.AndroidX.coreKtx

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:${versions.coroutines}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
implementation Libs.Google.material

implementation "org.jetbrains:annotations:16.0.3"
implementation Libs.threeTenAbp

implementation "com.google.dagger:dagger-android:${versions.dagger}"
implementation "com.google.dagger:dagger-android-support:${versions.dagger}"
kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
kapt "com.google.dagger:dagger-android-processor:${versions.dagger}"
implementation Libs.RxJava.rxJava
implementation Libs.RxJava.rxKotlin
implementation Libs.RxJava.rxAndroid

compileOnly "com.squareup.inject:assisted-inject-annotations-dagger2:${versions.assistedinject}"
kapt "com.squareup.inject:assisted-inject-processor-dagger2:${versions.assistedinject}"
implementation Libs.Kotlin.stdlib
implementation Libs.Kotlin.reflect

implementation "com.github.bumptech.glide:glide:${versions.glide}"
kapt "com.github.bumptech.glide:compiler:${versions.glide}"
implementation Libs.Coroutines.core
implementation Libs.Coroutines.rx2
implementation Libs.Coroutines.android

implementation 'com.airbnb.android:mvrx:0.6.0'
implementation Libs.Dagger.androidSupport
kapt Libs.Dagger.compiler
kapt Libs.Dagger.androidProcessor

implementation "com.airbnb.android:epoxy:${versions.epoxy}"
implementation "com.airbnb.android:epoxy-paging:${versions.epoxy}"
implementation "com.airbnb.android:epoxy-databinding:${versions.epoxy}"
kapt "com.airbnb.android:epoxy-processor:${versions.epoxy}"
compileOnly Libs.AssistedInject.annotationDagger2
kapt Libs.AssistedInject.processorDagger2

implementation 'com.github.rubensousa:gravitysnaphelper:2.0'
implementation Libs.Glide.glide
kapt Libs.Glide.compiler

debugImplementation "nl.littlerobots.rxlint:rxlint:${versions.rxlint}"
implementation Libs.mvRx

implementation "com.google.firebase:firebase-core:${versions.firebase}"
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
implementation Libs.Epoxy.epoxy
implementation Libs.Epoxy.paging
implementation Libs.Epoxy.dataBinding
kapt Libs.Epoxy.processor

testImplementation "junit:junit:${versions.junit}"
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
implementation Libs.gravitySnapHelper

testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockito_kotlin}"
debugImplementation Libs.rxLint

testImplementation "androidx.test:core:${versions.androidx.test_core}"
testImplementation "androidx.test:runner:${versions.androidx.test_runner}"
testImplementation "androidx.test:rules:${versions.androidx.test_rules}"
implementation Libs.Google.firebaseCore
implementation Libs.Google.crashlytics

testImplementation "androidx.test.espresso:espresso-core:${versions.espresso}"
testImplementation Libs.junit
testImplementation Libs.robolectric
testImplementation Libs.mockitoKotlin
testImplementation Libs.AndroidX.Test.core
testImplementation Libs.AndroidX.Test.runner
testImplementation Libs.AndroidX.Test.rules
testImplementation Libs.AndroidX.Test.espressoCore
}

def getGitHash() {
@@ -15,6 +15,8 @@
*
*/

import app.tivi.buildsrc.Libs

apply plugin: 'com.android.library'

apply plugin: 'kotlin-android'
@@ -34,9 +36,7 @@ android {

dependencies {
implementation project(":base")
implementation "androidx.fragment:fragment:${versions.androidx.fragment}"
implementation 'com.jakewharton.timber:timber:4.7.1'

implementation "androidx.arch.core:core-runtime:${versions.androidx.arch_core}"
implementation "androidx.arch.core:core-common:${versions.androidx.arch_core}"
implementation Libs.AndroidX.fragment
implementation Libs.timber
}
@@ -15,15 +15,18 @@
*
*/

import app.tivi.buildsrc.Libs

apply plugin: 'kotlin'

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}"
compile "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:${versions.coroutines}"
compile Libs.Kotlin.stdlib

compile Libs.Coroutines.core
compile Libs.Coroutines.rx2

compile "com.google.dagger:dagger:${versions.dagger}"
compile Libs.Dagger.dagger

compile "com.squareup.retrofit2:retrofit:${versions.retrofit}"
compile 'com.squareup.okhttp3:logging-interceptor:3.12.1'
compile Libs.Retrofit.retrofit
compile Libs.OkHttp.loggingInterceptor
}
@@ -15,52 +15,10 @@
*
*/

buildscript {
ext.versions = [
'android_gradle' : '3.3.0',
'androidx' : [
'appcompat' : '1.0.2',
'browser' : '1.0.0',
'arch_core' : '2.0.0',
'constraint_layout': '2.0.0-alpha3',
'core_ktx' : '1.0.1',
'fragment' : '1.0.0',
'emoji' : '1.0.0',
'lifecycle' : '2.0.0',
'paging' : '2.0.0',
'palette' : '1.0.0',
'preference' : '1.1.0-alpha02',
'recyclerview' : '1.0.0',
'room' : '2.0.0',
'test_arch_core' : '2.0.0',
'test_core' : '1.1.0',
'test_junit' : '1.1.0',
'test_runner' : '1.1.1',
'test_rules' : '1.1.1',
'work' : '1.0.0-beta01'
],
'coroutines' : '1.1.0',
'dagger' : '2.20',
'assistedinject' : '0.3.2',
'epoxy' : '3.1.0',
'espresso' : '3.1.1',
'firebase' : '16.0.4',
'glide' : '4.8.0',
'kotlin' : '1.3.20-eap-52',
'ktlint' : '0.29.0',
'mockito' : '2.18.3',
'material_design': '1.1.0-alpha02',
'rx' : '2.2.5',
'rxkotlin' : '2.3.0',
'rxlint' : '1.7.2',
'threetenbp' : '1.3.8',
'threetenabp' : '1.1.1',
'retrofit' : '2.5.0',
'junit' : '4.12',
'robolectric' : '4.1',
'mockito_kotlin' : '2.1.0'
]
import app.tivi.buildsrc.Libs
import app.tivi.buildsrc.Versions

buildscript {
ext.buildConfig = [
'compileSdk': 28,
'minSdk' : 23,
@@ -77,18 +35,16 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:${versions.android_gradle}"
classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'

classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:${versions.kotlin}"
classpath Libs.androidGradlePlugin

classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
classpath Libs.Kotlin.gradlePlugin
classpath Libs.Kotlin.extensions

classpath 'com.github.triplet.gradle:play-publisher:2.0.0'
classpath Libs.dexcountGradlePlugin
classpath Libs.playPublisherPlugin

classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.27.0'
classpath Libs.Google.gmsGoogleServices
classpath Libs.Google.fabricPlugin
}
}

@@ -111,7 +67,7 @@ subprojects {
spotless {
kotlin {
target "**/*.kt"
ktlint(versions.ktlint)
ktlint(Versions.ktlint)
licenseHeaderFile project.rootProject.file('spotless/copyright.kt')
}
}
No changes.
Oops, something went wrong.

0 comments on commit 5b06ce5

Please sign in to comment.