Skip to content
Snippets Groups Projects
Commit 38f9e794 authored by Geoffrey Métais's avatar Geoffrey Métais Committed by Nicolas Pomepuy
Browse files

Fix test build

parent 2fe640ff
No related branches found
No related tags found
1 merge request!429Testing
......@@ -38,6 +38,7 @@ android {
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
......@@ -70,7 +71,6 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions']
multiDexEnabled true
}
signedRelease {
initWith release
......@@ -80,7 +80,6 @@ android {
debug {
applicationIdSuffix ".debug"
jniDebuggable true
multiDexEnabled true
}
dev {
initWith debug
......
......@@ -28,7 +28,6 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
......@@ -53,10 +52,10 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation project(':application:tools')
implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintLayoutVersion"
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
......@@ -28,6 +28,9 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
packagingOptions {
pickFirst '**/*.so'
}
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
......
......@@ -10,6 +10,10 @@ android {
enabled = true
}
packagingOptions {
pickFirst '**/*.so'
}
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
......@@ -19,6 +23,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
buildConfigField "String", "MOVIEPEDIA_API_URL", "\"${getMoviepediaUrl(project)}\""
multiDexEnabled true
}
buildTypes {
......
......@@ -5,6 +5,10 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
packagingOptions {
pickFirst '**/*.so'
}
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
versionCode 1
......
......@@ -5,6 +5,10 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
packagingOptions {
pickFirst '**/*.so'
}
kotlinOptions.jvmTarget = "1.8"
dataBinding {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment