Merge branch 'master' into feature/security-workflows

Author: palguindigue

.github/workflows/ci.yml

@@ -19,19 +19,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 11 ]
+        java-version: [ 17 ]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: ${{ matrix.java-version }}
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
 
       - name: Build CORE SDK ${{ matrix.java-version }}
         run: ./gradlew --scan clean lint testDebugUnitTest jacocoTestCoverageVerification

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,7 +19,7 @@ allprojects {
         mavenCentral()
         mavenLocal()
     }
-    project.version = "1.0.2"
+    project.version = "1.0.3"
 }
 
 task clean(type: Delete) {

core/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
         versionCode 4
-        versionName version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "VERSION_NAME", "\"$version\"")
     }
 
     buildTypes {
@@ -24,7 +24,7 @@ android {
             // Rename the artifact to core-<version>.aar, required since gradle 7
             libraryVariants.all { variant ->
                 variant.outputs.all { output ->
-                    outputFileName = "${archivesBaseName}-${defaultConfig.versionName}.aar"
+                    outputFileName = "${archivesBaseName}-${version}.aar"
                 }
             }
         }
@@ -43,16 +43,16 @@ android {
 
 dependencies {
 
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.annotation:annotation:1.8.2"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.annotation:annotation:1.8.2'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.12.2'
-    testImplementation "org.mockito:mockito-core:3.2.0"
+    testImplementation 'org.robolectric:robolectric:4.14.1'
+    testImplementation 'org.mockito:mockito-core:5.15.2'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
     testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: "1.1.1"
-    testImplementation 'org.hamcrest:hamcrest:2.1'
-    testImplementation 'org.hamcrest:hamcrest-library:2.1'
+    testImplementation 'org.hamcrest:hamcrest:3.0'
+    testImplementation 'org.hamcrest:hamcrest-library:3.0'
 }
 
 

core/config/jacoco-settings.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'jacoco'
 
-final def jacocoVersion = "0.8.2"
+final def jacocoVersion = "0.8.8"
 
 jacoco {
     toolVersion = jacocoVersion

core/src/main/java/com/hyperwallet/android/model/graphql/keyed/Country.java

@@ -38,6 +38,8 @@ public class Country implements KeyedNode {
     private static final String CURRENCIES = "currencies";
 
     private final Set<Currency> mCurrencies;
+
+    private final String mDefaultCurrencyCode;
     private final String mCode;
     private final MappedConnection<Currency> mCurrencyMappedConnection;
     private final String mName;
@@ -52,6 +54,7 @@ public Country(@NonNull final JSONObject country) throws JSONException, NoSuchMe
         mCode = country.optString(COUNTRY_CODE);
         mName = country.optString(COUNTRY_NAME);
         mCurrencies = new LinkedHashSet<>(1);
+        mDefaultCurrencyCode = country.optString("defaultCurrencyCode");
         JSONObject currencies = country.optJSONObject(CURRENCIES);
         if (currencies != null && currencies.length() != 0) {
             mCurrencyMappedConnection = new MappedConnection<>(currencies, Currency.class);
@@ -78,6 +81,14 @@ public String getName() {
         return mName;
     }
 
+    /**
+     * @return Currency code represented in ISO 4217 three-letter code format
+     */
+
+    public String getDefaultCurrency() {
+        return mDefaultCurrencyCode;
+    }
+
     /**
      * @return set of {@code Currency} represented by this {@code Country} instance
      */

core/src/main/java/com/hyperwallet/android/model/graphql/query/TransferMethodConfigurationKeysQuery.java

@@ -35,6 +35,7 @@ public class TransferMethodConfigurationKeysQuery implements GqlQuery {
                     + "\t\tnodes {\n"
                     + "\t\t\tcode\n"
                     + "\t\t\tname\n"
+                    + "\t\t\tdefaultCurrencyCode\n"
                     + "\t\t\tcurrencies {\n"
                     + "\t\t\t\tnodes {\n"
                     + "\t\t\t\t\tcode\n"

core/src/test/java/com/hyperwallet/android/ConfigurationTest.java

@@ -6,17 +6,21 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.fail;
 
+import com.hyperwallet.android.util.MockShadowSystemClock;
+
 import org.json.JSONException;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.util.Date;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = { MockShadowSystemClock.class})
 public class ConfigurationTest {
 
     private static Configuration mConfiguration;

core/src/test/java/com/hyperwallet/android/GqlTransactionBuilderTest.java

@@ -57,6 +57,7 @@ public void testBuild_withRequiredParametersOnly() {
                 + "\t\tnodes {\n"
                 + "\t\t\tcode\n"
                 + "\t\t\tname\n"
+                + "\t\t\tdefaultCurrencyCode\n"
                 + "\t\t\tcurrencies {\n"
                 + "\t\t\t\tnodes {\n"
                 + "\t\t\t\t\tcode\n"

core/src/test/java/com/hyperwallet/android/GqlTransactionTest.java

@@ -82,6 +82,7 @@ public void testPerformRequest_usingHttpPost() throws IOException {
                 + "\t\tnodes {\n"
                 + "\t\t\tcode\n"
                 + "\t\t\tname\n"
+                + "\t\t\tdefaultCurrencyCode\n"
                 + "\t\t\tcurrencies {\n"
                 + "\t\t\t\tnodes {\n"
                 + "\t\t\t\t\tcode\n"

core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java

@@ -67,7 +67,7 @@ public void testBuild_withRequiredParametersOnly() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.2"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.3"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));
@@ -104,7 +104,7 @@ public void testBuild_withJsonModelOptionalParameter() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.2"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.3"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));
@@ -140,7 +140,7 @@ public void testBuild_withQueryModelOptionalParameter() throws JSONException {
         assertThat(headers.get("Content-Type"), is("application/json"));
         assertThat(headers.get("User-Agent"), is("HyperwalletSDK/Android/" + BuildConfig.VERSION_NAME +
                 "; App: HyperwalletSDK; Android: " + Build.VERSION.RELEASE));
-        assertThat(headers.get("X-Sdk-Version"), is("1.0.2"));
+        assertThat(headers.get("X-Sdk-Version"), is("1.0.3"));
         assertThat(headers.get("X-Sdk-Type"), is("android"));
         assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue()));
         assertThat(headers.get("X-Sdk-ContextId"), is(contextId));