Skip to content

Commit

Permalink
Update Checkout Gradle configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
serso committed Apr 29, 2018
1 parent 5bc98d8 commit 9598a79
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle
Expand Up @@ -46,13 +46,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile "com.android.support:support-v4:${versions.libs.support}"
compile "com.android.support:appcompat-v7:${versions.libs.support}"
compile "com.android.support:recyclerview-v7:${versions.libs.support}"
compile 'com.jakewharton:butterknife:8.4.0'
implementation "com.android.support:support-v4:${versions.libs.support}"
implementation "com.android.support:appcompat-v7:${versions.libs.support}"
implementation "com.android.support:recyclerview-v7:${versions.libs.support}"
implementation 'com.jakewharton:butterknife:8.4.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
compile project(':lib')
implementation project(':lib')
}

task androidSourcesJar(type: Jar) {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
}
ext {
versions = [libs: [support: "27.0.2"],
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Mon Feb 26 20:20:11 CET 2018
#Sun Apr 29 18:17:38 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
11 changes: 5 additions & 6 deletions lib/build.gradle
Expand Up @@ -40,13 +40,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.code.findbugs:jsr305:2.0.3'
api 'com.google.code.findbugs:jsr305:2.0.3'

testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.0'
testCompile "org.mockito:mockito-all:1.9.5"
testCompile "org.skyscreamer:jsonassert:1.2.3"
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.0'
testImplementation "org.mockito:mockito-all:1.9.5"
testImplementation "org.skyscreamer:jsonassert:1.2.3"
}

tasks.withType(Test) {
Expand Down

0 comments on commit 9598a79

Please sign in to comment.