Skip to content

Commit ca2d7e8

Browse files
committed
Demo used v2.3.5
1 parent 2e9e643 commit ca2d7e8

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ android:
2525

2626
script:
2727
- ./gradlew clean
28-
- ./gradlew install
29-
- ./gradlew bintrayUpload
28+
# - ./gradlew install
29+
# - ./gradlew bintrayUpload
3030
- ./gradlew assembleDebug

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070
//arms
7171
implementation project(':arms')
7272
//Github 仓库上最新的 Demo 具有下一个版本的新特性, 所以依赖最新的远程库会出现版本不兼容的情况, 详情请查看 https://github.com/JessYanCoding/MVPArms/wiki/Issues#2
73-
// implementation 'me.jessyan:arms:2.3.1'
73+
// implementation 'me.jessyan:arms:2.3.5'
7474
//test
7575
testImplementation rootProject.ext.dependencies["junit"]
7676
debugImplementation rootProject.ext.dependencies["canary-debug"]

arms/build.gradle

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,91 +34,91 @@ buildscript {
3434

3535
dependencies {
3636
//support
37-
compile(rootProject.ext.dependencies["support-v4"]) {
37+
api(rootProject.ext.dependencies["support-v4"]) {
3838
exclude module: 'support-annotations'
3939
}
40-
compile(rootProject.ext.dependencies["appcompat-v7"]) {
40+
api(rootProject.ext.dependencies["appcompat-v7"]) {
4141
exclude module: 'support-annotations'
4242
exclude module: 'support-v4'
4343
}
44-
compile(rootProject.ext.dependencies["design"]) {
44+
api(rootProject.ext.dependencies["design"]) {
4545
exclude module: 'support-annotations'
4646
exclude module: 'appcompat-v7'
4747
exclude module: 'support-v4'
4848
}
49-
compile rootProject.ext.dependencies["annotations"]
49+
api rootProject.ext.dependencies["annotations"]
5050

5151
//view
52-
compile(rootProject.ext.dependencies["autolayout"]) {
52+
api(rootProject.ext.dependencies["autolayout"]) {
5353
exclude group: 'com.android.support'
5454
}
55-
compile(rootProject.ext.dependencies["butterknife"]) {
55+
api(rootProject.ext.dependencies["butterknife"]) {
5656
exclude module: 'support-annotations'
5757
}
5858

5959
//rx
60-
compile rootProject.ext.dependencies["rxjava2"]
61-
compile(rootProject.ext.dependencies["rxandroid2"]) {
60+
api rootProject.ext.dependencies["rxjava2"]
61+
api(rootProject.ext.dependencies["rxandroid2"]) {
6262
exclude module: 'rxjava'
6363
}
64-
compile(rootProject.ext.dependencies["rxcache2"]) {
64+
api(rootProject.ext.dependencies["rxcache2"]) {
6565
exclude module: 'rxjava'
6666
exclude module: 'dagger'
6767
}
68-
compile(rootProject.ext.dependencies["rxcache-jolyglot-gson"]) {
68+
implementation(rootProject.ext.dependencies["rxcache-jolyglot-gson"]) {
6969
exclude module: 'gson'
7070
}
71-
compile(rootProject.ext.dependencies["rxlifecycle2"]) {
71+
api(rootProject.ext.dependencies["rxlifecycle2"]) {
7272
exclude module: 'rxjava'
7373
exclude module: 'jsr305'
7474
}
75-
compile(rootProject.ext.dependencies["rxlifecycle2-android"]) {
75+
api(rootProject.ext.dependencies["rxlifecycle2-android"]) {
7676
exclude module: 'support-annotations'
7777
exclude module: 'rxjava'
7878
exclude module: 'rxandroid'
7979
exclude module: 'rxlifecycle'
8080
}
81-
compile(rootProject.ext.dependencies["rxpermissions2"]) {
81+
api(rootProject.ext.dependencies["rxpermissions2"]) {
8282
exclude module: 'rxjava'
8383
exclude module: 'support-annotations'
8484
}
85-
compile rootProject.ext.dependencies['rxerrorhandler2']
85+
api rootProject.ext.dependencies['rxerrorhandler2']
8686

8787
//network
88-
compile(rootProject.ext.dependencies["retrofit"]) {
88+
api(rootProject.ext.dependencies["retrofit"]) {
8989
exclude module: 'okhttp'
9090
exclude module: 'okio'
9191
}
92-
compile(rootProject.ext.dependencies["retrofit-converter-gson"]) {
92+
implementation(rootProject.ext.dependencies["retrofit-converter-gson"]) {
9393
exclude module: 'gson'
9494
exclude module: 'okhttp'
9595
exclude module: 'okio'
9696
exclude module: 'retrofit'
9797
}
98-
compile(rootProject.ext.dependencies["retrofit-adapter-rxjava2"]) {
98+
implementation(rootProject.ext.dependencies["retrofit-adapter-rxjava2"]) {
9999
exclude module: 'rxjava'
100100
exclude module: 'okhttp'
101101
exclude module: 'retrofit'
102102
exclude module: 'okio'
103103
}
104-
compile rootProject.ext.dependencies["okhttp3"]
105-
compile(rootProject.ext.dependencies["glide"]) {
104+
api rootProject.ext.dependencies["okhttp3"]
105+
api(rootProject.ext.dependencies["glide"]) {
106106
exclude module: 'support-v4'
107107
}
108108
annotationProcessor(rootProject.ext.dependencies["glide-compiler"]) {
109109
exclude module: 'jsr305'
110110
}
111111

112112
//tools
113-
provided rootProject.ext.dependencies["javax.annotation"]
114-
compile rootProject.ext.dependencies["dagger2"]
113+
compileOnly rootProject.ext.dependencies["javax.annotation"]
114+
api rootProject.ext.dependencies["dagger2"]
115115
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
116-
compile rootProject.ext.dependencies["androideventbus"]
117-
compile rootProject.ext.dependencies["gson"]
116+
api rootProject.ext.dependencies["androideventbus"]
117+
api rootProject.ext.dependencies["gson"]
118118

119119
//test
120-
compile rootProject.ext.dependencies["timber"]
121-
testCompile rootProject.ext.dependencies["junit"]
120+
api rootProject.ext.dependencies["timber"]
121+
testApi rootProject.ext.dependencies["junit"]
122122
}
123123

124124

0 commit comments

Comments
 (0)