Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8ed4222

Browse files
Merge pull request #252 from LiLister/update-project
update gradles to make the build pass on Android Studio 3.0
2 parents 4dda6bc + d094fae commit 8ed4222

File tree

7 files changed

+57
-47
lines changed

7 files changed

+57
-47
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android:
66
- tools
77
- platform-tools
88
- tools
9-
- build-tools-24.0.1
10-
- android-23
9+
- build-tools-27.0.1
10+
- android-26
1111
- extra-google-m2repository
1212
- extra-android-m2repository
1313

‎build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ buildscript {
55
repositories {
66
jcenter()
77
mavenCentral()
8+
google()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:2.2.2'
11-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
11+
classpath 'com.android.tools.build:gradle:3.0.1'
12+
// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1213
}
1314
}
1415

‎buildsystem/dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ allprojects {
66

77
ext {
88
//Android
9-
androidBuildToolsVersion = "24.0.1"
9+
androidBuildToolsVersion = "27.0.1"
1010
androidMinSdkVersion = 15
11-
androidTargetSdkVersion = 21
12-
androidCompileSdkVersion = 21
11+
androidTargetSdkVersion = 26
12+
androidCompileSdkVersion = 26
1313

1414
//Libraries
1515
daggerVersion = '2.8'
1616
butterKnifeVersion = '7.0.1'
17-
recyclerViewVersion = '21.0.3'
17+
recyclerViewVersion = '25.4.0'
1818
rxJavaVersion = '2.0.2'
1919
rxAndroidVersion = '2.0.1'
2020
javaxAnnotationVersion = '1.0'
2121
javaxInjectVersion = '1'
2222
gsonVersion = '2.3'
2323
okHttpVersion = '2.5.0'
24-
androidAnnotationsVersion = '21.0.3'
24+
androidAnnotationsVersion = '25.4.0'
2525
arrowVersion = '1.0.0'
2626

2727
//Testing
@@ -30,7 +30,7 @@ ext {
3030
assertJVersion = '1.7.1'
3131
mockitoVersion = '1.9.5'
3232
dexmakerVersion = '1.0'
33-
espressoVersion = '2.0'
33+
espressoVersion = '3.0.1'
3434
testingSupportLibVersion = '0.1'
3535

3636
//Development

‎data/build.gradle

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
6+
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
77
}
88
}
99

1010
apply plugin: 'com.android.library'
11-
apply plugin: 'com.neenbedankt.android-apt'
11+
//apply plugin: 'com.neenbedankt.android-apt'
1212
apply plugin: 'me.tatarka.retrolambda'
1313

1414
android {
@@ -51,17 +51,21 @@ dependencies {
5151
def dataDependencies = rootProject.ext.dataDependencies
5252
def testDependencies = rootProject.ext.dataTestDependencies
5353

54-
compile project(':domain')
55-
provided dataDependencies.javaxAnnotation
56-
compile dataDependencies.javaxInject
57-
compile dataDependencies.okHttp
58-
compile dataDependencies.gson
59-
compile dataDependencies.rxJava
60-
compile dataDependencies.rxAndroid
61-
compile dataDependencies.androidAnnotations
54+
implementation project(':domain')
55+
compileOnly dataDependencies.javaxAnnotation
56+
implementation dataDependencies.javaxInject
57+
implementation dataDependencies.okHttp
58+
implementation dataDependencies.gson
59+
implementation dataDependencies.rxJava
60+
implementation dataDependencies.rxAndroid
61+
implementation dataDependencies.androidAnnotations
6262

63-
testCompile testDependencies.junit
64-
testCompile testDependencies.assertj
65-
testCompile testDependencies.mockito
66-
testCompile testDependencies.robolectric
63+
testImplementation testDependencies.junit
64+
testImplementation testDependencies.assertj
65+
testImplementation testDependencies.mockito
66+
testImplementation testDependencies.robolectric
6767
}
68+
69+
repositories {
70+
google()
71+
}

‎domain/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ dependencies {
1919
def domainDependencies = rootProject.ext.domainDependencies
2020
def domainTestDependencies = rootProject.ext.domainTestDependencies
2121

22-
provided domainDependencies.javaxAnnotation
22+
compileOnly domainDependencies.javaxAnnotation
2323

24-
compile domainDependencies.javaxInject
25-
compile domainDependencies.rxJava
24+
implementation domainDependencies.javaxInject
25+
implementation domainDependencies.rxJava
2626
compile domainDependencies.arrow
2727

28-
testCompile domainTestDependencies.junit
29-
testCompile domainTestDependencies.mockito
30-
testCompile domainTestDependencies.assertj
28+
testImplementation domainTestDependencies.junit
29+
testImplementation domainTestDependencies.mockito
30+
testImplementation domainTestDependencies.assertj
3131
}

‎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.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎presentation/build.gradle

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.neenbedankt.android-apt'
2+
//apply plugin: 'com.neenbedankt.android-apt'
33

44
android {
55
def globalConfiguration = rootProject.extensions.getByName("ext")
@@ -62,23 +62,28 @@ dependencies {
6262
def presentationTestDependencies = rootProject.ext.presentationTestDependencies
6363
def developmentDependencies = rootProject.ext.developmentDependencies
6464

65-
compile project(':domain')
66-
compile project(':data')
65+
implementation project(':domain')
66+
implementation project(':data')
6767

68-
apt presentationDependencies.daggerCompiler
69-
compile presentationDependencies.dagger
70-
compile presentationDependencies.butterKnife
71-
compile presentationDependencies.recyclerView
72-
compile presentationDependencies.rxJava
73-
compile presentationDependencies.rxAndroid
74-
provided presentationDependencies.javaxAnnotation
68+
annotationProcessor presentationDependencies.daggerCompiler
69+
implementation presentationDependencies.dagger
70+
implementation presentationDependencies.butterKnife
71+
annotationProcessor presentationDependencies.butterKnife
72+
implementation presentationDependencies.recyclerView
73+
implementation presentationDependencies.rxJava
74+
implementation presentationDependencies.rxAndroid
75+
compileOnly presentationDependencies.javaxAnnotation
7576

76-
androidTestCompile presentationTestDependencies.mockito
77-
androidTestCompile presentationTestDependencies.dexmaker
78-
androidTestCompile presentationTestDependencies.dexmakerMockito
79-
androidTestCompile presentationTestDependencies.espresso
80-
androidTestCompile presentationTestDependencies.testingSupportLib
77+
androidTestImplementation presentationTestDependencies.mockito
78+
androidTestImplementation presentationTestDependencies.dexmaker
79+
androidTestImplementation presentationTestDependencies.dexmakerMockito
80+
androidTestImplementation presentationTestDependencies.espresso
81+
androidTestImplementation presentationTestDependencies.testingSupportLib
8182

8283
//Development
83-
compile developmentDependencies.leakCanary
84+
implementation developmentDependencies.leakCanary
8485
}
86+
87+
repositories {
88+
google()
89+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /