diff --git a/ZZZ/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md similarity index 100% rename from ZZZ/.github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE.md diff --git a/ZZZ/.travis.yml b/.travis.yml similarity index 100% rename from ZZZ/.travis.yml rename to .travis.yml diff --git a/ZZZ/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from ZZZ/CHANGELOG.md rename to CHANGELOG.md diff --git a/ZZZ/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from ZZZ/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/ZZZ/LICENSE b/LICENSE similarity index 100% rename from ZZZ/LICENSE rename to LICENSE diff --git a/ZZZ/README.md b/README.md similarity index 100% rename from ZZZ/README.md rename to README.md diff --git a/ZZZ/Rakefile b/Rakefile similarity index 100% rename from ZZZ/Rakefile rename to Rakefile diff --git a/VisaCheckout/.gitignore b/VisaCheckout/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/VisaCheckout/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/ZZZ/VisaCheckout/build.gradle b/VisaCheckout/build.gradle similarity index 97% rename from ZZZ/VisaCheckout/build.gradle rename to VisaCheckout/build.gradle index 1b6251be6f..a4b6812414 100644 --- a/ZZZ/VisaCheckout/build.gradle +++ b/VisaCheckout/build.gradle @@ -32,10 +32,11 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.braintreepayments.api:braintree-core:4.0.0-SNAPSHOT' + implementation project(':BraintreeCore') implementation(group: 'com.visa.checkout', name: 'visacheckout-android-sdk', version: '6.6.1', ext: 'aar') + testImplementation project(':TestUtils') testImplementation 'com.google.android.gms:play-services-wallet:16.0.1' testImplementation 'androidx.test:core:1.1.0' testImplementation 'androidx.test:runner:1.1.1' diff --git a/ZZZ/VisaCheckout/proguard.pro b/VisaCheckout/proguard.pro similarity index 100% rename from ZZZ/VisaCheckout/proguard.pro rename to VisaCheckout/proguard.pro diff --git a/ZZZ/VisaCheckout/src/main/AndroidManifest.xml b/VisaCheckout/src/main/AndroidManifest.xml similarity index 100% rename from ZZZ/VisaCheckout/src/main/AndroidManifest.xml rename to VisaCheckout/src/main/AndroidManifest.xml diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckout.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckout.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckout.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckout.java diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutBuilder.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutBuilder.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutBuilder.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutBuilder.java diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutButton.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutButton.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutButton.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutButton.java diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutCreateProfileBuilderCallback.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutCreateProfileBuilderCallback.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutCreateProfileBuilderCallback.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutCreateProfileBuilderCallback.java diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutOnActivityResultCallback.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutOnActivityResultCallback.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutOnActivityResultCallback.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutOnActivityResultCallback.java diff --git a/ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutTokenizeCallback.java b/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutTokenizeCallback.java similarity index 100% rename from ZZZ/VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutTokenizeCallback.java rename to VisaCheckout/src/main/java/com/braintreepayments/api/VisaCheckoutTokenizeCallback.java diff --git a/ZZZ/VisaCheckout/src/main/res/layout/visa_checkout_button_wrapper.xml b/VisaCheckout/src/main/res/layout/visa_checkout_button_wrapper.xml similarity index 100% rename from ZZZ/VisaCheckout/src/main/res/layout/visa_checkout_button_wrapper.xml rename to VisaCheckout/src/main/res/layout/visa_checkout_button_wrapper.xml diff --git a/ZZZ/VisaCheckout/src/test/assets/fixtures/configuration/with_visa_checkout.json b/VisaCheckout/src/test/assets/fixtures/configuration/with_visa_checkout.json similarity index 100% rename from ZZZ/VisaCheckout/src/test/assets/fixtures/configuration/with_visa_checkout.json rename to VisaCheckout/src/test/assets/fixtures/configuration/with_visa_checkout.json diff --git a/ZZZ/VisaCheckout/src/test/assets/fixtures/payment_methods/visa_checkout_response.json b/VisaCheckout/src/test/assets/fixtures/payment_methods/visa_checkout_response.json similarity index 100% rename from ZZZ/VisaCheckout/src/test/assets/fixtures/payment_methods/visa_checkout_response.json rename to VisaCheckout/src/test/assets/fixtures/payment_methods/visa_checkout_response.json diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutBuilderUnitTest.java b/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutBuilderUnitTest.java similarity index 100% rename from ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutBuilderUnitTest.java rename to VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutBuilderUnitTest.java diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java b/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java similarity index 95% rename from ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java rename to VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java index 4cceade3e9..8ed68fa63a 100644 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java +++ b/VisaCheckout/src/test/java/com/braintreepayments/api/VisaCheckoutUnitTest.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.concurrent.CountDownLatch; -import static com.braintreepayments.api.FixturesHelper.stringFromFixture; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static org.mockito.Matchers.isNull; @@ -45,8 +44,7 @@ public class VisaCheckoutUnitTest { @Before public void setup() throws Exception { - JSONObject visaConfiguration = new JSONObject(stringFromFixture("configuration/with_visa_checkout.json")); - mConfigurationWithVisaCheckout = Configuration.fromJson(visaConfiguration.toString()); + mConfigurationWithVisaCheckout = Configuration.fromJson(Fixtures.CONFIGURATION_WITH_VISA_CHECKOUT); visaPaymentSummary = PowerMockito.mock(VisaPaymentSummary.class); when(visaPaymentSummary.getCallId()).thenReturn("stubbedCallId"); @@ -144,7 +142,7 @@ public void onResult(ProfileBuilder profileBuilder, Exception error) { @Test public void tokenize_whenSuccessful_postsVisaPaymentMethodNonce() throws Exception { VisaCheckoutNonce visaCheckoutNonce = - VisaCheckoutNonce.fromJson(stringFromFixture("payment_methods/visa_checkout_response.json")); + VisaCheckoutNonce.fromJson(Fixtures.PAYMENT_METHODS_VISA_CHECKOUT_RESPONSE); TokenizationClient tokenizationClient = new MockTokenizationClientBuilder() .successNonce(visaCheckoutNonce) @@ -164,7 +162,7 @@ public void tokenize_whenSuccessful_postsVisaPaymentMethodNonce() throws Excepti @Test public void tokenize_whenSuccessful_sendsAnalyticEvent() throws Exception { VisaCheckoutNonce visaCheckoutNonce = - VisaCheckoutNonce.fromJson(stringFromFixture("payment_methods/visa_checkout_response.json")); + VisaCheckoutNonce.fromJson(Fixtures.PAYMENT_METHODS_VISA_CHECKOUT_RESPONSE); TokenizationClient tokenizationClient = new MockTokenizationClientBuilder() .successNonce(visaCheckoutNonce) diff --git a/ZZZ/VisaCheckout/src/test/java/org/mockito/configuration/MockitoConfiguration.java b/VisaCheckout/src/test/java/org/mockito/configuration/MockitoConfiguration.java similarity index 100% rename from ZZZ/VisaCheckout/src/test/java/org/mockito/configuration/MockitoConfiguration.java rename to VisaCheckout/src/test/java/org/mockito/configuration/MockitoConfiguration.java diff --git a/ZZZ/VisaCheckout/src/test/resources/robolectric.properties b/VisaCheckout/src/test/resources/robolectric.properties similarity index 100% rename from ZZZ/VisaCheckout/src/test/resources/robolectric.properties rename to VisaCheckout/src/test/resources/robolectric.properties diff --git a/ZZZ/ACKNOWLEDGEMENT.md b/ZZZ/ACKNOWLEDGEMENT.md deleted file mode 100644 index cfd7c0259b..0000000000 --- a/ZZZ/ACKNOWLEDGEMENT.md +++ /dev/null @@ -1,11 +0,0 @@ -Acknowledgements ----------------- - -The Braintree Visa Checkout SDK uses code from the following libraries: - - * [Android Testing Support Library](https://google.github.io/android-testing-support-library/), [Android Software Development Kit License Agreement](http://developer.android.com/sdk/terms.html) - * [Android Support Library](http://developer.android.com/tools/support-library/index.html), [Android Software Development Kit License Agreement](http://developer.android.com/sdk/terms.html) - * [Google Play Services Wallet](https://developers.google.com/android/guides/overview), [Android Software Development Kit License Agreement](http://developer.android.com/sdk/terms.html) - * [Gradle Nexus Staging plugin](https://github.com/Codearte/gradle-nexus-staging-plugin), Apache License Version 2.0 - * [PowerMock](https://github.com/jayway/powermock), Apache License Version 2.0 - * [Robolectric](https://github.com/robolectric/robolectric), MIT License diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/FixturesHelper.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/FixturesHelper.java deleted file mode 100644 index 3569dbcfcf..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/FixturesHelper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.braintreepayments.api; - -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; - -public class FixturesHelper { - - private static final String FIXTURES_PATH = "fixtures/"; - private static final String LOCAL_UNIT_TEST_FIXTURES_PATH = "src/test/assets/" + FIXTURES_PATH; - - public static String stringFromFixture(String filename) { - try { - return stringFromUnitTestFixture(filename); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - private static String stringFromUnitTestFixture(String filename) throws IOException { - InputStream inputStream = null; - try { - inputStream = new FileInputStream(LOCAL_UNIT_TEST_FIXTURES_PATH + filename); - return StreamHelper.getString(inputStream); - } finally { - if (inputStream != null) { - inputStream.close(); - } - } - } -} diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/JSONBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/JSONBuilder.java deleted file mode 100644 index eb5fbaefd2..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/JSONBuilder.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.braintreepayments.api; - -import org.json.JSONException; -import org.json.JSONObject; - -public abstract class JSONBuilder { - - protected JSONObject mJsonBody; - - protected JSONBuilder(JSONObject json) { - mJsonBody = json; - } - - public JSONBuilder() { - mJsonBody = new JSONObject(); - } - - public String build() { - return mJsonBody.toString(); - } - - public void put(Object value) { - int stackIndex = 3; - StackTraceElement[] stack = Thread.currentThread().getStackTrace(); - if (!stack[0].isNativeMethod()) { - stackIndex--; - } - - StackTraceElement current = stack[stackIndex]; - put(current.getMethodName(), value); - } - - public void put(String key, Object value) { - try { - mJsonBody.put(key, value); - } catch (JSONException ignored) {} - } -} diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockBraintreeClientBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockBraintreeClientBuilder.java deleted file mode 100644 index d89986d1fc..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockBraintreeClientBuilder.java +++ /dev/null @@ -1,159 +0,0 @@ -package com.braintreepayments.api; - -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class MockBraintreeClientBuilder { - - private String sendGETSuccess; - private Exception sendGETError; - - private String sendPOSTSuccess; - private Exception sendPOSTError; - - private String sendGraphQLPOSTSuccess; - private Exception sendGraphQLPOSTError; - - private Configuration configuration; - private Exception configurationError; - - private Authorization authorization; - - private String sessionId; - private String integration; - - private boolean urlSchemeInAndroidManifest = true; - private boolean venmoAppSwitchAvailable; - - public MockBraintreeClientBuilder configuration(Configuration configuration) { - this.configuration = configuration; - return this; - } - - public MockBraintreeClientBuilder configurationError(Exception configurationError) { - this.configurationError = configurationError; - return this; - } - - public MockBraintreeClientBuilder authorization(Authorization authorization) { - this.authorization = authorization; - return this; - } - - public MockBraintreeClientBuilder sendGETSuccess(String response) { - sendGETSuccess = response; - return this; - } - - public MockBraintreeClientBuilder sendGETError(Exception error) { - sendGETError = error; - return this; - } - - public MockBraintreeClientBuilder sendPOSTSuccess(String response) { - sendPOSTSuccess = response; - return this; - } - - public MockBraintreeClientBuilder sendPOSTError(Exception error) { - sendPOSTError = error; - return this; - } - public MockBraintreeClientBuilder sendGraphQLPOSTSuccess(String response) { - sendGraphQLPOSTSuccess = response; - return this; - } - - public MockBraintreeClientBuilder sendGraphQLPOSTError(Exception error) { - sendGraphQLPOSTError = error; - return this; - } - - public MockBraintreeClientBuilder sessionId(String sessionId) { - this.sessionId = sessionId; - return this; - } - - public MockBraintreeClientBuilder integration(String integration) { - this.integration = integration; - return this; - } - - public MockBraintreeClientBuilder venmoAppSwitchAvailable(boolean venmoAppSwitchAvailable) { - this.venmoAppSwitchAvailable = venmoAppSwitchAvailable; - return this; - } - - public MockBraintreeClientBuilder urlSchemeDeclaredInManifest(boolean urlSchemeInAndroidManifest) { - this.urlSchemeInAndroidManifest = urlSchemeInAndroidManifest; - return this; - } - - public BraintreeClient build() { - BraintreeClient braintreeClient = mock(BraintreeClient.class); - when(braintreeClient.getAuthorization()).thenReturn(authorization); - when(braintreeClient.getSessionId()).thenReturn(sessionId); - when(braintreeClient.getIntegrationType()).thenReturn(integration); - when(braintreeClient.isUrlSchemeDeclaredInAndroidManifest(anyString(), any(Class.class))).thenReturn(urlSchemeInAndroidManifest); - - doAnswer(new Answer() { - @Override - public Void answer(InvocationOnMock invocation) { - ConfigurationCallback callback = (ConfigurationCallback) invocation.getArguments()[0]; - if (configuration != null) { - callback.onResult(configuration, null); - } else if (configurationError != null) { - callback.onResult(null, configurationError); - } - return null; - } - }).when(braintreeClient).getConfiguration(any(ConfigurationCallback.class)); - - doAnswer(new Answer() { - @Override - public Void answer(InvocationOnMock invocation) { - HttpResponseCallback callback = (HttpResponseCallback) invocation.getArguments()[2]; - if (sendGETSuccess != null) { - callback.success(sendGETSuccess); - } else if (sendGETError != null) { - callback.failure(sendGETError); - } - return null; - } - }).when(braintreeClient).sendGET(anyString(), any(HttpResponseCallback.class)); - - doAnswer(new Answer() { - @Override - public Void answer(InvocationOnMock invocation) { - HttpResponseCallback callback = (HttpResponseCallback) invocation.getArguments()[3]; - if (sendPOSTSuccess != null) { - callback.success(sendPOSTSuccess); - } else if (sendPOSTError != null) { - callback.failure(sendPOSTError); - } - return null; - } - }).when(braintreeClient).sendPOST(anyString(), anyString(), any(HttpResponseCallback.class)); - - doAnswer(new Answer() { - @Override - public Void answer(InvocationOnMock invocation) throws Throwable { - HttpResponseCallback callback = (HttpResponseCallback) invocation.getArguments()[2]; - if (sendGraphQLPOSTSuccess != null) { - callback.success(sendGraphQLPOSTSuccess); - } else if (sendGraphQLPOSTError != null) { - callback.failure(sendGraphQLPOSTError); - } - return null; - } - }).when(braintreeClient).sendGraphQLPOST(anyString(), any(HttpResponseCallback.class)); - - return braintreeClient; - } -} diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockTokenizationClientBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockTokenizationClientBuilder.java deleted file mode 100644 index e13bf5201c..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/MockTokenizationClientBuilder.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.braintreepayments.api; - -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; - -public class MockTokenizationClientBuilder { - - private Exception error; - private PaymentMethodNonce successNonce; - - public MockTokenizationClientBuilder successNonce(PaymentMethodNonce successNonce) { - this.successNonce = successNonce; - return this; - } - - public MockTokenizationClientBuilder error(Exception error) { - this.error = error; - return this; - } - - public TokenizationClient build() { - TokenizationClient tokenizationClient = mock(TokenizationClient.class); - - doAnswer(new Answer() { - @Override - public Void answer(InvocationOnMock invocation) throws Throwable { - PaymentMethodNonceCallback listener = (PaymentMethodNonceCallback) invocation.getArguments()[1]; - if (successNonce != null) { - listener.success(successNonce); - } else if (error != null) { - listener.failure(error); - } - return null; - } - }).when(tokenizationClient).tokenize(any(PaymentMethodBuilder.class), any(PaymentMethodNonceCallback.class)); - - return tokenizationClient; - } -} diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestActivity.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestActivity.java deleted file mode 100644 index 78b8cb3c43..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestActivity.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.braintreepayments.api; - -import android.os.Bundle; - -import com.braintreepayments.api.visacheckout.R; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -public class TestActivity extends AppCompatActivity { - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setTheme(R.style.Theme_AppCompat); - } -} diff --git a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestConfigurationBuilder.java b/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestConfigurationBuilder.java deleted file mode 100644 index 766e0e66b7..0000000000 --- a/ZZZ/VisaCheckout/src/test/java/com/braintreepayments/api/TestConfigurationBuilder.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.braintreepayments.api; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; - -public class TestConfigurationBuilder extends JSONBuilder { - - public static T basicConfig() { - return new TestConfigurationBuilder().buildConfiguration(); - } - - public TestConfigurationBuilder() { - super(); - clientApiUrl("client_api_url"); - environment("test"); - merchantId("integration_merchant_id"); - } - - public TestConfigurationBuilder clientApiUrl(String clientApiUrl) { - put(clientApiUrl); - return this; - } - - public TestConfigurationBuilder environment(String environment) { - put(environment); - return this; - } - - public TestConfigurationBuilder merchantId(String merchantId) { - put(merchantId); - return this; - } - - public TestConfigurationBuilder visaCheckout(TestVisaCheckoutConfigurationBuilder visaCheckoutConfigurationBuilder) { - try { - put(new JSONObject(visaCheckoutConfigurationBuilder.build())); - } catch (JSONException ignored) {} - return this; - } - - @SuppressWarnings("unchecked") - public T buildConfiguration() { - try { - Class configuration = Class.forName("com.braintreepayments.api.Configuration"); - Method fromJson = configuration.getDeclaredMethod("fromJson", String.class); - return (T) fromJson.invoke(null, build()); - } catch (NoSuchMethodException ignored) {} - catch (InvocationTargetException ignored) {} - catch (IllegalAccessException ignored) {} - catch (ClassNotFoundException ignored) {} - - return (T) build(); - } - - public static class TestVisaCheckoutConfigurationBuilder extends JSONBuilder { - - public TestVisaCheckoutConfigurationBuilder() { - super(); - } - - protected TestVisaCheckoutConfigurationBuilder(JSONObject json) { - super(json); - } - - public TestVisaCheckoutConfigurationBuilder apikey(String apikey) { - put(apikey); - return this; - } - - public TestVisaCheckoutConfigurationBuilder externalClientId(String externalClientId) { - put(externalClientId); - return this; - } - - public TestVisaCheckoutConfigurationBuilder supportedCardTypes(String... supportedCardTypes) { - put(new JSONArray(Arrays.asList(supportedCardTypes))); - return this; - } - } -} diff --git a/ZZZ/libs/visacheckout-android-sdk-6.6.1.aar b/ZZZ/libs/visacheckout-android-sdk-6.6.1.aar deleted file mode 100644 index b036538207..0000000000 Binary files a/ZZZ/libs/visacheckout-android-sdk-6.6.1.aar and /dev/null differ diff --git a/ZZZ/script/deploy_snapshot.sh b/ZZZ/script/deploy_snapshot.sh deleted file mode 100755 index 9373edfdfa..0000000000 --- a/ZZZ/script/deploy_snapshot.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -e - -SLUG="braintree/braintree-android-visa-checkout" -JDK="oraclejdk8" -BRANCH="3.x" - -if [ "$TRAVIS_REPO_SLUG" != "$SLUG" ]; then - echo "Skipping snapshot deployment: wrong repository. Expected '$SLUG' but was '$TRAVIS_REPO_SLUG'." -elif [ "$TRAVIS_JDK_VERSION" != "$JDK" ]; then - echo "Skipping snapshot deployment: wrong JDK. Expected '$JDK' but was '$TRAVIS_JDK_VERSION'." -elif [ "$TRAVIS_PULL_REQUEST" != "false" ]; then - echo "Skipping snapshot deployment: was pull request." -elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then - echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'." -elif [[ $(./gradlew properties | grep version) != *-SNAPSHOT ]]; then - echo "Skipping snapshot deployment: not a snapshot version." -else - echo "Deploying snapshot..." - ./gradlew :VisaCheckout:uploadArchives - echo "Snapshot deployed!" -fi diff --git a/ZZZ/build.gradle b/build.gradle similarity index 100% rename from ZZZ/build.gradle rename to build.gradle diff --git a/ZZZ/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from ZZZ/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/ZZZ/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from ZZZ/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/ZZZ/gradlew b/gradlew similarity index 100% rename from ZZZ/gradlew rename to gradlew diff --git a/ZZZ/gradlew.bat b/gradlew.bat similarity index 100% rename from ZZZ/gradlew.bat rename to gradlew.bat diff --git a/ZZZ/settings.gradle b/settings.gradle similarity index 92% rename from ZZZ/settings.gradle rename to settings.gradle index 1338db08b0..1d4f377272 100644 --- a/ZZZ/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':VisaCheckout' include ':GooglePay' include ':BraintreeModels' include ':Venmo'