fix merge
This commit is contained in:
parent
763f54ec6f
commit
308b1690cc
|
@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt'
|
||||||
apply plugin: 'kotlin-allopen'
|
apply plugin: 'kotlin-allopen'
|
||||||
apply plugin: 'com.hiya.jacoco-android'
|
apply plugin: 'com.hiya.jacoco-android'
|
||||||
|
|
||||||
apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
|
apply from: "${project.rootDir}/core/android_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
|
apply from: "${project.rootDir}/core/android_module_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
|
apply from: "${project.rootDir}/core/test_dependencies.gradle"
|
||||||
apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
|
apply from: "${project.rootDir}/core/jacoco_global.gradle"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
dataBinding {
|
dataBinding {
|
||||||
|
|
Loading…
Reference in a new issue