Merge pull request #3 from engineerapart/full-upgrade-in-progress

Pin the android.support versions and ensure the DropInUI url schema i…
engineerapart · Feb 4, 2018 · 41b67e1 · 41b67e1
2 parents 911059e + 752dd65
commit 41b67e1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -28,6 +28,8 @@
 
         <source-file src="src/android/BraintreePlugin.java" target-dir="src/net/justincredible" />
 
+        <framework src="com.android.support:support-v13:26.0.0" />
+        <framework src="com.android.support:appcompat-v7:26.0.0" />
         <framework src="src/android/build-extras.gradle" custom="true" type="gradleReference" />
 
         <config-file target="AndroidManifest.xml" parent="application">
@@ -66,6 +68,19 @@
           </array>
         </config-file>
 
+        <config-file target="*-Info.plist" parent="CFBundleURLTypes">
+            <array>
+                <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>${PRODUCT_BUNDLE_IDENTIFIER}.payments</string>
+                </array>
+                </dict>
+            </array>
+        </config-file>
+
         <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
             <string>Allows you to scan credit card using your camera.</string>
         </config-file>

diff --git a/scripts/add_embedded_ios_frameworks.js b/scripts/add_embedded_ios_frameworks.js
@@ -15,9 +15,9 @@ module.exports = function(context) {
     // cordova@7 embeds the frameworks so this script is not required
     if(parseInt(context.opts.cordova.version) >= 7) { return; }
 
-    function fromDir(startPath,filter, rec, multiple){
-        if (!fs.existsSync(startPath)){
-            console.log("no dir ", startPath);
+    function fromDir(startPath, filter, rec, multiple){
+        if (!fs.existsSync(startPath)) {
+            console.log("[cordova-plugin-braintree]==>no dir ", startPath);
             return;
         }
 

diff --git a/src/android/build-extras.gradle b/src/android/build-extras.gradle
@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    compile 'com.braintreepayments.api:braintree:2.6.2'
-    compile 'com.braintreepayments.api:drop-in:3.1.0'
+    compile 'com.braintreepayments.api:drop-in:3.+'
+    compile 'com.google.android.gms:play-services-wallet:+'
     compile 'io.card:android-sdk:5.5.1'
 }