Skip to content

Commit

Permalink
Update deprecated gradle instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
magnusja committed Jan 14, 2018
1 parent 3a2654e commit 3b2df77
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ group: edge
android:
components:
- tools
- build-tools-26.0.1
- android-26

install:
Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ android {
targetSdkVersion 25
versionCode 1
versionName "1.0"
multiDexEnabled true
}
buildTypes {
release {
Expand All @@ -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')
}
10 changes: 5 additions & 5 deletions httpserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 8 additions & 7 deletions javafs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
12 changes: 6 additions & 6 deletions libaums/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
6 changes: 3 additions & 3 deletions storageprovider/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}


Expand Down

0 comments on commit 3b2df77

Please sign in to comment.