From 4f1ec4fae617e20be94bc511e22c6aceaae2ffe2 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:02:25 -0500 Subject: [PATCH 01/20] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33630e0e..d3d3c75d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ 11 ] + java-version: [ 17 ] steps: - uses: actions/checkout@v4 From cb37c05814a743c9d86f418f433e037b9f324005 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:03:50 -0500 Subject: [PATCH 02/20] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3d3c75d..10f0ab4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ 17 ] + java-version: [ 11 ] steps: - uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Android SDK - uses: android-actions/setup-android@v2 + uses: android-actions/setup-android@v1 - name: Build CORE SDK ${{ matrix.java-version }} run: ./gradlew --scan clean lint testDebugUnitTest jacocoTestCoverageVerification From b9589ea62e26ecf3f678d20be3a17338bc023b94 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:04:14 -0500 Subject: [PATCH 03/20] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10f0ab4d..a1545bd7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Android SDK - uses: android-actions/setup-android@v1 + uses: android-actions/setup-android@v3 - name: Build CORE SDK ${{ matrix.java-version }} run: ./gradlew --scan clean lint testDebugUnitTest jacocoTestCoverageVerification From 167188dea8d0b422cd47e7c8361167b11759c663 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:05:17 -0500 Subject: [PATCH 04/20] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1545bd7..3be6157d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ 11 ] + java-version: [ 17 ] steps: - uses: actions/checkout@v4 From cdff9b9d44df4b5669e6e4c70ef5a12cdf6b45ec Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:08:24 -0500 Subject: [PATCH 05/20] Update ci.yml --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3be6157d..4bd6f437 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ 17 ] + java-version: [ 11 ] steps: - uses: actions/checkout@v4 @@ -27,11 +27,10 @@ jobs: - name: Setup JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: - distribution: 'zulu' java-version: ${{ matrix.java-version }} - name: Setup Android SDK - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v2 - name: Build CORE SDK ${{ matrix.java-version }} run: ./gradlew --scan clean lint testDebugUnitTest jacocoTestCoverageVerification From e5e3c2d5431acc3fd40448c40348776680a7a96f Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Tue, 18 Feb 2025 18:10:57 -0500 Subject: [PATCH 06/20] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bd6f437..ae251b4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: strategy: fail-fast: false matrix: + distribution: 'zulu' java-version: [ 11 ] steps: From e9b1f01e5a02f0419c31fc1ecee183b503db03e1 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:15:49 -0500 Subject: [PATCH 07/20] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae251b4b..d0ed0965 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - name: Setup JDK ${{ matrix.java }} uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: ${{ matrix.java-version }} - name: Setup Android SDK From 55091f871b4e78d6fb7ac47530f8a1a0940a1c0c Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:16:15 -0500 Subject: [PATCH 08/20] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0ed0965..d02239c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - distribution: 'zulu' + distribution: 'temurin' java-version: [ 11 ] steps: From f058be190f2cda4f07cb0fb7536bf6d96d8b170f Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:21:24 -0500 Subject: [PATCH 09/20] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d02239c8..e4523cd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: strategy: fail-fast: false matrix: - distribution: 'temurin' java-version: [ 11 ] steps: From b789b4ae061bda4c157003aaf8a2ca46f7e85c06 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:21:45 -0500 Subject: [PATCH 10/20] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4523cd9..f1803bdb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ matrix.java-version }} From 293b5c356b84d581eb8ce25bc5629f3af1fe82e0 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:23:31 -0500 Subject: [PATCH 11/20] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1803bdb..c1bd652a 100644 --- a/.github/workflows/ci.yml +++ b/.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@v3 + uses: actions/setup-java@v4 with: 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 From 870327f1c5769fd7432b85815f776afc00796871 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:39:48 -0500 Subject: [PATCH 12/20] Update to gradle 7 --- build.gradle | 2 +- core/build.gradle | 2 +- .../hyperwallet/android/ConfigurationTest.java | 4 ++++ .../android/balance/ListBalancesTest.java | 4 +++- .../android/util/MockShadowSystemClock.java | 18 ++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java diff --git a/build.gradle b/build.gradle index 2afc2280..f7c52b3e 100644 --- a/build.gradle +++ b/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 diff --git a/core/build.gradle b/core/build.gradle index 5155631c..0c546db5 100644 --- a/core/build.gradle +++ b/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 { diff --git a/core/src/test/java/com/hyperwallet/android/ConfigurationTest.java b/core/src/test/java/com/hyperwallet/android/ConfigurationTest.java index 9b90d1c6..bcfec099 100644 --- a/core/src/test/java/com/hyperwallet/android/ConfigurationTest.java +++ b/core/src/test/java/com/hyperwallet/android/ConfigurationTest.java @@ -6,6 +6,8 @@ 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; @@ -13,10 +15,12 @@ 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; diff --git a/core/src/test/java/com/hyperwallet/android/balance/ListBalancesTest.java b/core/src/test/java/com/hyperwallet/android/balance/ListBalancesTest.java index 329694ee..7f97d0a2 100644 --- a/core/src/test/java/com/hyperwallet/android/balance/ListBalancesTest.java +++ b/core/src/test/java/com/hyperwallet/android/balance/ListBalancesTest.java @@ -21,7 +21,6 @@ import com.hyperwallet.android.Hyperwallet; import com.hyperwallet.android.exception.HyperwalletException; -import com.hyperwallet.android.exception.HyperwalletRestException; import com.hyperwallet.android.listener.HyperwalletListener; import com.hyperwallet.android.model.Error; import com.hyperwallet.android.model.Errors; @@ -32,6 +31,7 @@ import com.hyperwallet.android.rule.HyperwalletMockWebServer; import com.hyperwallet.android.rule.HyperwalletSdkMock; import com.hyperwallet.android.sdk.R; +import com.hyperwallet.android.util.MockShadowSystemClock; import org.junit.Rule; import org.junit.Test; @@ -42,6 +42,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -49,6 +50,7 @@ import okhttp3.mockwebserver.RecordedRequest; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { MockShadowSystemClock.class}) public class ListBalancesTest { @Rule public ExternalResourceManager mExternalResourceManager = new ExternalResourceManager(); diff --git a/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java b/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java new file mode 100644 index 00000000..30bdd532 --- /dev/null +++ b/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java @@ -0,0 +1,18 @@ +package com.hyperwallet.android.util; + +import android.os.SystemClock; + +import org.robolectric.annotation.Implements; + +/** + * + */ +@Implements(value = SystemClock.class, callThroughByDefault = true) +public final class MockShadowSystemClock { + private MockShadowSystemClock() { + } + + public static long elapsedRealtime() { + return 0; + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 95533201..cef19d64 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 04 07:20:15 PDT 2024 +#Tue Feb 18 18:24:15 EST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From db4966c889d967b2132a136f66e3c0da8dbbfca9 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:53:06 -0500 Subject: [PATCH 13/20] Bumpup jacoco version --- core/config/jacoco-settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config/jacoco-settings.gradle b/core/config/jacoco-settings.gradle index 93a68657..a970988b 100644 --- a/core/config/jacoco-settings.gradle +++ b/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 From d87e8c3efbda1f58b596504104fa7bfe60da365f Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 10:56:02 -0500 Subject: [PATCH 14/20] Bumpup jacoco version --- core/config/jacoco-settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config/jacoco-settings.gradle b/core/config/jacoco-settings.gradle index a970988b..29c9b3a6 100644 --- a/core/config/jacoco-settings.gradle +++ b/core/config/jacoco-settings.gradle @@ -1,6 +1,6 @@ apply plugin: 'jacoco' -final def jacocoVersion = "0.8.8" +final def jacocoVersion = "0.8.6" jacoco { toolVersion = jacocoVersion From ffdc1765861d35ab52966fb6c5946165e7e6a522 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Wed, 19 Feb 2025 11:18:31 -0500 Subject: [PATCH 15/20] Bumpup jacoco version --- core/config/jacoco-settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/config/jacoco-settings.gradle b/core/config/jacoco-settings.gradle index 29c9b3a6..a970988b 100644 --- a/core/config/jacoco-settings.gradle +++ b/core/config/jacoco-settings.gradle @@ -1,6 +1,6 @@ apply plugin: 'jacoco' -final def jacocoVersion = "0.8.6" +final def jacocoVersion = "0.8.8" jacoco { toolVersion = jacocoVersion From 0c18fed3b795cfb25b6277e6aba082b894d952a6 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Thu, 20 Feb 2025 09:25:34 -0500 Subject: [PATCH 16/20] Update mockito-core from 3.2.0 to 5.15.2 --- core/build.gradle | 2 +- .../android/transfermethod/DeactivateBankCardTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 0c546db5..9cd80cd8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.12.2' - testImplementation "org.mockito:mockito-core:3.2.0" + 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' diff --git a/core/src/test/java/com/hyperwallet/android/transfermethod/DeactivateBankCardTest.java b/core/src/test/java/com/hyperwallet/android/transfermethod/DeactivateBankCardTest.java index 023f68a7..3eba01ac 100644 --- a/core/src/test/java/com/hyperwallet/android/transfermethod/DeactivateBankCardTest.java +++ b/core/src/test/java/com/hyperwallet/android/transfermethod/DeactivateBankCardTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; From f23b24ce1ce82036daa3a23e52093b1180ac9233 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Thu, 20 Feb 2025 09:34:22 -0500 Subject: [PATCH 17/20] Update appcompat from 1.2.0 to 1.7.0 --- core/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 9cd80cd8..3f554d3d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -43,8 +43,8 @@ android { dependencies { - implementation "androidx.appcompat:appcompat:1.2.0" - implementation "androidx.annotation:annotation:1.8.2" + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.annotation:annotation:1.9.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.12.2' From 56aad2c55fbb275058b2880569d9168718a79c0c Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Thu, 20 Feb 2025 09:44:28 -0500 Subject: [PATCH 18/20] Fix the artifact naming logic --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 3f554d3d..68f961d5 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -24,7 +24,7 @@ android { // Rename the artifact to core-.aar, required since gradle 7 libraryVariants.all { variant -> variant.outputs.all { output -> - outputFileName = "${archivesBaseName}-${defaultConfig.versionName}.aar" + outputFileName = "${archivesBaseName}-${version}.aar" } } } From 6d6a5d3b21c4475aaa7ff6ffcc0fd4653b53982b Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Thu, 20 Feb 2025 10:02:20 -0500 Subject: [PATCH 19/20] Update robolectric and hamcrest --- core/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 68f961d5..a49094df 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -47,12 +47,12 @@ dependencies { implementation 'androidx.annotation:annotation:1.9.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.12.2' + 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' } From e617060e751eefaf4cb41a9b6058182f30ebdc85 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Thu, 20 Feb 2025 10:15:04 -0500 Subject: [PATCH 20/20] Update robolectric and hamcrest --- build.gradle | 2 +- .../com/hyperwallet/android/RestTransactionBuilderTest.java | 6 +++--- .../com/hyperwallet/android/util/MockShadowSystemClock.java | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f7c52b3e..5fc3e32a 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ allprojects { mavenCentral() mavenLocal() } - project.version = "1.0.2" + project.version = "1.0.3-beta-1" } task clean(type: Delete) { diff --git a/core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java b/core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java index 88b10ccc..3e2d14cf 100644 --- a/core/src/test/java/com/hyperwallet/android/RestTransactionBuilderTest.java +++ b/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-beta-1")); 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-beta-1")); 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-beta-1")); assertThat(headers.get("X-Sdk-Type"), is("android")); assertThat(headers.get("X-Sdk-ContextId"), is(notNullValue())); assertThat(headers.get("X-Sdk-ContextId"), is(contextId)); diff --git a/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java b/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java index 30bdd532..b3dab5df 100644 --- a/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java +++ b/core/src/test/java/com/hyperwallet/android/util/MockShadowSystemClock.java @@ -5,7 +5,10 @@ import org.robolectric.annotation.Implements; /** - * + * Simple SystemClock Shadow representation + *

+ * Since Gradle 7, the Shadows SystemClock no longer supported + * by Android Shadow provided by Robolectric */ @Implements(value = SystemClock.class, callThroughByDefault = true) public final class MockShadowSystemClock {