Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ ext {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(dir: 'libs', include: ['*.jar'])

compile "com.android.support:appcompat-v7:$support_library_version"
compile "com.android.support:recyclerview-v7:$support_library_version"
compile "com.android.support:design:$support_library_version"
implementation "com.android.support:appcompat-v7:$support_library_version"
implementation "com.android.support:recyclerview-v7:$support_library_version"
implementation "com.android.support:design:$support_library_version"

compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.7'

compile 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
compile 'com.jakewharton.threetenabp:threetenabp:1.0.5'
compile 'com.jakewharton.timber:timber:4.6.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
implementation 'com.jakewharton.threetenabp:threetenabp:1.0.5'
implementation 'com.jakewharton.timber:timber:4.6.0'

provided 'javax.annotation:jsr250-api:1.0'
compileOnly 'javax.annotation:jsr250-api:1.0'

compile "android.arch.lifecycle:extensions:${arch_version}"
compile "android.arch.persistence.room:runtime:1.1.0-alpha1"
implementation "android.arch.lifecycle:extensions:${arch_version}"
implementation "android.arch.persistence.room:runtime:1.1.0-alpha1"

implementation "com.google.dagger:dagger:${dagger_version}"
implementation "com.google.dagger:dagger-android:${dagger_version}"
Expand All @@ -63,34 +63,34 @@ dependencies {
annotationProcessor "android.arch.lifecycle:compiler:${arch_version}"
annotationProcessor "android.arch.persistence.room:compiler:1.1.0-alpha1"

testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.10.0'
testCompile("android.arch.core:core-testing:${arch_version}", {
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.10.0'
testImplementation("android.arch.core:core-testing:${arch_version}", {
exclude group: 'com.android.support', module: 'support-compat'
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-core-utils'
exclude group: 'com.android.support', module: 'support-core-utils'
})

testCompile "org.hamcrest:hamcrest-all:1.3"
testCompile('org.threeten:threetenbp:1.3.2') {
testImplementation "org.hamcrest:hamcrest-all:1.3"
testImplementation('org.threeten:threetenbp:1.3.2') {
exclude module: "com.jakewharton.threetenabp:threetenabp:1.0.5"
}
androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:${dagger_version}"
androidTestCompile("android.arch.core:core-testing:${arch_version}", {
androidTestImplementation("android.arch.core:core-testing:${arch_version}", {
exclude group: 'com.android.support', module: 'support-compat'
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-core-utils'
})
androidTestCompile 'org.mockito:mockito-android:2.7.19'
androidTestImplementation 'org.mockito:mockito-android:2.7.19'

androidTestCompile("com.android.support.test:runner:${runner_version}") {
androidTestImplementation("com.android.support.test:runner:${runner_version}") {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile("com.android.support.test:rules:${runner_version}") {
androidTestImplementation("com.android.support.test:rules:${runner_version}") {
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile("com.android.support.test.espresso:espresso-core:${espresso_version}") {
androidTestImplementation("com.android.support.test.espresso:espresso-core:${espresso_version}") {
exclude group: 'com.android.support', module: 'support-annotations'
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.0-alpha07'
classpath 'com.android.tools.build:gradle:3.1.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down