Se ajusta proyecto a SDK16 con las funcionalidades de la version V2.0.1

open-pay · Oct 3, 2018 · ad1e724 · ad1e724
1 parent b24ca67
commit ad1e724
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 23 deletions.
diff --git a/v2/build.gradle b/v2/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 
 }

diff --git a/v2/openpay-android-example/build.gradle b/v2/openpay-android-example/build.gradle
@@ -2,13 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 16
+    //buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "mx.openpay.android.example"
-        minSdkVersion 19
-        targetSdkVersion 27
     }
 
     buildTypes {
@@ -24,5 +22,5 @@ android {
 
 dependencies {
     compile project(':openpay-android')
-    compile 'org.slf4j:slf4j-log4j12:1.7.25'
+    compile 'org.slf4j:slf4j-log4j12:1.6.4'
 }
diff --git a/v2/openpay-android-example/lint.xml b/v2/openpay-android-example/lint.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/log4j*.jar"/>
+    </issue>
 </lint>
diff --git a/v2/openpay-android-example/src/main/java/mx/openpay/android/example/DeviceIdFragment.java b/v2/openpay-android-example/src/main/java/mx/openpay/android/example/DeviceIdFragment.java
@@ -30,7 +30,7 @@
  * @version SVN: $Id: CheckoutFragment.java 24966 2013-12-18 16:55:23Z gjd $
  * @copyright 2013 Kount, Inc. All Rights Reserved.
  */
-@TargetApi (Build.VERSION_CODES.KITKAT)
+@TargetApi (Build.VERSION_CODES.JELLY_BEAN)
 public class DeviceIdFragment extends Fragment {
 
   /**

diff --git a/v2/openpay-android-test/build.gradle b/v2/openpay-android-test/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 16
+    //buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "mx.openpay.android.test"
-        minSdkVersion 19
-        targetSdkVersion 27
+        minSdkVersion 16
+       // targetSdkVersion 26
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -30,6 +30,6 @@ android {
 dependencies {
     compile project(':openpay-android')
     compile 'com.android.support:support-annotations:24.0.0'
-    compile 'com.android.support.test:runner:0.5'
-    compile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support.test:runner:1.0.2'
+    compile 'com.android.support.test:rules:1.0.2'
 }
diff --git a/v2/openpay-android-test/lint.xml b/v2/openpay-android-test/lint.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/log4j*.jar"/>
+    </issue>
 </lint>
diff --git a/v2/openpay-android/build.gradle b/v2/openpay-android/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 
 android {
 
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 16
+    //buildToolsVersion "27.0.3"
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 27
+        minSdkVersion 16
+      //  targetSdkVersion 26
     }
 
     buildTypes {
@@ -21,10 +21,17 @@ android {
 
 }
 
+
 dependencies {
-    compile 'com.android.support:support-v13:27.0.2'
-    compile 'com.google.http-client:google-http-client:1.23.0'
-    compile 'com.google.http-client:google-http-client-android:1.23.0'
-    compile 'com.google.http-client:google-http-client-jackson2:1.23.0'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.9.2'
+    compile 'com.android.support:support-v4:24.0.0'
+    compile 'com.google.http-client:google-http-client:1.17.0-rc'
+    compile 'com.google.http-client:google-http-client-android:1.17.0-rc'
+    compile 'com.google.http-client:google-http-client-jackson2:1.17.0-rc'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.1.3'
+    configurations {
+        all {
+            exclude module: 'httpclient'
+        }
+    }
+    implementation files('lib/devicecollector-sdk-2.5.jar')
 }
diff --git a/v2/openpay-android/lib/devicecollector-sdk-2.5.jar b/v2/openpay-android/lib/devicecollector-sdk-2.5.jar
diff --git a/v2/openpay-android/lint.xml b/v2/openpay-android/lint.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/log4j*.jar"/>
+    </issue>
 </lint>
diff --git a/v2/openpay-android/src/main/java/mx/openpay/android/DeviceCollectorDefaultImpl.java b/v2/openpay-android/src/main/java/mx/openpay/android/DeviceCollectorDefaultImpl.java
@@ -54,7 +54,7 @@ public String setup(final Activity activity) {
             webViewDF.setWebViewClient(new WebViewClient());
             webViewDF.getSettings().setJavaScriptEnabled(true);
             String identifierForVendorScript = String.format("var identifierForVendor = '%s';", identifierForVendor);
-            webViewDF.evaluateJavascript(identifierForVendorScript, null);
+           // webViewDF.evaluateJavascript(identifierForVendorScript, null);
 
             // Ejecutamos OpenControl
             String urlAsString = String.format("%s/oa/logo.htm?m=%s&s=%s", this.baseUrl, this.merchantId, sessionId);
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.0.1'
+            classpath 'com.android.tools.build:gradle:3.2.0'
         }
     }
@@ Expand Down @@