From 629248be01912183715b5348d57a011bd540377f Mon Sep 17 00:00:00 2001 From: Viktoras Jegorovas Date: Wed, 8 Aug 2018 14:55:57 +0300 Subject: [PATCH] SumUp wrapper updated to 3.0.0 version --- android/build.gradle | 52 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 10ba43f..9256a15 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,38 +2,66 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } - dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { repositories { - maven { url 'https://maven.sumup.com/releases' } jcenter() + + maven { + url 'https://maven.google.com/' + name 'Google' + } + + maven { url 'https://maven.sumup.com/releases' } } } apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '25.0.0' + compileSdkVersion 26 + buildToolsVersion "27.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { abiFilters "armeabi-v7a", "x86" } } - lintOptions { - abortOnError false - warning 'InvalidPackage' + // Possible resolution strategy. Only necessary if not compiling against API 27 + configurations.all { + resolutionStrategy { + force 'com.android.support:support-v4:26.1.0' + force 'com.android.support:appcompat-v7:26.1.0' + force 'com.android.support:cardview-v7:26.1.0' + force 'com.android.support:design:26.1.0' + } + } + + packagingOptions { + exclude 'META-INF/services/javax.annotation.processing.Processor' + exclude 'META-INF/LICENSE' + exclude 'META-INF/NOTICE' + } + + buildTypes { + debug { + // All ProGuard rules required by the SumUp SDK are packaged with the library + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt') + } } } @@ -46,8 +74,8 @@ dependencies { annotationProcessor 'com.neenbedankt.bundles:argument:1.0.4' compile 'com.neenbedankt.bundles:argument:1.0.4' compile 'com.facebook.react:react-native:+' - compile('com.sumup:merchant-sdk:2.5.2@aar') { - transitive = true - } + compile 'com.android.support:appcompat-v7:26.1.0' + + compile 'com.sumup:merchant-sdk:3.0.0' } \ No newline at end of file