Merge pull request #10 from andremion/development

andremion · web-flow · commit 9131be5cd3a5 · 2017-11-16T16:08:33.000Z
Update master
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
 
@@ -28,7 +28,7 @@ allprojects {
         targetSdkVersion = 26
 
         versionCode = 4
-        versionName = "1.0.2"
+        versionName = "1.0.3"
 
         supportLibraryVersion = '26.1.0'
 
diff --git a/counterfab/build.gradle b/counterfab/build.gradle
@@ -29,4 +29,4 @@ dependencies {
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
 }
 
-apply from: 'https://raw.githubusercontent.com/andremion/JCenter/master/deploy.gradle'
+//apply from: 'https://raw.githubusercontent.com/andremion/JCenter/master/deploy.gradle'
diff --git a/gradlew b/gradlew

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath 'com.android.tools.build:gradle:3.0.0'`
`10`		`- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'`
	`10`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`@@ -28,7 +28,7 @@ allprojects {`
`28`	`28`	`targetSdkVersion = 26`
`29`	`29`
`30`	`30`	`versionCode = 4`
`31`		`- versionName = "1.0.2"`
	`31`	`+ versionName = "1.0.3"`
`32`	`32`
`33`	`33`	`supportLibraryVersion = '26.1.0'`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ dependencies {`
`29`	`29`	`androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"`
`30`	`30`	`}`
`31`	`31`
`32`		`-apply from: 'https://raw.githubusercontent.com/andremion/JCenter/master/deploy.gradle'`
	`32`	`+//apply from: 'https://raw.githubusercontent.com/andremion/JCenter/master/deploy.gradle'`