Merge pull request #95 from PaystackHQ/fix/duplicate-resources

Fix build issues due to conflict with Material Component attributes

Author: jubril-paystack

README.md

@@ -1,3 +1,4 @@
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/co.paystack.android/paystack-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/co.paystack.android/paystack-android)
 [![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=plastic)](https://android-arsenal.com/api?level=16)
 
 
@@ -36,8 +37,8 @@ You do not need to clone this repository or download the files. Just add the fol
 
 ```gradle
 dependencies {
-    implementation 'co.paystack.android.design.widget:pinpad:1.0.2'
-    implementation 'co.paystack.android:paystack:3.0.14'
+    implementation 'co.paystack.android.design.widget:pinpad:1.0.4'
+    implementation 'co.paystack.android:paystack:3.0.17'
 }
 ```
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
@@ -25,10 +25,10 @@ allprojects {
 ext {
     compileSdkVersion = 29
     minSdkVersion = 16
-    targetSdkVersion = 25
-    versionCode = 24
+    targetSdkVersion = 29
+    versionCode = 26
 
     buildToolsVersion = "29.0.2"
     supportLibraryVersion = "28.0.0"
-    versionName = "3.0.14"
+    versionName = "3.0.17"
 }

example/build.gradle

@@ -25,12 +25,12 @@ android {
 }
 
 dependencies {
-    api "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'org.assertj:assertj-core:3.12.2'
     testImplementation 'org.robolectric:robolectric:4.3-alpha-2'
     testImplementation 'org.mockito:mockito-core:1.10.19'
-    api project(':paystack')
-//    api "co.paystack.android:paystack:$rootProject.ext.versionName"
+    implementation project(':paystack')
+//    implementation "co.paystack.android:paystack:$rootProject.ext.versionName"
 }

gradle.properties

@@ -16,3 +16,4 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 08 19:25:39 WAT 2019
+#Wed Mar 25 12:49:33 WAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

paystack/build.gradle

@@ -28,14 +28,13 @@ android {
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.google.code.gson:gson:2.8.5'
-    api 'com.squareup.retrofit2:retrofit:2.6.2'
-    api 'com.squareup.retrofit2:converter-gson:2.5.0'
-    api 'com.squareup.okhttp3:okhttp:3.14.6'
-    api "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-
-    api 'co.paystack.android.design.widget:pinpad:1.0.2'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.6'
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+    implementation 'co.paystack.android.design.widget:pinpad:1.0.4'
 }
 
 ext {