Release 2.0.0

braintree · Nov 11, 2015 · 817d814 · 817d814
1 parent fb85062
commit 817d814
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/BraintreeApi/build.gradle b/BraintreeApi/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     compile 'com.google.android.gms:play-services-wallet:[8.0.0,9.0.0)'
     compile 'com.android.support:support-annotations:22.2.0'
 
-    compile project(':BraintreeDataCollector')
+    compile 'com.braintreepayments.api:data-collector:2.0.0'
     compile files('libs/' + paypalVersion)
 
     lintChecks project(path: ":Lint", configuration: "lintChecks")

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/internal/BraintreeHttpClient.java b/BraintreeApi/src/main/java/com/braintreepayments/api/internal/BraintreeHttpClient.java
@@ -44,8 +44,6 @@
  */
 public class BraintreeHttpClient {
 
-    public static final String USER_AGENT = "braintree/android/" + BuildConfig.VERSION_NAME;
-
     public static boolean DEBUG = false;
 
     private static final String TAG = "BraintreeHttpClient";
@@ -66,6 +64,10 @@ public BraintreeHttpClient(Authorization authorization) {
         mAuthorization = authorization;
     }
 
+    public static String getUserAgent() {
+        return "braintree/android/" + BuildConfig.VERSION_NAME;
+    }
+
     public void setBaseUrl(String baseUrl) {
         mBaseUrl = (baseUrl == null) ? "" : baseUrl;
     }
@@ -184,7 +186,7 @@ protected HttpURLConnection init(String url) throws IOException {
         }
 
         connection.setRequestProperty("Content-Type", "application/json");
-        connection.setRequestProperty("User-Agent", USER_AGENT);
+        connection.setRequestProperty("User-Agent", getUserAgent());
         connection.setRequestProperty("Accept-Language", Locale.getDefault().getLanguage());
 
         if (mAuthorization instanceof TokenizationKey) {

diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebView.java b/BraintreeApi/src/main/java/com/braintreepayments/api/threedsecure/ThreeDSecureWebView.java
@@ -40,7 +40,7 @@ protected void init(ThreeDSecureWebViewActivity activity) {
         setId(android.R.id.widget_frame);
 
         WebSettings settings = getSettings();
-        settings.setUserAgentString(BraintreeHttpClient.USER_AGENT);
+        settings.setUserAgentString(BraintreeHttpClient.getUserAgent());
         settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
         settings.setSupportMultipleWindows(true);
         settings.setJavaScriptEnabled(true);

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,23 @@
 # Braintree Android SDK Release Notes
 
-## 2.0-SNAPSHOT
-
-* 2.0 is still in Beta, API is subject to change
-* Added PayPal OneTouchCore 2.1.0
-* Major changes to architecture
-  * Major logic in Braintree now implemented with a Fragment
-  * Logic for specific payment methods now lives within dedicated classes
-  * Lifecycle cleanup is now handled by Braintree
+## 2.0.0
+
+* Increase `minSdkVersion` to 15 (see [Platform Versions](http://developer.android.com/about/dashboards/index.html#Platform) for the current distribution of Android versions)
+* Remove Gson dependency
+* Replace `Braintree` class with headless `BraintreeFragment`
+  * Move methods for creating payment methods from central `Braintree` class to their own classes e.g. `PayPal#authorizeAccount`, `Card#tokenize`
+* Add support for Tokenization Keys in addition to Client Tokens
+* Rename PaymentMethod to PaymentMethodNonce
+* Rename BraintreeData module to BraintreeDataCollector
+* Update PayPal
+  * Remove [PayPal Android SDK](https://github.com/paypal/PayPal-Android-SDK) dependency
+  * Replace in-app log in with browser based log in
+  * Add support for PayPal billing agreements and one-time payments
+* Convert `PaymentButton` class from a view to a fragment
+* Create `PaymentRequest` class for specifying options in Drop-in and the `PaymentButton`
+* Remove Venmo One Touch. To join the beta for Pay with Venmo, contact [Braintree Support](mailto:[email protected])
+* Remove Coinbase
+* Many additional structural and name changes. For more details, see the [migration guide](https://developers.braintreepayments.com/reference/general/client-sdk-migration/android/v2) and the [source code](https://github.com/braintree/braintree_android)
 
 ## 1.7.4
 

diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     compile 'com.braintreepayments:card-form:2.1.0'
-    compile project(':BraintreeApi')
+    compile 'com.braintreepayments.api:braintree:2.0.0'
     compile 'com.google.android.gms:play-services-wallet:[8.0.0,9.0.0)'
 
     androidTestCompile project(':TestUtils')

diff --git a/build.gradle b/build.gradle
@@ -90,7 +90,7 @@ allprojects {
         buildToolsVersion = '23.0.1'
         minSdkVersion = 15
         targetSdkVersion = 23
-        versionCode = 33
-        versionName = '2.0.0-SNAPSHOT'
+        versionCode = 34
+        versionName = '2.0.0'
     }
 }