Merge pull request #59 from jbarat/master

jrvansuita · web-flow · commit 96f8ed001302 · 2018-01-26T17:54:24.000-02:00
Unify the way dependencies are versioned.
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     compile "com.android.support:appcompat-v7:$supportLibVersion"
     compile "com.android.support:design:$supportLibVersion"
 
-    compile 'com.jakewharton:butterknife:8.5.1'
+    compile "com.jakewharton:butterknife:$butterKnifeVersion"
 
     compile project(':library')
 }
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,8 @@ ext {
     targetSdkVersion = compileSdkVersion
 
     supportLibVersion = '26.1.0'
+    iconHandlerVersion = 'v2.0.0'
+    butterKnifeVersion = '8.5.1'
 }
 
 task clean(type: Delete) {
diff --git a/library/build.gradle b/library/build.gradle
@@ -22,5 +22,5 @@ android {
 dependencies {
     compile "com.android.support:appcompat-v7:$supportLibVersion"
     compile "com.android.support:cardview-v7:$supportLibVersion"
-    compile 'com.github.jrvansuita:IconHandler:+'
+    compile "com.github.jrvansuita:IconHandler:$iconHandlerVersion"
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`compile "com.android.support:appcompat-v7:$supportLibVersion"`
`26`	`26`	`compile "com.android.support:design:$supportLibVersion"`
`27`	`27`
`28`		`- compile 'com.jakewharton:butterknife:8.5.1'`
	`28`	`+ compile "com.jakewharton:butterknife:$butterKnifeVersion"`
`29`	`29`
`30`	`30`	`compile project(':library')`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ ext {`
`24`	`24`	`targetSdkVersion = compileSdkVersion`
`25`	`25`
`26`	`26`	`supportLibVersion = '26.1.0'`
	`27`	`+ iconHandlerVersion = 'v2.0.0'`
	`28`	`+ butterKnifeVersion = '8.5.1'`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`task clean(type: Delete) {`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ android {`
`22`	`22`	`dependencies {`
`23`	`23`	`compile "com.android.support:appcompat-v7:$supportLibVersion"`
`24`	`24`	`compile "com.android.support:cardview-v7:$supportLibVersion"`
`25`		`- compile 'com.github.jrvansuita:IconHandler:+'`
	`25`	`+ compile "com.github.jrvansuita:IconHandler:$iconHandlerVersion"`
`26`	`26`	`}`