From 8645e96e55bd674e24efbc7877b61c0c3dfc4e6c Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 16:19:46 -0700 Subject: [PATCH 1/6] DTSERWONE-1985 Add github actions --- .github/workflows/ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..5e4903af8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,37 @@ +name: Android UI SDK CI + +on: + workflow_dispatch: + push: + branches: + - master + - support/SDK-V3 + - feature/** + - bugfix/** + - dependabot/** + +jobs: + build: + # Compile the project using the predefined JDK versions in the strategy section + runs-on: ubuntu-latest + name: Build - JDK ${{ matrix.java-version }} + + strategy: + fail-fast: false + matrix: + java-version: [ 11 ] + + steps: + - uses: actions/checkout@v4 + + - 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@v2 + + - name: Build CORE SDK ${{ matrix.java-version }} + run: ./gradlew --scan clean lint testDebugUnitTest jacocoTestCoverageVerification From 3d6415c0d4687cfc716a5d4fb399b3b1418f8177 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 16:20:30 -0700 Subject: [PATCH 2/6] DTSERWONE-1985 Add github actions --- balancerepository/build.gradle | 2 ++ build.gradle | 2 +- commonui/build.gradle | 2 ++ receiptrepository/build.gradle | 2 +- receiptui/build.gradle | 1 + testutils/build.gradle | 1 + transfermethodrepository/build.gradle | 2 ++ transfermethodui/build.gradle | 2 ++ 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/balancerepository/build.gradle b/balancerepository/build.gradle index 9f64eff53..f482d1ef0 100644 --- a/balancerepository/build.gradle +++ b/balancerepository/build.gradle @@ -6,6 +6,8 @@ project.ext { apply from: "$rootProject.projectDir/publish.gradle" dependencies { + implementation "androidx.annotation:annotation:1.8.0" + testImplementation "org.robolectric:robolectric:$robolectricVersion" testImplementation "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion" testImplementation project(':testutils') diff --git a/build.gradle b/build.gradle index f8dff1874..1ad9d3024 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ subprojects { targetVersion = 30 codeVersion = 1 - hyperwalletCoreVersion = '1.0.0-beta12' + hyperwalletCoreVersion = '1.0.0-pentest12' hyperwalletInsightVersion = '1.0.0-beta02' // androidMaterialVersion = '1.0.0' diff --git a/commonui/build.gradle b/commonui/build.gradle index f709dadb4..ebcdd0028 100644 --- a/commonui/build.gradle +++ b/commonui/build.gradle @@ -12,6 +12,8 @@ apply from: "$rootProject.projectDir/android-library.gradle" apply from: "$rootProject.projectDir/publish.gradle" dependencies { + implementation "androidx.annotation:annotation:1.8.0" + implementation "com.hyperwallet.android:insight-sdk:$hyperwalletInsightVersion" implementation project(':commonrepository') diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle index 2c7f54326..20d562593 100644 --- a/receiptrepository/build.gradle +++ b/receiptrepository/build.gradle @@ -8,7 +8,7 @@ apply from: "$rootProject.projectDir/publish.gradle" dependencies { - + implementation "androidx.annotation:annotation:1.8.0" implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" api project(':commonrepository') diff --git a/receiptui/build.gradle b/receiptui/build.gradle index d0e986adc..3a5592466 100644 --- a/receiptui/build.gradle +++ b/receiptui/build.gradle @@ -15,6 +15,7 @@ dependencies { implementation project(":receiptrepository") implementation project(path: ':userrepository') implementation project(":transfermethodrepository") + implementation "androidx.annotation:annotation:1.8.0" implementation "com.google.android.material:material:$androidMaterialVersion" implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" diff --git a/testutils/build.gradle b/testutils/build.gradle index b174bee8e..70465952a 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -3,6 +3,7 @@ description = 'Test Utils for Hyperwallet UI SDK' apply from: "$rootProject.projectDir/android-library.gradle" dependencies { + implementation "androidx.annotation:annotation:1.8.0" implementation "androidx.test:rules:$testRulesVersion" implementation "androidx.test.espresso:espresso-core:$espressoVersion" implementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion" diff --git a/transfermethodrepository/build.gradle b/transfermethodrepository/build.gradle index 4b6a11851..65757d01c 100644 --- a/transfermethodrepository/build.gradle +++ b/transfermethodrepository/build.gradle @@ -9,6 +9,8 @@ apply from: "$rootProject.projectDir/publish.gradle" dependencies { api project(':commonrepository') + implementation "androidx.annotation:annotation:1.8.0" + testImplementation "org.robolectric:robolectric:$robolectricVersion" testImplementation "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion" testImplementation project(':testutils') diff --git a/transfermethodui/build.gradle b/transfermethodui/build.gradle index 207b83eb2..36e8677b6 100644 --- a/transfermethodui/build.gradle +++ b/transfermethodui/build.gradle @@ -17,6 +17,8 @@ apply from: "$rootProject.projectDir/publish.gradle" dependencies { + implementation "androidx.annotation:annotation:1.8.0" + implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" From 40ad99e865cad56904b435ec509355bece93601b Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 18:17:01 -0700 Subject: [PATCH 3/6] DTSERWONE-1985 Fix dependency --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1ad9d3024..f8dff1874 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ subprojects { targetVersion = 30 codeVersion = 1 - hyperwalletCoreVersion = '1.0.0-pentest12' + hyperwalletCoreVersion = '1.0.0-beta12' hyperwalletInsightVersion = '1.0.0-beta02' // androidMaterialVersion = '1.0.0' From d13bc62564d59348605dd8ce5d48f9b03356169b Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 18:35:43 -0700 Subject: [PATCH 4/6] DTSERWONE-1985 Fix dependency --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f8dff1874..32b67d83f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.6.4' classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7" // NOTE: Do not place your application dependencies here; they belong @@ -33,9 +33,9 @@ subprojects { ext { hyperwalletGroupId = 'com.hyperwallet.android.ui' - compileVersion = 30 + compileVersion = 34 minVersion = 21 - targetVersion = 30 + targetVersion = 34 codeVersion = 1 hyperwalletCoreVersion = '1.0.0-beta12' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f19f34f5d..ab5d8a3b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 25 20:26:26 PST 2019 +#Mon Jul 15 18:33:17 PDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip From d1eb1090d9cf60d7e39ddbaa05a89094b744f825 Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 18:36:10 -0700 Subject: [PATCH 5/6] DTSERWONE-1985 Fix dependency --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 32b67d83f..aa7aa8cc8 100644 --- a/build.gradle +++ b/build.gradle @@ -33,9 +33,9 @@ subprojects { ext { hyperwalletGroupId = 'com.hyperwallet.android.ui' - compileVersion = 34 + compileVersion = 30 minVersion = 21 - targetVersion = 34 + targetVersion = 30 codeVersion = 1 hyperwalletCoreVersion = '1.0.0-beta12' From d1cfc1e3349278167eb19b7b3f791efd311a0acf Mon Sep 17 00:00:00 2001 From: Gustavo Meyer Date: Mon, 15 Jul 2024 18:48:27 -0700 Subject: [PATCH 6/6] DTSERWONE-1985 Fix dependency --- build.gradle | 2 +- jacoco-settings.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index aa7aa8cc8..c290fe1e0 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ subprojects { coreTest = '1.3.0' // jacocoVersion = "0.8.2" - fileFilter = ['**/BuildConfig.*'] + fileFilter = ['**/BuildConfig.*', 'jdk.internal.*'] } } diff --git a/jacoco-settings.gradle b/jacoco-settings.gradle index d75c8a472..490139899 100644 --- a/jacoco-settings.gradle +++ b/jacoco-settings.gradle @@ -13,6 +13,7 @@ android { unitTests.all { jacoco { includeNoLocationClasses = true + excludes = ['jdk.internal.*'] } } }