Merge pull request #66 from dbachelder/m.release_issues

Joe Jensen · web-flow · commit 357cb9cdb536 · 2018-09-06T10:39:24.000-07:00
Resolving broken dependencies
diff --git a/CreditCardEntry/build.gradle b/CreditCardEntry/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        jcenter()
         mavenCentral()
         google()
     }
@@ -10,14 +11,16 @@ buildscript {
 apply plugin: 'com.android.library'
 
 repositories {
+    jcenter()
     mavenCentral()
+    google()
 }
 
 android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 28
     }
 
@@ -36,5 +39,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:25.3.1'
+    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-compat:27.1.1'
 }
diff --git a/CreditCardEntryDemo/build.gradle b/CreditCardEntryDemo/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        jcenter()
         mavenCentral()
         google()
     }
@@ -10,14 +11,16 @@ buildscript {
 apply plugin: 'com.android.application'
 
 repositories {
+    jcenter()
     mavenCentral()
+    google()
 }
 
 android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 28
     }
 
@@ -35,6 +38,5 @@ android {
 }
 
 dependencies {
-    compile project(':CreditCardEntry')
-    compile 'com.android.support:support-v4:25.3.1'
+    implementation project(':CreditCardEntry')
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
	`3`	`+ jcenter()`
`3`	`4`	`mavenCentral()`
`4`	`5`	`google()`
`5`	`6`	`}`
`@@ -10,14 +11,16 @@ buildscript {`
`10`	`11`	`apply plugin: 'com.android.library'`
`11`	`12`
`12`	`13`	`repositories {`
	`14`	`+ jcenter()`
`13`	`15`	`mavenCentral()`
	`16`	`+ google()`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`android {`
`17`	`20`	`compileSdkVersion 28`
`18`	`21`
`19`	`22`	`defaultConfig {`
`20`		`- minSdkVersion 9`
	`23`	`+ minSdkVersion 14`
`21`	`24`	`targetSdkVersion 28`
`22`	`25`	`}`
`23`	`26`
`@@ -36,5 +39,6 @@ android {`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`dependencies {`
`39`		`- compile 'com.android.support:support-v4:25.3.1'`
	`42`	`+ implementation 'com.android.support:support-annotations:27.1.1'`
	`43`	`+ implementation 'com.android.support:support-compat:27.1.1'`
`40`	`44`	`}`