Merge pull request #4 from MadBrains/fix_android_build

[2.0.1] Fix Android Build

Author: Antol

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.1
+
+* [Android] Fix Dependency conflict with firebase
+* [Android] Bump minSdkVersion to 21
+* [Android] Enable multiDex
+
 ## 2.0.0
 
 * Null safe migration

README.md

@@ -17,9 +17,11 @@ Easy integration with Google Pay and Apple Pay for your flutter app.
 Add this to your package's pubspec.yaml file:
 ```yaml
 dependencies:
-  mad_pay: 1.0.0
+  mad_pay: 2.0.1
 ```
 
+For Android: set `minSdkVersion` to 21
+
 ## Usage
 To start using payment you need to get Merchant Identifier:
 * [For Apple Pay][apple_merchant]

android/build.gradle

@@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.protobufVersion = '0.8.8'
+    ext.protobufVersion = '0.8.15'
     repositories {
         google()
         jcenter()
@@ -13,7 +13,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufVersion"
-        classpath "com.google.protobuf:protobuf-java-util:$protobufVersion"
     }
 }
 
@@ -36,8 +35,9 @@ android {
         main.proto.srcDirs += '../protos'
     }
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     lintOptions {
         disable 'InvalidPackage'
@@ -51,24 +51,22 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.1'
-    }
-    plugins {
-        javalite {
-            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
-        }
+        artifact = 'com.google.protobuf:protoc:3.14.0'
     }
     generateProtoTasks {
         all().each { task ->
-            task.plugins {
-                javalite { }
+            task.builtins {
+                java {
+                    option "lite"
+                }
             }
         }
     }
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
+    implementation 'com.google.protobuf:protobuf-javalite:3.14.0'
     implementation 'com.google.android.gms:play-services-wallet:18.1.2'
+    implementation "androidx.multidex:multidex:2.0.1"
 }

example/android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "ru.madbrains.mad_pay_example"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/pubspec.lock

@@ -73,7 +73,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.1"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: mad_pay
 description: Mad Pay will help you make payments through Apple Pay and Google Pay
-version: 2.0.0
+version: 2.0.1
 repository: https://github.com/MadBrains/Mad-Pay-Flutter
 issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
 homepage: https://madbrains.ru/