see 04/02 log

Blankj · Blankj · commit 7eab9b728b4c · 2017-04-02T23:46:21.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.blankj.androidutilcode"
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
     }
     buildTypes {
         release {
@@ -21,16 +21,14 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':utilcode')
-    compile rootProject.ext.deps.design
-    compile rootProject.ext.deps.supportV4
+    compile "com.android.support:design:$rootProject.supportVersion"
+    compile "com.android.support:support-v4:$rootProject.supportVersion"
+    compile "com.android.support:appcompat-v7:$rootProject.supportVersion"
 
-    // RxAndroid
-    compile rootProject.ext.deps.rxAndroid
-    compile rootProject.ext.deps.rxJava
+    compile project(':utilcode')
 
     // LeakCanary
-    debugCompile rootProject.ext.deps.leakcanaryAndroid
-    releaseCompile rootProject.ext.deps.leakcanaryAndroidNoOp
-    testCompile rootProject.ext.deps.leakcanaryAndroidNoOp
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 }
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply from: "config.gradle"
-
 buildscript {
     repositories {
         jcenter()
@@ -22,4 +20,23 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
+}
+
+ext {
+    // Sdk and tools
+    compileSdkVersion = 25
+    buildToolsVersion = "25.0.0"
+    minSdkVersion     = 15
+    targetSdkVersion  = 19
+    versionCode       = 16
+    versionName       = "1.3.7"
+
+    // App dependencies
+    supportVersion = '25.0.0'
+    rxjavaVersion = '1.1.8'
+    rxandroidVersion = '1.2.1'
+    brvahVersion = '2.9.2'
+    junitVersion = '4.12'
+    truthVersion = '0.29'
+    robolectricVersion = '3.1.2'
 }
diff --git a/config.gradle b/config.gradle
diff --git a/utilcode/build.gradle b/utilcode/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        versionCode rootProject.ext.android.versionCode
-        versionName rootProject.ext.android.versionName
+        minSdkVersion rootProject.ext.minSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
     }
     buildTypes {
         release {
@@ -18,12 +18,12 @@ android {
 }
 
 dependencies {
-    provided rootProject.ext.deps.design
-    provided rootProject.ext.deps.supportV4
-    provided rootProject.ext.deps.appcompatV7
-    testCompile rootProject.ext.deps.junit
-    testCompile rootProject.ext.deps.truth
-    testCompile rootProject.ext.deps.robolectric
+    provided "com.android.support:design:$rootProject.supportVersion"
+    provided "com.android.support:support-v4:$rootProject.supportVersion"
+    provided "com.android.support:appcompat-v7:$rootProject.supportVersion"
+    testCompile "junit:junit:$rootProject.junitVersion"
+    testCompile "com.google.truth:truth:$rootProject.truthVersion"
+    testCompile "org.robolectric:robolectric:$rootProject.robolectricVersion"
 }
-apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
+//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
 //gradlew bintrayUpload
