simplify gradle files

This commit is contained in:
Felix 2019-12-27 00:04:15 +01:00
parent 94a2573558
commit f0f34d0aa7
3 changed files with 15 additions and 52 deletions

View file

@ -31,10 +31,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
debug {
minifyEnabled false
@ -93,33 +89,26 @@ android {
}
}
dataBinding {
enabled = true
}
testOptions {
unitTests {
includeAndroidResources = true
}
}
lintOptions.abortOnError = false
dataBinding.enabled = true
testOptions.unitTests.includeAndroidResources = true
}
dependencies {
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-M2'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0-M2'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
api 'androidx.appcompat:appcompat:1.1.0'
def archCompVersion = "1.1.1"
api "androidx.lifecycle:lifecycle-extensions:2.1.0"
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0'
api 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
def roomVersion = "2.2.1"
api 'androidx.recyclerview:recyclerview:1.1.0'
def roomVersion = "2.2.3"
api "androidx.room:room-runtime:$roomVersion"
kapt "androidx.room:room-compiler:$roomVersion"
api "androidx.room:room-ktx:$roomVersion"

View file

@ -18,7 +18,6 @@ android {
// odd for touch, even for leanback
versionCode rootProject.ext.leanbackVersionCode
versionName versionString
// multiDexEnabled true
if(project.hasProperty("versionCode")){
versionCode = project.property("versionCode") as int
println "Setting VersionCode from property: $versionCode"
@ -98,18 +97,9 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
abortOnError false
}
dataBinding {
enabled = true
}
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
lintOptions.abortOnError = false
dataBinding.enabled = true
buildToolsVersion rootProject.ext.buildToolsVersion
}
@ -126,7 +116,6 @@ dependencies {
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.leanback:leanback:1.0.0'
implementation 'androidx.leanback:leanback-preference:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.exoplayer:extension-leanback:2.9.6'
androidTestImplementation('androidx.test:rules:1.1.1') {
exclude module: 'support-annotations'

View file

@ -106,23 +106,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
abortOnError false
}
dataBinding {
enabled = true
}
testOptions {
unitTests {
includeAndroidResources = true
}
}
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
lintOptions.abortOnError false
dataBinding.enabled = true
testOptions.unitTests.includeAndroidResources = true
}
configurations {
@ -138,7 +125,6 @@ dependencies {
}
implementation 'com.github.medyo:android-about-page:1.2.2'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
@ -152,7 +138,6 @@ dependencies {
implementation 'net.opacapp:multiline-collapsingtoolbar:27.1.1'
implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
// implementation 'com.gu:option:1.3'
implementation 'com.github.guardian:Option:-SNAPSHOT'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.11.0'