Skip to content

Commit

Permalink
Demo used v2.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
JessYanCoding committed Jan 13, 2018
1 parent 2e9e643 commit ca2d7e8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ android:

script:
- ./gradlew clean
- ./gradlew install
- ./gradlew bintrayUpload
# - ./gradlew install
# - ./gradlew bintrayUpload
- ./gradlew assembleDebug
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {
//arms
implementation project(':arms')
//Github 仓库上最新的 Demo 具有下一个版本的新特性, 所以依赖最新的远程库会出现版本不兼容的情况, 详情请查看 https://github.com/JessYanCoding/MVPArms/wiki/Issues#2
// implementation 'me.jessyan:arms:2.3.1'
// implementation 'me.jessyan:arms:2.3.5'
//test
testImplementation rootProject.ext.dependencies["junit"]
debugImplementation rootProject.ext.dependencies["canary-debug"]
Expand Down
50 changes: 25 additions & 25 deletions arms/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,91 +34,91 @@ buildscript {

dependencies {
//support
compile(rootProject.ext.dependencies["support-v4"]) {
api(rootProject.ext.dependencies["support-v4"]) {
exclude module: 'support-annotations'
}
compile(rootProject.ext.dependencies["appcompat-v7"]) {
api(rootProject.ext.dependencies["appcompat-v7"]) {
exclude module: 'support-annotations'
exclude module: 'support-v4'
}
compile(rootProject.ext.dependencies["design"]) {
api(rootProject.ext.dependencies["design"]) {
exclude module: 'support-annotations'
exclude module: 'appcompat-v7'
exclude module: 'support-v4'
}
compile rootProject.ext.dependencies["annotations"]
api rootProject.ext.dependencies["annotations"]

//view
compile(rootProject.ext.dependencies["autolayout"]) {
api(rootProject.ext.dependencies["autolayout"]) {
exclude group: 'com.android.support'
}
compile(rootProject.ext.dependencies["butterknife"]) {
api(rootProject.ext.dependencies["butterknife"]) {
exclude module: 'support-annotations'
}

//rx
compile rootProject.ext.dependencies["rxjava2"]
compile(rootProject.ext.dependencies["rxandroid2"]) {
api rootProject.ext.dependencies["rxjava2"]
api(rootProject.ext.dependencies["rxandroid2"]) {
exclude module: 'rxjava'
}
compile(rootProject.ext.dependencies["rxcache2"]) {
api(rootProject.ext.dependencies["rxcache2"]) {
exclude module: 'rxjava'
exclude module: 'dagger'
}
compile(rootProject.ext.dependencies["rxcache-jolyglot-gson"]) {
implementation(rootProject.ext.dependencies["rxcache-jolyglot-gson"]) {
exclude module: 'gson'
}
compile(rootProject.ext.dependencies["rxlifecycle2"]) {
api(rootProject.ext.dependencies["rxlifecycle2"]) {
exclude module: 'rxjava'
exclude module: 'jsr305'
}
compile(rootProject.ext.dependencies["rxlifecycle2-android"]) {
api(rootProject.ext.dependencies["rxlifecycle2-android"]) {
exclude module: 'support-annotations'
exclude module: 'rxjava'
exclude module: 'rxandroid'
exclude module: 'rxlifecycle'
}
compile(rootProject.ext.dependencies["rxpermissions2"]) {
api(rootProject.ext.dependencies["rxpermissions2"]) {
exclude module: 'rxjava'
exclude module: 'support-annotations'
}
compile rootProject.ext.dependencies['rxerrorhandler2']
api rootProject.ext.dependencies['rxerrorhandler2']

//network
compile(rootProject.ext.dependencies["retrofit"]) {
api(rootProject.ext.dependencies["retrofit"]) {
exclude module: 'okhttp'
exclude module: 'okio'
}
compile(rootProject.ext.dependencies["retrofit-converter-gson"]) {
implementation(rootProject.ext.dependencies["retrofit-converter-gson"]) {
exclude module: 'gson'
exclude module: 'okhttp'
exclude module: 'okio'
exclude module: 'retrofit'
}
compile(rootProject.ext.dependencies["retrofit-adapter-rxjava2"]) {
implementation(rootProject.ext.dependencies["retrofit-adapter-rxjava2"]) {
exclude module: 'rxjava'
exclude module: 'okhttp'
exclude module: 'retrofit'
exclude module: 'okio'
}
compile rootProject.ext.dependencies["okhttp3"]
compile(rootProject.ext.dependencies["glide"]) {
api rootProject.ext.dependencies["okhttp3"]
api(rootProject.ext.dependencies["glide"]) {
exclude module: 'support-v4'
}
annotationProcessor(rootProject.ext.dependencies["glide-compiler"]) {
exclude module: 'jsr305'
}

//tools
provided rootProject.ext.dependencies["javax.annotation"]
compile rootProject.ext.dependencies["dagger2"]
compileOnly rootProject.ext.dependencies["javax.annotation"]
api rootProject.ext.dependencies["dagger2"]
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
compile rootProject.ext.dependencies["androideventbus"]
compile rootProject.ext.dependencies["gson"]
api rootProject.ext.dependencies["androideventbus"]
api rootProject.ext.dependencies["gson"]

//test
compile rootProject.ext.dependencies["timber"]
testCompile rootProject.ext.dependencies["junit"]
api rootProject.ext.dependencies["timber"]
testApi rootProject.ext.dependencies["junit"]
}


Expand Down

0 comments on commit ca2d7e8

Please sign in to comment.