diff --git a/.travis.yml b/.travis.yml index 21df6a63..c7b1eef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ group: edge android: components: - tools - - build-tools-26.0.1 - android-26 install: diff --git a/app/build.gradle b/app/build.gradle index 180405af..f77c96a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,6 +9,7 @@ android { targetSdkVersion 25 versionCode 1 versionName "1.0" + multiDexEnabled true } buildTypes { release { @@ -23,12 +24,11 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.4.0' - compile 'com.android.support:design:25.4.0' - compile project(':libaums') - compile project(':httpserver') - compile project(':storageprovider') - compile project(':javafs') + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:25.4.0' + implementation 'com.android.support:design:25.4.0' + implementation project(':libaums') + implementation project(':httpserver') + implementation project(':storageprovider') + implementation project(':javafs') } diff --git a/httpserver/build.gradle b/httpserver/build.gradle index 8a22e0ef..1aaa2117 100644 --- a/httpserver/build.gradle +++ b/httpserver/build.gradle @@ -33,14 +33,14 @@ android { } dependencies { - compile 'org.nanohttpd:nanohttpd:2.+' + implementation 'org.nanohttpd:nanohttpd:2.+' javadocDeps 'org.nanohttpd:nanohttpd:2.+' - compile 'com.koushikdutta.async:androidasync:2.+' + implementation 'com.koushikdutta.async:androidasync:2.+' - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:support-annotations:27.0.2' - compile project(':libaums') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:support-annotations:27.0.2' + implementation project(':libaums') } task bintray { diff --git a/javafs/build.gradle b/javafs/build.gradle index 46139e5e..4bf87257 100644 --- a/javafs/build.gradle +++ b/javafs/build.gradle @@ -24,15 +24,16 @@ android { } dependencies { - compile project(':libaums') + implementation project(':libaums') + implementation 'com.android.support:support-annotations:27.0.2' - compile('log4j:log4j:1.2.17') - compile('de.mindpipe.android:android-logging-log4j:1.0.3') - compile 'com.github.magnusja:java-fs:0.1.3' + implementation('log4j:log4j:1.2.17') + implementation('de.mindpipe.android:android-logging-log4j:1.0.3') + implementation 'com.github.magnusja:java-fs:0.1.3' - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testCompile 'junit:junit:4.12' + implementation 'junit:junit:4.12' } diff --git a/libaums/build.gradle b/libaums/build.gradle index a9273742..cd16435b 100644 --- a/libaums/build.gradle +++ b/libaums/build.gradle @@ -49,13 +49,13 @@ android { } dependencies { - testCompile 'junit:junit:4.12' - testCompile 'org.apache.commons:commons-io:1.3.2' - testCompile 'com.eclipsesource.minimal-json:minimal-json:0.9.4' - testCompile 'org.xenei:junit-contracts:0.1.7' - testCompile 'org.mockito:mockito-core:2.7.22' + testImplementation 'junit:junit:4.12' + testImplementation 'commons-io:commons-io:1.3.2' + testImplementation 'com.eclipsesource.minimal-json:minimal-json:0.9.4' + testImplementation 'org.xenei:junit-contracts:0.1.7' + testImplementation 'org.mockito:mockito-core:2.7.22' - compile 'com.android.support:support-annotations:27.0.2' + implementation 'com.android.support:support-annotations:27.0.2' javadocDeps 'com.android.support:support-annotations:27.0.2' } diff --git a/storageprovider/build.gradle b/storageprovider/build.gradle index 1940a405..73c033e2 100644 --- a/storageprovider/build.gradle +++ b/storageprovider/build.gradle @@ -33,9 +33,9 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'org.apache.commons:commons-io:1.3.2' - compile project(':libaums') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'commons-io:commons-io:1.3.2' + implementation project(':libaums') }