Skip to content

Commit e7feff5

Browse files
committed
see 11/24 log
1 parent 19c4052 commit e7feff5

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

app/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ dependencies {
2525
compile rootProject.ext.deps.design
2626
compile rootProject.ext.deps.supportV4
2727

28-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
29-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
30-
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
28+
// RxAndroid
29+
compile rootProject.ext.deps.rxAndroid
30+
compile rootProject.ext.deps.rxJava
31+
32+
// LeakCanary
33+
debugCompile rootProject.ext.deps.leakcanaryAndroid
34+
releaseCompile rootProject.ext.deps.leakcanaryAndroidNoOp
35+
testCompile rootProject.ext.deps.leakcanaryAndroidNoOp
3136
}

config.gradle

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,21 @@ ext {
2020

2121
deps = [
2222
// ------------- Android -------------
23-
supportV4 : "com.android.support:support-v4:${depsVersion.support}",
24-
supportV7 : "com.android.support:appcompat-v7:${depsVersion.support}",
25-
design : "com.android.support:design:${depsVersion.support}",
23+
supportV4 : "com.android.support:support-v4:${depsVersion.support}",
24+
appcompatV7 : "com.android.support:appcompat-v7:${depsVersion.support}",
25+
design : "com.android.support:design:${depsVersion.support}",
2626

27+
// ------------- RxAndroid -------------
28+
rxAndroid : 'io.reactivex:rxandroid:1.2.1',
29+
rxJava : 'io.reactivex:rxjava:1.1.6',
30+
31+
// ------------- LeakCanary -------------
32+
leakcanaryAndroid : 'com.squareup.leakcanary:leakcanary-android:1.5',
33+
leakcanaryAndroidNoOp : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5',
2734

2835
// ------------- Test dependencies -------------
29-
junit : "junit:junit:4.12",
30-
truth : "com.google.truth:truth:0.29",
31-
robolectric : "org.robolectric:robolectric:3.1.2"
36+
junit : 'junit:junit:4.12',
37+
truth : 'com.google.truth:truth:0.29',
38+
robolectric : 'org.robolectric:robolectric:3.1.2'
3239
]
3340
}

utilcode/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion '24.0.3'
4+
compileSdkVersion rootProject.ext.android.compileSdkVersion
5+
buildToolsVersion rootProject.ext.android.buildToolsVersion
66

77
defaultConfig {
8-
minSdkVersion 11
9-
targetSdkVersion 24
10-
versionCode 13
11-
versionName "1.3.4"
8+
minSdkVersion rootProject.ext.android.minSdkVersion
9+
targetSdkVersion rootProject.ext.android.targetSdkVersion
10+
versionCode rootProject.ext.android.versionCode
11+
versionName rootProject.ext.android.versionName
1212
}
1313
buildTypes {
1414
release {
@@ -19,11 +19,11 @@ android {
1919
}
2020

2121
dependencies {
22-
testCompile 'junit:junit:4.12'
23-
testCompile 'org.robolectric:robolectric:3.1.2'
24-
testCompile 'com.google.truth:truth:0.29'
25-
provided 'com.android.support:support-v4:24.0.0'
26-
provided 'com.android.support:design:24.0.0'
22+
provided rootProject.ext.deps.design
23+
provided rootProject.ext.deps.supportV4
24+
testCompile rootProject.ext.deps.junit
25+
testCompile rootProject.ext.deps.truth
26+
testCompile rootProject.ext.deps.robolectric
2727
}
2828
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
2929
//gradlew bintrayUpload

0 commit comments

Comments
 (0)