Pull dependency definitions to root module

xiaowei20152012 · Jul 23, 2017 · 7998461 · 7998461
1 parent 00143bd
commit 7998461
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 41 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,28 @@
 buildscript {
-  ext.deps = [
-    android_gradle_plugin      : 'com.android.tools.build:gradle:3.0.0-alpha7',
+  ext.versions = [
+      'minSdk': 14,
+      'compileSdk': 25,
+      'buildTools': '25.0.0',
+      'supportLibrary': '23.1.1'
   ]
 
-  ext.versions = [
-    'minSdk': 14,
-    'compileSdk': 25,
-    'buildTools': '25.0.0',
+  ext.deps = [
+    android_gradle_plugin: 'com.android.tools.build:gradle:3.0.0-alpha7',
+    'support': [
+      'annotations': "com.android.support:support-annotations:${versions.supportLibrary}",
+      'appcompat': "com.android.support:appcompat-v7:${versions.supportLibrary}",
+      'design': "com.android.support:design:${versions.supportLibrary}",
+      'test': [
+          'espresso': 'com.android.support.test.espresso:espresso-core:2.2.1',
+          'runner': 'com.android.support.test:runner:0.4',
+          'rules': 'com.android.support.test:rules:0.4',
+      ]
+    ],
+    'junit': 'junit:junit:4.10',
+    'assertj': 'org.assertj:assertj-core:1.7.1',
+    'mockito': 'org.mockito:mockito-core:1.10.19',
+    'robolectric': 'org.robolectric:robolectric:3.0',
+    'antTasks': 'org.apache.maven:maven-ant-tasks:2.1.3',
   ]
 
   dependencies {

diff --git a/flow-sample-basic/build.gradle b/flow-sample-basic/build.gradle
@@ -25,11 +25,11 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  compile deps.support.design
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow-sample-helloworld/build.gradle b/flow-sample-helloworld/build.gradle
@@ -25,10 +25,10 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow-sample-intents/build.gradle b/flow-sample-intents/build.gradle
@@ -25,11 +25,11 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  compile deps.support.design
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow-sample-multikey/build.gradle b/flow-sample-multikey/build.gradle
@@ -25,11 +25,11 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  compile deps.support.design
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow-sample-orientation-lock/build.gradle b/flow-sample-orientation-lock/build.gradle
@@ -25,11 +25,11 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  compile deps.support.design
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow-sample-tree/build.gradle b/flow-sample-tree/build.gradle
@@ -25,11 +25,11 @@ android {
 
 dependencies {
   compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+  compile deps.support.appcompat
+  compile deps.support.design
+  androidTestCompile deps.support.test.runner
+  androidTestCompile deps.support.test.rules
+  androidTestCompile deps.support.test.espresso
 }
 
 //noinspection GroovyAssignabilityCheck

diff --git a/flow/build.gradle b/flow/build.gradle
@@ -11,12 +11,12 @@ android {
 }
 
 dependencies {
-  compile 'com.android.support:support-annotations:23.1.1'
-  testCompile 'junit:junit:4.10'
-  testCompile 'org.assertj:assertj-core:1.7.1'
-  testCompile 'org.mockito:mockito-core:1.10.19'
-  testCompile 'org.robolectric:robolectric:3.0'
-  testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
+  compile deps.support.annotations
+  testCompile deps.junit
+  testCompile deps.assertj
+  testCompile deps.mockito
+  testCompile deps.robolectric
+  testCompile deps.antTasks
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')