Skip to content

Commit 4d9f9ef

Browse files
author
Pawel Szymanski
committed
Update Gradle plugin
1 parent 2f3355f commit 4d9f9ef

File tree

4 files changed

+38
-40
lines changed

4 files changed

+38
-40
lines changed

api/build.gradle

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.neenbedankt.android-apt'
32
apply plugin: 'me.tatarka.retrolambda'
43
apply plugin: 'groovyx.android'
54
apply from: 'jacoco.gradle'
65

76
android {
87
compileSdkVersion 25
9-
buildToolsVersion '25.0.2'
108

119
defaultConfig {
1210
minSdkVersion 14
@@ -115,34 +113,34 @@ bintray {
115113
}
116114

117115
dependencies {
118-
compile fileTree(dir: 'libs', include: ['*.jar'])
119-
compile 'com.android.support:support-annotations:25.2.0'
120-
compile 'com.squareup.retrofit2:retrofit:2.1.0'
121-
compile 'com.squareup.retrofit2:converter-jackson:2.1.0'
122-
compile 'com.squareup.okhttp3:okhttp:3.3.0'
123-
compile 'com.squareup.okhttp3:logging-interceptor:3.3.0'
124-
compile 'com.google.dagger:dagger:2.7'
125-
apt 'com.google.dagger:dagger-compiler:2.7'
126-
compile 'javax.annotation:javax.annotation-api:1.2'
127-
compile 'com.pixplicity.easyprefs:library:1.8.1@aar'
128-
compile 'com.github.creatubbles:java-jsonapi-converter:87dbdaf'
129-
130-
testCompile 'junit:junit:4.12'
131-
testCompile 'org.mockito:mockito-core:1.10.8'
132-
testCompile 'org.robolectric:robolectric:3.0'
133-
134-
testCompile "org.powermock:powermock-module-junit4:1.6.5"
135-
testCompile "org.powermock:powermock-module-junit4-rule:1.6.5"
136-
testCompile "org.powermock:powermock-api-mockito:1.6.5"
137-
testCompile "org.powermock:powermock-classloading-xstream:1.6.5"
138-
139-
testCompile 'org.codehaus.groovy:groovy:2.4.7:grooid'
140-
testCompile "com.andrewreitz:spock-android:1.2.1"
141-
testCompile 'com.android.support.test:testing-support-lib:0.1'
142-
testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
116+
implementation fileTree(dir: 'libs', include: ['*.jar'])
117+
implementation 'com.android.support:support-annotations:25.2.0'
118+
implementation 'com.squareup.retrofit2:retrofit:2.1.0'
119+
implementation 'com.squareup.retrofit2:converter-jackson:2.1.0'
120+
implementation 'com.squareup.okhttp3:okhttp:3.3.0'
121+
api 'com.squareup.okhttp3:logging-interceptor:3.3.0'
122+
implementation 'com.google.dagger:dagger:2.7'
123+
annotationProcessor 'com.google.dagger:dagger-compiler:2.7'
124+
implementation 'javax.annotation:javax.annotation-api:1.2'
125+
implementation 'com.pixplicity.easyprefs:library:1.8.1@aar'
126+
api 'com.github.creatubbles:java-jsonapi-converter:87dbdaf'
127+
128+
testImplementation 'junit:junit:4.12'
129+
testImplementation 'org.mockito:mockito-core:1.10.8'
130+
testImplementation 'org.robolectric:robolectric:3.0'
131+
132+
testImplementation "org.powermock:powermock-module-junit4:1.6.5"
133+
testImplementation "org.powermock:powermock-module-junit4-rule:1.6.5"
134+
testImplementation "org.powermock:powermock-api-mockito:1.6.5"
135+
testImplementation "org.powermock:powermock-classloading-xstream:1.6.5"
136+
137+
testImplementation 'org.codehaus.groovy:groovy:2.4.7:grooid'
138+
testImplementation "com.andrewreitz:spock-android:1.2.1"
139+
testImplementation 'com.android.support.test:testing-support-lib:0.1'
140+
testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') {
143141
exclude group: 'org.codehaus.groovy'
144142
exclude group: 'junit'
145143
}
146-
testCompile 'cglib:cglib-nodep:3.2.4'
147-
testCompile 'org.objenesis:objenesis:2.2'
144+
testImplementation 'cglib:cglib-nodep:3.2.4'
145+
testImplementation 'org.objenesis:objenesis:2.2'
148146
}

app/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.neenbedankt.android-apt'
32
apply plugin: 'me.tatarka.retrolambda'
43

54
android {
65
compileSdkVersion 24
7-
buildToolsVersion '25.0.2'
86

97
defaultConfig {
108
applicationId "com.creatubbles.app"
@@ -32,13 +30,14 @@ android {
3230
}
3331

3432
dependencies {
35-
compile fileTree(include: ['*.jar'], dir: 'libs')
36-
compile 'com.android.support:appcompat-v7:24.2.1'
37-
compile 'com.android.support:design:24.2.1'
33+
implementation fileTree(include: ['*.jar'], dir: 'libs')
34+
implementation 'com.android.support:appcompat-v7:24.2.1'
35+
implementation 'com.android.support:design:24.2.1'
3836

39-
compile 'com.jakewharton:butterknife:7.0.1'
37+
implementation 'com.jakewharton:butterknife:7.0.1'
38+
annotationProcessor 'com.jakewharton:butterknife:7.0.1'
4039

41-
compile project(':api')
40+
implementation project(':api')
4241

43-
testCompile 'junit:junit:4.12'
42+
testImplementation 'junit:junit:4.12'
4443
}

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
9+
classpath 'com.android.tools.build:gradle:3.1.4'
1010
classpath 'me.tatarka:gradle-retrolambda:3.3.0'
1111
classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.1.0'
1212
// NOTE: Do not place your application dependencies here; they belong
@@ -18,6 +18,7 @@ buildscript {
1818

1919
allprojects {
2020
repositories {
21+
google()
2122
jcenter()
2223
maven { url "https://jitpack.io" }
2324
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

0 commit comments

Comments
 (0)