diff --git a/android/app/build.gradle b/android/app/build.gradle index fe32601b59..6e5ee981a4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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 } \ No newline at end of file diff --git a/android/dependencies.gradle b/android/dependencies.gradle index c127fac185..8cec38f18c 100644 --- a/android/dependencies.gradle +++ b/android/dependencies.gradle @@ -1,3 +1,4 @@ ext.libs = [ - junit : "junit:junit:4.13" + junit : "junit:junit:4.13", + annotations: "org.jetbrains:annotations:16.0.1" ] \ No newline at end of file diff --git a/java_console/inifile/build.gradle b/java_console/inifile/build.gradle index 9ec832e20c..8ac68508eb 100644 --- a/java_console/inifile/build.gradle +++ b/java_console/inifile/build.gradle @@ -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 } diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index deaa80fbf4..baf09d3de3 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -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' diff --git a/java_console/models/build.gradle b/java_console/models/build.gradle index a660f88259..0d09d5b5f1 100644 --- a/java_console/models/build.gradle +++ b/java_console/models/build.gradle @@ -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 } \ No newline at end of file