Merge pull request #77 from clover/r248.4

Release 248.4
clover · Feb 3, 2020 · b726876 · b726876
2 parents 24fadb6 + b246d59
commit b726876
Show file tree

Hide file tree

Showing 560 changed files with 33,850 additions and 18,506 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2019 Clover Network, Inc.
+Copyright (C) 2020 Clover Network, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/app.gradle b/app.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 apply from: file("${project.rootDir}/common.gradle")
-//apply from: file("${project.rootDir}/signing.gradle")
 apply from: file("${project.rootDir}/versions.gradle")
 
 /**
@@ -11,7 +10,7 @@ apply from: file("${project.rootDir}/versions.gradle")
  *     proguard-clover-apps.txt
  */
 ext.getCommonProguardFile = { name ->
-  def fileName = "${androidBuild}/$name"
+  def fileName = "${project.rootDir}/$name"
   if (!new File(fileName).exists()) {
     throw new IllegalArgumentException("'$name' is not a valid proguard config file")
   }
@@ -63,8 +62,30 @@ android.applicationVariants.all { variant ->
 }
 
 android {
+
+  buildTypes {
+    debug {
+      zipAlignEnabled true
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'),
+          getCommonProguardFile('proguard-clover-apps.txt'),
+          // Force apps to have a proguard file if ProGuard is enabled
+          'proguard-rules.pro'
+      testProguardFiles getCommonProguardFile('proguard-test-rules.txt')
+    }
+
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android.txt'),
+          getCommonProguardFile('proguard-clover-apps.txt'),
+          // Force apps to have a proguard file if ProGuard is enabled
+          'proguard-rules.pro'
+      testProguardFiles getCommonProguardFile('proguard-test-rules.txt')
+    }
+  }
+
   compileSdkVersion COMPILE_SDK_VERSION
-  buildToolsVersion BUILD_TOOLS_VERSION
+
   useLibrary HTTP_LIBRARY
 
   defaultConfig {
@@ -78,6 +99,7 @@ android {
   packagingOptions {
     exclude 'META-INF/LICENSE'
     exclude 'META-INF/NOTICE'
+    pickFirst 'META-INF/ASL2.0'
   }
 
   lintOptions {

diff --git a/build.gradle b/build.gradle
@@ -18,9 +18,6 @@ buildscript {
   repositories {
     mavenLocal()
     mavenCentral()
-    if (project.properties.containsKey("localArtifactoryUrl")) {
-      maven { url localArtifactoryUrl }
-    }
     jcenter()
     google()
   }

diff --git a/clover-android-connector-sdk/build.gradle b/clover-android-connector-sdk/build.gradle
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 group = 'com.clover.sdk'
-version = '228.3'
+version = '248.4'
 
 
 apply from: file("${project.rootDir}/lib.gradle")
 
 dependencies {
-  compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-  compile project(':clover-android-sdk')
+  implementation project(':clover-android-sdk')
+  implementation "androidx.annotation:annotation:$ANDROIDX_ANNOTATION_VERSION"
+  implementation "com.google.code.gson:gson:$GSON_VERSION"
 }
 
 apply plugin: 'signing'
@@ -57,7 +58,7 @@ uploadArchives {
 
         name 'Clover Android Connector SDK'
         description 'Android services and objects used for interacting with Clover Connector Services'
-        url 'http://www.clover.com/'
+        url 'https://www.clover.com/'
 
         licenses {
           license {
@@ -76,7 +77,7 @@ uploadArchives {
         developers {
           developer {
             name 'Clover Engineering Team'
-            url 'https://www.clover.com/team'
+            url 'https://www.clover.com'
           }
         }
       }
@@ -100,4 +101,4 @@ signing {
 
 nexusStaging {
   packageGroup = "com.clover" //optional if packageGroup == project.getGroup() ------>  NOTE: project.getGroup() returns com.clover.sdk
-}
+}
diff --git a/clover-android-connector-sdk/proguard-rules.pro b/clover-android-connector-sdk/proguard-rules.pro
diff --git a/...roid-connector-sdk/src/main/aidl/com/clover/connector/sdk/v3/IPaymentServiceListener.aidl b/...roid-connector-sdk/src/main/aidl/com/clover/connector/sdk/v3/IPaymentServiceListener.aidl
@@ -17,9 +17,7 @@ import com.clover.sdk.v3.remotepay.VaultCardResponse;
 import com.clover.sdk.v3.remotepay.VerifySignatureRequest;
 import com.clover.sdk.v3.remotepay.VoidPaymentResponse;
 import com.clover.sdk.v3.remotepay.VoidPaymentRefundResponse;
-/**
- * Created by glennbedwell on 9/6/16.
- */
+
 interface IPaymentServiceListener {
 
   /**

diff --git a/...er-android-connector-sdk/src/main/aidl/com/clover/connector/sdk/v3/IPaymentServiceV3.aidl b/...er-android-connector-sdk/src/main/aidl/com/clover/connector/sdk/v3/IPaymentServiceV3.aidl
@@ -45,10 +45,6 @@ import com.clover.sdk.v3.remotepay.VoidPaymentRefundRequest;
  *   }
  * </pre>
  */
-
-/**
- * Created by glennbedwell on 9/6/16.
- */
 interface IPaymentServiceV3 {
   /**
    * add an ICloverConnectorListener to receive callbacks