helping Android

This commit is contained in:
rusefi 2020-07-12 23:51:54 -04:00
parent 6d8b3f5d94
commit 94438279d2
5 changed files with 16 additions and 7 deletions

View File

@ -1,5 +1,7 @@
apply plugin: 'com.android.application'
apply from: '../../android/dependencies.gradle'
android {
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
@ -42,7 +44,9 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment:2.1.0'
implementation 'androidx.navigation:navigation-ui:2.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation libs.junit
}

View File

@ -1,3 +1,4 @@
ext.libs = [
junit : "junit:junit:4.13"
junit : "junit:junit:4.13",
annotations: "org.jetbrains:annotations:16.0.1"
]

View File

@ -2,9 +2,11 @@ plugins {
id 'java'
}
apply from: '../../android/dependencies.gradle'
dependencies {
implementation project(':logging-api')
implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.1'
implementation libs.annotations
testImplementation group: 'junit', name: 'junit', version: '4.13'
testImplementation libs.junit
}

View File

@ -13,7 +13,7 @@ dependencies {
implementation project(':models')
implementation project(':logging-api')
implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.1'
implementation libs.annotations
implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.6.2'
implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'

View File

@ -2,10 +2,12 @@ plugins {
id 'java'
}
apply from: '../../android/dependencies.gradle'
dependencies {
implementation project(':inifile')
implementation project(':logging-api')
implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.1'
implementation libs.annotations
testImplementation group: 'junit', name: 'junit', version: '4.13'
testImplementation libs.junit
}