From bc9dc0323dfa0914fcc4505395ed2b34217772fa Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Wed, 17 Jul 2019 19:22:37 +0300 Subject: [PATCH 01/13] HW-54227: Create receiptrepository module --- android-library.gradle | 5 +- common/build.gradle | 89 +---------------- receipt/build.gradle | 95 +------------------ receiptrepository/build.gradle | 13 +++ .../src/main/AndroidManifest.xml | 4 + .../PrepaidCardReceiptDataSource.java | 0 .../PrepaidCardReceiptDataSourceFactory.java | 0 .../PrepaidCardReceiptRepository.java | 0 .../PrepaidCardReceiptRepositoryImpl.java | 0 .../repository/UserReceiptDataSource.java | 0 .../UserReceiptDataSourceFactory.java | 0 .../repository/UserReceiptRepository.java | 0 .../repository/UserReceiptRepositoryImpl.java | 0 ...epaidCardReceiptDataSourceFactoryTest.java | 0 .../PrepaidCardReceiptDataSourceTest.java | 0 .../PrepaidCardReceiptRepositoryImplTest.java | 0 .../UserReceiptDataSourceFactoryTest.java | 0 .../repository/UserReceiptDataSourceTest.java | 0 .../UserReceiptRepositoryImplTest.java | 0 .../HyperwalletExternalResourceManager.java | 0 .../authentication_token_response.json | 0 .../prepaid_card_receipt_credit_response.json | 0 .../prepaid_card_receipt_debit_response.json | 0 .../prepaid_card_receipt_list_response.json | 0 ...id_card_receipt_unknown_type_response.json | 0 .../resources/receipt_credit_response.json | 0 .../resources/receipt_debit_response.json | 0 .../receipt_list_date_grouping_response.json | 0 .../receipt_list_paged_last_response.json | 0 .../receipt_list_paged_response.json | 0 .../receipt_list_paged_second_response.json | 0 .../receipt_list_paged_third_response.json | 0 .../test/resources/receipt_list_response.json | 0 .../receipt_unknown_type_response.json | 0 settings.gradle | 2 +- ui/build.gradle | 3 + 36 files changed, 25 insertions(+), 186 deletions(-) create mode 100644 receiptrepository/build.gradle create mode 100644 receiptrepository/src/main/AndroidManifest.xml rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java (100%) rename {receipt => receiptrepository}/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java (100%) rename {receipt => receiptrepository}/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java (100%) rename {receipt => receiptrepository}/src/test/resources/authentication_token_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/prepaid_card_receipt_credit_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/prepaid_card_receipt_debit_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/prepaid_card_receipt_list_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/prepaid_card_receipt_unknown_type_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_credit_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_debit_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_date_grouping_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_paged_last_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_paged_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_paged_second_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_paged_third_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_list_response.json (100%) rename {receipt => receiptrepository}/src/test/resources/receipt_unknown_type_response.json (100%) diff --git a/android-library.gradle b/android-library.gradle index 620173287..7df9e7a97 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,7 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android { @@ -56,7 +53,7 @@ task sourcesJar(type: Jar) { dependencies { implementation "com.google.android.material:material:$androidMaterialVersion" - api "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" + implementation "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion" diff --git a/common/build.gradle b/common/build.gradle index cf60c3f49..9daf9e7de 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,88 +1 @@ -apply from: "$rootProject.projectDir/android-library.gradle" - - -def aarFile = file("$buildDir/outputs/aar/common-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletCommonUi(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'common' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android Common UI SDK' - description = 'Hyperwallet Common UI SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletCommonUi -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk-common" - } -} \ No newline at end of file +apply from: "$rootProject.projectDir/android-library.gradle" \ No newline at end of file diff --git a/receipt/build.gradle b/receipt/build.gradle index cff209c86..9d913bb29 100644 --- a/receipt/build.gradle +++ b/receipt/build.gradle @@ -1,7 +1,8 @@ apply from: "$rootProject.projectDir/android-library.gradle" dependencies { - api project(":common") + implementation project(":common") + implementation project(":receiptrepository") implementation "com.google.android.material:material:$androidMaterialVersion" implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" @@ -10,8 +11,6 @@ dependencies { implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" - testImplementation "org.robolectric:robolectric:$robolectricVersion" - androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion" @@ -19,93 +18,3 @@ dependencies { androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" } - -def aarFile = file("$buildDir/outputs/aar/receipt-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletReceiptUi(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'receipt' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android Receipt UI SDK' - description = 'Hyperwallet Receipt UI SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - if (it.group == "hyperwallet-android-ui-sdk") { - dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") - } else { - dependencyNode.appendNode('groupId', it.group) - } - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletReceiptUi -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk-receipt" - } -} diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle new file mode 100644 index 000000000..2174d0cee --- /dev/null +++ b/receiptrepository/build.gradle @@ -0,0 +1,13 @@ +apply from: "$rootProject.projectDir/android-library.gradle" + +dependencies { + api project(":common") + + implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" + implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" + testImplementation "org.robolectric:robolectric:$robolectricVersion" + + androidTestImplementation "androidx.test:rules:$testRulesVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion" +} \ No newline at end of file diff --git a/receiptrepository/src/main/AndroidManifest.xml b/receiptrepository/src/main/AndroidManifest.xml new file mode 100644 index 000000000..25d33e545 --- /dev/null +++ b/receiptrepository/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactory.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepository.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImpl.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSource.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactory.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepository.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java b/receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java rename to receiptrepository/src/main/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImpl.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceFactoryTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptRepositoryImplTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceFactoryTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptDataSourceTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/receipt/repository/UserReceiptRepositoryImplTest.java diff --git a/receipt/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java b/receiptrepository/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java similarity index 100% rename from receipt/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java rename to receiptrepository/src/test/java/com/hyperwallet/android/ui/rule/HyperwalletExternalResourceManager.java diff --git a/receipt/src/test/resources/authentication_token_response.json b/receiptrepository/src/test/resources/authentication_token_response.json similarity index 100% rename from receipt/src/test/resources/authentication_token_response.json rename to receiptrepository/src/test/resources/authentication_token_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_credit_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_credit_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_credit_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_credit_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_debit_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_debit_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_debit_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_debit_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_list_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_list_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_list_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_list_response.json diff --git a/receipt/src/test/resources/prepaid_card_receipt_unknown_type_response.json b/receiptrepository/src/test/resources/prepaid_card_receipt_unknown_type_response.json similarity index 100% rename from receipt/src/test/resources/prepaid_card_receipt_unknown_type_response.json rename to receiptrepository/src/test/resources/prepaid_card_receipt_unknown_type_response.json diff --git a/receipt/src/test/resources/receipt_credit_response.json b/receiptrepository/src/test/resources/receipt_credit_response.json similarity index 100% rename from receipt/src/test/resources/receipt_credit_response.json rename to receiptrepository/src/test/resources/receipt_credit_response.json diff --git a/receipt/src/test/resources/receipt_debit_response.json b/receiptrepository/src/test/resources/receipt_debit_response.json similarity index 100% rename from receipt/src/test/resources/receipt_debit_response.json rename to receiptrepository/src/test/resources/receipt_debit_response.json diff --git a/receipt/src/test/resources/receipt_list_date_grouping_response.json b/receiptrepository/src/test/resources/receipt_list_date_grouping_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_date_grouping_response.json rename to receiptrepository/src/test/resources/receipt_list_date_grouping_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_last_response.json b/receiptrepository/src/test/resources/receipt_list_paged_last_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_last_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_last_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_response.json b/receiptrepository/src/test/resources/receipt_list_paged_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_second_response.json b/receiptrepository/src/test/resources/receipt_list_paged_second_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_second_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_second_response.json diff --git a/receipt/src/test/resources/receipt_list_paged_third_response.json b/receiptrepository/src/test/resources/receipt_list_paged_third_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_paged_third_response.json rename to receiptrepository/src/test/resources/receipt_list_paged_third_response.json diff --git a/receipt/src/test/resources/receipt_list_response.json b/receiptrepository/src/test/resources/receipt_list_response.json similarity index 100% rename from receipt/src/test/resources/receipt_list_response.json rename to receiptrepository/src/test/resources/receipt_list_response.json diff --git a/receipt/src/test/resources/receipt_unknown_type_response.json b/receiptrepository/src/test/resources/receipt_unknown_type_response.json similarity index 100% rename from receipt/src/test/resources/receipt_unknown_type_response.json rename to receiptrepository/src/test/resources/receipt_unknown_type_response.json diff --git a/settings.gradle b/settings.gradle index f0129ca86..50c4321f5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':ui', ':common', ':receipt' +include ':ui', ':common', ':receipt', ':receiptrepository' //add libraries here diff --git a/ui/build.gradle b/ui/build.gradle index bc6fa3a49..2d61b4c8e 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -1,3 +1,6 @@ +apply plugin: 'maven-publish' +apply plugin: 'signing' +apply plugin: 'org.sonarqube' apply from: "$rootProject.projectDir/android-library.gradle" dependencies { From 0dd017848e353ddef9a0944afabc4fd2be2feb46 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Wed, 17 Jul 2019 19:22:37 +0300 Subject: [PATCH 02/13] HW-54227: Create receiptrepository module --- receiptrepository/build.gradle | 98 ++++++++++++++++++- .../config/jacoco-settings.gradle | 82 ++++++++++++++++ receiptrepository/config/lint.xml | 10 ++ 3 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 receiptrepository/config/jacoco-settings.gradle create mode 100644 receiptrepository/config/lint.xml diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle index 2174d0cee..329f2f846 100644 --- a/receiptrepository/build.gradle +++ b/receiptrepository/build.gradle @@ -1,13 +1,109 @@ apply from: "$rootProject.projectDir/android-library.gradle" dependencies { - api project(":common") + implementation project(":common") + implementation "com.google.android.material:material:$androidMaterialVersion" + implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" + implementation "androidx.recyclerview:recyclerview:$recycleViewVersion" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" + testImplementation "org.robolectric:robolectric:$robolectricVersion" androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion" + androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" + androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" +} + +def aarFile = file("$buildDir/outputs/aar/receiptrepository-$version" + ".aar") +def aarArtifact = artifacts.add('archives', aarFile) { + type 'aar' +} + +def isReleaseVersion = !version.endsWith('SNAPSHOT') + +publishing { + + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" + url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl + credentials { + username sonatypeUsername + password sonatypePassword + } + } + } + + publications { + hyperwalletReceiptrepository(MavenPublication) { + groupId = hyperwalletGroupId + artifactId = 'receiptrepository' + version = version + + artifact(sourcesJar) + artifact(javadocsJar) + artifact(aarArtifact) + + pom { + name = 'Hyperwallet Android Receiptrepository sub package SDK' + description = 'Hyperwallet Receiptrepository subpackage SDK for Android to integrate with Hyperwallet Platform' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + if (it.group == "hyperwallet-android-ui-sdk") { + dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") + } else { + dependencyNode.appendNode('groupId', it.group) + } + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + licenses { + license { + name = 'MIT License' + url = 'http://www.opensource.org/licenses/MIT' + } + } + developers { + developer { + id = 'devs' + name = 'Hyperwallet Developers' + } + } + scm { + connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + } + } + } + } +} + +tasks.withType(Sign) { + onlyIf { + isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() + } +} + +signing { + sign publishing.publications.hyperwalletReceiptrepository +} + +sonarqube { + properties { + def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" + property "sonar.sources", "src/main/java" + property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" + property "sonar.libraries", libraries + property "sonar.projectName", "android-ui-sdk-receiptrepository" + } } \ No newline at end of file diff --git a/receiptrepository/config/jacoco-settings.gradle b/receiptrepository/config/jacoco-settings.gradle new file mode 100644 index 000000000..e0bb22486 --- /dev/null +++ b/receiptrepository/config/jacoco-settings.gradle @@ -0,0 +1,82 @@ +apply plugin: 'jacoco' + +final def jacocoVersion = "0.8.2" + +jacoco { + toolVersion = jacocoVersion +} + +android { + testOptions { + unitTests { + includeAndroidResources = true + returnDefaultValues = true + } + unitTests.all { + jacoco { + includeNoLocationClasses = true + } + } + } +} + +def fileFilter = ['**/BuildConfig.*', + '**/com/hyperwallet/android/ui/receipt/view/*.*', + '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*', + '**/com/hyperwallet/android/ui/receipt/repository/ReceiptRepositoryImpl.*' +] + +def debugClassPaths = [ + '**/intermediates/javac/debug/*/classes/**' +] + +final def coverageSourceDirs = ["$project.projectDir/src/main/java/*"] + +task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest') { + + group = 'Reporting' + description = 'Generate Jacoco coverage reports.' + reports { + html { + enabled = true + destination file("$project.buildDir/reports/jacoco") + } + } + + classDirectories = fileTree( + dir: "${buildDir}", + includes: debugClassPaths, + excludes: fileFilter + ) + + additionalSourceDirs = files(coverageSourceDirs) + sourceDirectories = files(coverageSourceDirs) + executionData = files("${project.buildDir}/jacoco/testDebugUnitTest.exec") +} + +task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn: 'jacocoTestReport') { + + group = 'Verification' + classDirectories = fileTree( + dir: "${buildDir}", + includes: debugClassPaths, + excludes: fileFilter + ) + additionalSourceDirs = files(coverageSourceDirs) + sourceDirectories = files(coverageSourceDirs) + executionData = files("${project.buildDir}/jacoco/testDebugUnitTest.exec") + + violationRules { + setFailOnViolation(true) + + rule { + element = 'CLASS' + limit { + value = 'COVEREDRATIO' + counter = 'BRANCH' + minimum = 0.65 + } + } + } +} + diff --git a/receiptrepository/config/lint.xml b/receiptrepository/config/lint.xml new file mode 100644 index 000000000..ff446fa9e --- /dev/null +++ b/receiptrepository/config/lint.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file From ebf379bd386b388dff6df22f3a603c5afbf134d5 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Wed, 17 Jul 2019 19:22:37 +0300 Subject: [PATCH 03/13] HW-54227: Create receiptrepository module --- common/build.gradle | 89 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/common/build.gradle b/common/build.gradle index 9daf9e7de..2420a9da2 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1 +1,88 @@ -apply from: "$rootProject.projectDir/android-library.gradle" \ No newline at end of file +apply from: "$rootProject.projectDir/android-library.gradle" + + +def aarFile = file("$buildDir/outputs/aar/common-$version" + ".aar") +def aarArtifact = artifacts.add('archives', aarFile) { + type 'aar' +} + +def isReleaseVersion = !version.endsWith('SNAPSHOT') + +publishing { + + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" + url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl + credentials { + username sonatypeUsername + password sonatypePassword + } + } + } + + publications { + hyperwalletCommonUi(MavenPublication) { + groupId = hyperwalletGroupId + artifactId = 'common' + version = version + + artifact(sourcesJar) + artifact(javadocsJar) + artifact(aarArtifact) + + pom { + name = 'Hyperwallet Android Common UI SDK' + description = 'Hyperwallet Common UI SDK for Android to integrate with Hyperwallet Platform' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + licenses { + license { + name = 'MIT License' + url = 'http://www.opensource.org/licenses/MIT' + } + } + developers { + developer { + id = 'devs' + name = 'Hyperwallet Developers' + } + } + scm { + connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + } + } + } + } +} + +tasks.withType(Sign) { + onlyIf { + isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() + } +} + +signing { + sign publishing.publications.hyperwalletCommonUi +} + +sonarqube { + properties { + def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" + property "sonar.sources", "src/main/java" + property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" + property "sonar.libraries", libraries + property "sonar.projectName", "android-ui-sdk-common" + } +} From 5dfd9f7a90d7c01f7be566464e214a5a3c9f7c1d Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 15:09:51 +0300 Subject: [PATCH 04/13] fix build.gradle --- android-library.gradle | 3 ++ receipt/build.gradle | 92 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/android-library.gradle b/android-library.gradle index 7df9e7a97..5c0ee2ce1 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,4 +1,7 @@ apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' +apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android { diff --git a/receipt/build.gradle b/receipt/build.gradle index 9d913bb29..6633c9205 100644 --- a/receipt/build.gradle +++ b/receipt/build.gradle @@ -11,6 +11,8 @@ dependencies { implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" + testImplementation "org.robolectric:robolectric:$robolectricVersion" + androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion" @@ -18,3 +20,93 @@ dependencies { androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" } + +def aarFile = file("$buildDir/outputs/aar/receipt-$version" + ".aar") +def aarArtifact = artifacts.add('archives', aarFile) { + type 'aar' +} + +def isReleaseVersion = !version.endsWith('SNAPSHOT') + +publishing { + + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" + url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl + credentials { + username sonatypeUsername + password sonatypePassword + } + } + } + + publications { + hyperwalletReceiptUi(MavenPublication) { + groupId = hyperwalletGroupId + artifactId = 'receipt' + version = version + + artifact(sourcesJar) + artifact(javadocsJar) + artifact(aarArtifact) + + pom { + name = 'Hyperwallet Android Receipt UI SDK' + description = 'Hyperwallet Receipt UI SDK for Android to integrate with Hyperwallet Platform' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + if (it.group == "hyperwallet-android-ui-sdk") { + dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") + } else { + dependencyNode.appendNode('groupId', it.group) + } + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + licenses { + license { + name = 'MIT License' + url = 'http://www.opensource.org/licenses/MIT' + } + } + developers { + developer { + id = 'devs' + name = 'Hyperwallet Developers' + } + } + scm { + connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + } + } + } + } +} + +tasks.withType(Sign) { + onlyIf { + isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() + } +} + +signing { + sign publishing.publications.hyperwalletReceiptUi +} + +sonarqube { + properties { + def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" + property "sonar.sources", "src/main/java" + property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" + property "sonar.libraries", libraries + property "sonar.projectName", "android-ui-sdk-receipt" + } +} From 45da0e261c565456a2615c881cabeba647dc6a92 Mon Sep 17 00:00:00 2001 From: azakrevska-epam Date: Thu, 18 Jul 2019 14:28:11 +0300 Subject: [PATCH 05/13] HW-54223. Extracted publish task to file --- common/build.gradle | 88 +---------------------------------------- publish.gradle | 94 ++++++++++++++++++++++++++++++++++++++++++++ receipt/build.gradle | 91 +----------------------------------------- ui/build.gradle | 94 +------------------------------------------- 4 files changed, 98 insertions(+), 269 deletions(-) create mode 100644 publish.gradle diff --git a/common/build.gradle b/common/build.gradle index 2420a9da2..da20265c3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,88 +1,2 @@ apply from: "$rootProject.projectDir/android-library.gradle" - - -def aarFile = file("$buildDir/outputs/aar/common-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletCommonUi(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'common' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android Common UI SDK' - description = 'Hyperwallet Common UI SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletCommonUi -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk-common" - } -} +apply from: "$rootProject.projectDir/publish.gradle" \ No newline at end of file diff --git a/publish.gradle b/publish.gradle new file mode 100644 index 000000000..46779ff5c --- /dev/null +++ b/publish.gradle @@ -0,0 +1,94 @@ +def aarFile = file("$buildDir/outputs/aar/$project.name-$version" + ".aar") +def aarArtifact = artifacts.add('archives', aarFile) { + type 'aar' +} + +def isReleaseVersion = !version.endsWith('SNAPSHOT') + +publishing { + + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" + url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl + credentials { + username sonatypeUsername + password sonatypePassword + } + } + } + + publications { + hyperwalletUiPublish(MavenPublication) { + groupId = hyperwalletGroupId + if (project.name == "ui") { + artifactId = "ui-sdk" + } else { + artifactId = project.name + } + + version = version + + artifact(sourcesJar) + artifact(javadocsJar) + artifact(aarArtifact) + + pom { + name = 'Hyperwallet Android Receipt UI SDK' + description = 'Hyperwallet Receipt UI SDK for Android to integrate with Hyperwallet Platform' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + if (it.group == "hyperwallet-android-ui-sdk") { + dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") + } else { + dependencyNode.appendNode('groupId', it.group) + } + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + licenses { + license { + name = 'MIT License' + url = 'http://www.opensource.org/licenses/MIT' + } + } + developers { + developer { + id = 'devs' + name = 'Hyperwallet Developers' + } + } + scm { + connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' + url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' + } + } + } + } +} + +tasks.withType(Sign) { + onlyIf { + isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() + } +} + +signing { + sign publishing.publications.hyperwalletUiPublish +} + +sonarqube { + properties { + def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" + property "sonar.sources", "src/main/java" + property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" + property "sonar.libraries", libraries + property "sonar.projectName", "android-ui-sdk-$project.name" + } +} \ No newline at end of file diff --git a/receipt/build.gradle b/receipt/build.gradle index 6633c9205..faffde6a4 100644 --- a/receipt/build.gradle +++ b/receipt/build.gradle @@ -1,4 +1,5 @@ apply from: "$rootProject.projectDir/android-library.gradle" +apply from: "$rootProject.projectDir/publish.gradle" dependencies { implementation project(":common") @@ -20,93 +21,3 @@ dependencies { androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" } - -def aarFile = file("$buildDir/outputs/aar/receipt-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletReceiptUi(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'receipt' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android Receipt UI SDK' - description = 'Hyperwallet Receipt UI SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - if (it.group == "hyperwallet-android-ui-sdk") { - dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") - } else { - dependencyNode.appendNode('groupId', it.group) - } - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletReceiptUi -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk-receipt" - } -} diff --git a/ui/build.gradle b/ui/build.gradle index 2d61b4c8e..6c24f54bb 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' apply plugin: 'org.sonarqube' apply from: "$rootProject.projectDir/android-library.gradle" +apply from: "$rootProject.projectDir/publish.gradle" dependencies { @@ -22,95 +23,4 @@ dependencies { testImplementation "org.robolectric:robolectric:$robolectricVersion" testImplementation "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion" -} - - -def aarFile = file("$buildDir/outputs/aar/ui-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletUi(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'ui-sdk' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android UI SDK' - description = 'Hyperwallet UI SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - if (it.group == "hyperwallet-android-ui-sdk") { - dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") - } else { - dependencyNode.appendNode('groupId', it.group) - } - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletUi -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk" - } -} +} \ No newline at end of file From 92d7c84fdc4607fdc966a58f4a2cad4db56b34da Mon Sep 17 00:00:00 2001 From: azakrevska-epam Date: Thu, 18 Jul 2019 14:31:54 +0300 Subject: [PATCH 06/13] HW-54223. Deprecated RepositoryFactory --- .../com/hyperwallet/android/ui/repository/RepositoryFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/main/java/com/hyperwallet/android/ui/repository/RepositoryFactory.java b/ui/src/main/java/com/hyperwallet/android/ui/repository/RepositoryFactory.java index 8ae21ee6d..efd0f0f9c 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/repository/RepositoryFactory.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/repository/RepositoryFactory.java @@ -27,6 +27,7 @@ package com.hyperwallet.android.ui.repository; +@Deprecated public class RepositoryFactory { private static RepositoryFactory sInstance; private TransferMethodConfigurationRepository mTransferMethodConfigurationRepository; From feec2b3d6c55a9598d919faf7b4988142f5e23bd Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Wed, 17 Jul 2019 19:22:37 +0300 Subject: [PATCH 07/13] HW-54227: Create receiptrepository module --- android-library.gradle | 3 --- receipt/build.gradle | 2 -- 2 files changed, 5 deletions(-) diff --git a/android-library.gradle b/android-library.gradle index 5c0ee2ce1..7df9e7a97 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,7 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android { diff --git a/receipt/build.gradle b/receipt/build.gradle index faffde6a4..b6836a649 100644 --- a/receipt/build.gradle +++ b/receipt/build.gradle @@ -12,8 +12,6 @@ dependencies { implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" - testImplementation "org.robolectric:robolectric:$robolectricVersion" - androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion" From e69226eccce55a72f439138c88fc3aa97fd4a757 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 15:13:35 +0300 Subject: [PATCH 08/13] fix receiptrepository build.gradle --- receiptrepository/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle index 329f2f846..1c5563a13 100644 --- a/receiptrepository/build.gradle +++ b/receiptrepository/build.gradle @@ -1,4 +1,5 @@ apply from: "$rootProject.projectDir/android-library.gradle" +apply from: "$rootProject.projectDir/publish.gradle" dependencies { implementation project(":common") From d95705ea9fc261e095210822939174cf761aaa24 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 15:24:15 +0300 Subject: [PATCH 09/13] fix android-library.gradle --- android-library.gradle | 10 ++-- receiptrepository/build.gradle | 95 ---------------------------------- 2 files changed, 5 insertions(+), 100 deletions(-) diff --git a/android-library.gradle b/android-library.gradle index 7df9e7a97..08c6844be 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,4 +1,7 @@ apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' +apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android { @@ -53,7 +56,7 @@ task sourcesJar(type: Jar) { dependencies { implementation "com.google.android.material:material:$androidMaterialVersion" - implementation "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" + api "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion" @@ -63,7 +66,4 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: "$mockitoVersion" testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: "$junitParamsVersion" -} - - - +} \ No newline at end of file diff --git a/receiptrepository/build.gradle b/receiptrepository/build.gradle index 1c5563a13..a1207b8f1 100644 --- a/receiptrepository/build.gradle +++ b/receiptrepository/build.gradle @@ -3,12 +3,7 @@ apply from: "$rootProject.projectDir/publish.gradle" dependencies { implementation project(":common") - - implementation "com.google.android.material:material:$androidMaterialVersion" - implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion" implementation "androidx.legacy:legacy-support-v4:$legacySupportV4Version" - implementation "androidx.recyclerview:recyclerview:$recycleViewVersion" - implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleExtensionsVersion" implementation "androidx.paging:paging-runtime:$pagingRuntimeVersion" testImplementation "org.robolectric:robolectric:$robolectricVersion" @@ -17,94 +12,4 @@ dependencies { androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion" androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion" androidTestImplementation "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion" -} - -def aarFile = file("$buildDir/outputs/aar/receiptrepository-$version" + ".aar") -def aarArtifact = artifacts.add('archives', aarFile) { - type 'aar' -} - -def isReleaseVersion = !version.endsWith('SNAPSHOT') - -publishing { - - repositories { - maven { - def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" - url = isReleaseVersion ? releasesRepoUrl : snapshotsRepoUrl - credentials { - username sonatypeUsername - password sonatypePassword - } - } - } - - publications { - hyperwalletReceiptrepository(MavenPublication) { - groupId = hyperwalletGroupId - artifactId = 'receiptrepository' - version = version - - artifact(sourcesJar) - artifact(javadocsJar) - artifact(aarArtifact) - - pom { - name = 'Hyperwallet Android Receiptrepository sub package SDK' - description = 'Hyperwallet Receiptrepository subpackage SDK for Android to integrate with Hyperwallet Platform' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - if (it.group == "hyperwallet-android-ui-sdk") { - dependencyNode.appendNode('groupId', "com.hyperwallet.android.ui") - } else { - dependencyNode.appendNode('groupId', it.group) - } - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - licenses { - license { - name = 'MIT License' - url = 'http://www.opensource.org/licenses/MIT' - } - } - developers { - developer { - id = 'devs' - name = 'Hyperwallet Developers' - } - } - scm { - connection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - developerConnection = 'scm:git:git://github.com/hyperwallet/hyperwallet-android-ui-sdk.git' - url = 'https://github.com/hyperwallet/hyperwallet-android-ui-sdk' - } - } - } - } -} - -tasks.withType(Sign) { - onlyIf { - isReleaseVersion && sonatypeUsername?.trim() && sonatypePassword?.trim() - } -} - -signing { - sign publishing.publications.hyperwalletReceiptrepository -} - -sonarqube { - properties { - def libraries = project.android.sdkDirectory.getPath() + "/platforms/android-28/android.jar" - property "sonar.sources", "src/main/java" - property "sonar.binaries", "build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/hyperwallet/android/ui" - property "sonar.libraries", libraries - property "sonar.projectName", "android-ui-sdk-receiptrepository" - } } \ No newline at end of file From f31b0db010795e1e2fe77c64fa284b435b7502d0 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 15:55:41 +0300 Subject: [PATCH 10/13] HW-54229: Update receipt module --- {receipt => receiptui}/.gitignore | 0 {receipt => receiptui}/build.gradle | 0 {receipt => receiptui}/config/jacoco-settings.gradle | 0 {receipt => receiptui}/config/lint.xml | 0 {receipt => receiptui}/proguard-rules.pro | 0 {receipt => receiptui}/src/androidTest/AndroidManifest.xml | 0 .../ui/receipt/HyperwalletInstrumentedTestApplication.java | 0 .../android/ui/receipt/ListPrepaidCardReceiptsTest.java | 0 .../hyperwallet/android/ui/receipt/ListUserReceiptsTest.java | 0 .../ui/receipt/rule/HyperwalletExternalResourceManager.java | 0 .../android/ui/receipt/rule/HyperwalletMockWebServer.java | 0 .../com/hyperwallet/android/ui/receipt/util/EspressoUtils.java | 0 .../android/ui/receipt/util/NestedScrollToAction.java | 0 .../android/ui/receipt/util/RecyclerViewCountAssertion.java | 0 .../android/ui/receipt/util/TestAuthenticationProvider.java | 0 {receipt => receiptui}/src/main/AndroidManifest.xml | 0 .../android/ui/receipt/view/ListPrepaidCardReceiptActivity.java | 0 .../android/ui/receipt/view/ListReceiptFragment.java | 0 .../android/ui/receipt/view/ListUserReceiptActivity.java | 0 .../android/ui/receipt/view/ReceiptDetailActivity.java | 0 .../android/ui/receipt/view/ReceiptDetailFragment.java | 0 .../android/ui/receipt/view/ReceiptItemDividerDecorator.java | 0 .../ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java | 0 .../android/ui/receipt/viewmodel/ListUserReceiptViewModel.java | 0 .../android/ui/receipt/viewmodel/ReceiptDetailViewModel.java | 0 .../android/ui/receipt/viewmodel/ReceiptViewModel.java | 0 .../src/main/res/drawable/circle_negative.xml | 0 .../src/main/res/drawable/circle_positive.xml | 0 .../src/main/res/drawable/item_view_border.xml | 0 .../src/main/res/drawable/item_view_border_header.xml | 0 .../src/main/res/layout/activity_list_prepaid_card_receipt.xml | 0 .../src/main/res/layout/activity_list_user_receipt.xml | 0 .../src/main/res/layout/activity_receipt_detail.xml | 0 .../src/main/res/layout/fragment_list_receipt.xml | 0 .../src/main/res/layout/fragment_receipt_detail.xml | 0 {receipt => receiptui}/src/main/res/layout/item_receipt.xml | 0 .../src/main/res/layout/item_receipt_with_header.xml | 0 {receipt => receiptui}/src/main/res/layout/receipt.xml | 0 {receipt => receiptui}/src/main/res/values/colors.xml | 0 {receipt => receiptui}/src/main/res/values/dimens.xml | 0 {receipt => receiptui}/src/main/res/values/strings.xml | 0 {receipt => receiptui}/src/main/res/values/styles.xml | 0 .../src/main/res/xml/network_security_config.xml | 0 settings.gradle | 2 +- ui/build.gradle | 2 +- 45 files changed, 2 insertions(+), 2 deletions(-) rename {receipt => receiptui}/.gitignore (100%) rename {receipt => receiptui}/build.gradle (100%) rename {receipt => receiptui}/config/jacoco-settings.gradle (100%) rename {receipt => receiptui}/config/lint.xml (100%) rename {receipt => receiptui}/proguard-rules.pro (100%) rename {receipt => receiptui}/src/androidTest/AndroidManifest.xml (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java (100%) rename {receipt => receiptui}/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java (100%) rename {receipt => receiptui}/src/main/AndroidManifest.xml (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java (100%) rename {receipt => receiptui}/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java (100%) rename {receipt => receiptui}/src/main/res/drawable/circle_negative.xml (100%) rename {receipt => receiptui}/src/main/res/drawable/circle_positive.xml (100%) rename {receipt => receiptui}/src/main/res/drawable/item_view_border.xml (100%) rename {receipt => receiptui}/src/main/res/drawable/item_view_border_header.xml (100%) rename {receipt => receiptui}/src/main/res/layout/activity_list_prepaid_card_receipt.xml (100%) rename {receipt => receiptui}/src/main/res/layout/activity_list_user_receipt.xml (100%) rename {receipt => receiptui}/src/main/res/layout/activity_receipt_detail.xml (100%) rename {receipt => receiptui}/src/main/res/layout/fragment_list_receipt.xml (100%) rename {receipt => receiptui}/src/main/res/layout/fragment_receipt_detail.xml (100%) rename {receipt => receiptui}/src/main/res/layout/item_receipt.xml (100%) rename {receipt => receiptui}/src/main/res/layout/item_receipt_with_header.xml (100%) rename {receipt => receiptui}/src/main/res/layout/receipt.xml (100%) rename {receipt => receiptui}/src/main/res/values/colors.xml (100%) rename {receipt => receiptui}/src/main/res/values/dimens.xml (100%) rename {receipt => receiptui}/src/main/res/values/strings.xml (100%) rename {receipt => receiptui}/src/main/res/values/styles.xml (100%) rename {receipt => receiptui}/src/main/res/xml/network_security_config.xml (100%) diff --git a/receipt/.gitignore b/receiptui/.gitignore similarity index 100% rename from receipt/.gitignore rename to receiptui/.gitignore diff --git a/receipt/build.gradle b/receiptui/build.gradle similarity index 100% rename from receipt/build.gradle rename to receiptui/build.gradle diff --git a/receipt/config/jacoco-settings.gradle b/receiptui/config/jacoco-settings.gradle similarity index 100% rename from receipt/config/jacoco-settings.gradle rename to receiptui/config/jacoco-settings.gradle diff --git a/receipt/config/lint.xml b/receiptui/config/lint.xml similarity index 100% rename from receipt/config/lint.xml rename to receiptui/config/lint.xml diff --git a/receipt/proguard-rules.pro b/receiptui/proguard-rules.pro similarity index 100% rename from receipt/proguard-rules.pro rename to receiptui/proguard-rules.pro diff --git a/receipt/src/androidTest/AndroidManifest.xml b/receiptui/src/androidTest/AndroidManifest.xml similarity index 100% rename from receipt/src/androidTest/AndroidManifest.xml rename to receiptui/src/androidTest/AndroidManifest.xml diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListPrepaidCardReceiptsTest.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletExternalResourceManager.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/rule/HyperwalletMockWebServer.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/EspressoUtils.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/NestedScrollToAction.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/RecyclerViewCountAssertion.java diff --git a/receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java b/receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java similarity index 100% rename from receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java rename to receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/util/TestAuthenticationProvider.java diff --git a/receipt/src/main/AndroidManifest.xml b/receiptui/src/main/AndroidManifest.xml similarity index 100% rename from receipt/src/main/AndroidManifest.xml rename to receiptui/src/main/AndroidManifest.xml diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListPrepaidCardReceiptActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListReceiptFragment.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ListUserReceiptActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailActivity.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptDetailFragment.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/view/ReceiptItemDividerDecorator.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListPrepaidCardReceiptViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ListUserReceiptViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptDetailViewModel.java diff --git a/receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java b/receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java similarity index 100% rename from receipt/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java rename to receiptui/src/main/java/com/hyperwallet/android/ui/receipt/viewmodel/ReceiptViewModel.java diff --git a/receipt/src/main/res/drawable/circle_negative.xml b/receiptui/src/main/res/drawable/circle_negative.xml similarity index 100% rename from receipt/src/main/res/drawable/circle_negative.xml rename to receiptui/src/main/res/drawable/circle_negative.xml diff --git a/receipt/src/main/res/drawable/circle_positive.xml b/receiptui/src/main/res/drawable/circle_positive.xml similarity index 100% rename from receipt/src/main/res/drawable/circle_positive.xml rename to receiptui/src/main/res/drawable/circle_positive.xml diff --git a/receipt/src/main/res/drawable/item_view_border.xml b/receiptui/src/main/res/drawable/item_view_border.xml similarity index 100% rename from receipt/src/main/res/drawable/item_view_border.xml rename to receiptui/src/main/res/drawable/item_view_border.xml diff --git a/receipt/src/main/res/drawable/item_view_border_header.xml b/receiptui/src/main/res/drawable/item_view_border_header.xml similarity index 100% rename from receipt/src/main/res/drawable/item_view_border_header.xml rename to receiptui/src/main/res/drawable/item_view_border_header.xml diff --git a/receipt/src/main/res/layout/activity_list_prepaid_card_receipt.xml b/receiptui/src/main/res/layout/activity_list_prepaid_card_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/activity_list_prepaid_card_receipt.xml rename to receiptui/src/main/res/layout/activity_list_prepaid_card_receipt.xml diff --git a/receipt/src/main/res/layout/activity_list_user_receipt.xml b/receiptui/src/main/res/layout/activity_list_user_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/activity_list_user_receipt.xml rename to receiptui/src/main/res/layout/activity_list_user_receipt.xml diff --git a/receipt/src/main/res/layout/activity_receipt_detail.xml b/receiptui/src/main/res/layout/activity_receipt_detail.xml similarity index 100% rename from receipt/src/main/res/layout/activity_receipt_detail.xml rename to receiptui/src/main/res/layout/activity_receipt_detail.xml diff --git a/receipt/src/main/res/layout/fragment_list_receipt.xml b/receiptui/src/main/res/layout/fragment_list_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/fragment_list_receipt.xml rename to receiptui/src/main/res/layout/fragment_list_receipt.xml diff --git a/receipt/src/main/res/layout/fragment_receipt_detail.xml b/receiptui/src/main/res/layout/fragment_receipt_detail.xml similarity index 100% rename from receipt/src/main/res/layout/fragment_receipt_detail.xml rename to receiptui/src/main/res/layout/fragment_receipt_detail.xml diff --git a/receipt/src/main/res/layout/item_receipt.xml b/receiptui/src/main/res/layout/item_receipt.xml similarity index 100% rename from receipt/src/main/res/layout/item_receipt.xml rename to receiptui/src/main/res/layout/item_receipt.xml diff --git a/receipt/src/main/res/layout/item_receipt_with_header.xml b/receiptui/src/main/res/layout/item_receipt_with_header.xml similarity index 100% rename from receipt/src/main/res/layout/item_receipt_with_header.xml rename to receiptui/src/main/res/layout/item_receipt_with_header.xml diff --git a/receipt/src/main/res/layout/receipt.xml b/receiptui/src/main/res/layout/receipt.xml similarity index 100% rename from receipt/src/main/res/layout/receipt.xml rename to receiptui/src/main/res/layout/receipt.xml diff --git a/receipt/src/main/res/values/colors.xml b/receiptui/src/main/res/values/colors.xml similarity index 100% rename from receipt/src/main/res/values/colors.xml rename to receiptui/src/main/res/values/colors.xml diff --git a/receipt/src/main/res/values/dimens.xml b/receiptui/src/main/res/values/dimens.xml similarity index 100% rename from receipt/src/main/res/values/dimens.xml rename to receiptui/src/main/res/values/dimens.xml diff --git a/receipt/src/main/res/values/strings.xml b/receiptui/src/main/res/values/strings.xml similarity index 100% rename from receipt/src/main/res/values/strings.xml rename to receiptui/src/main/res/values/strings.xml diff --git a/receipt/src/main/res/values/styles.xml b/receiptui/src/main/res/values/styles.xml similarity index 100% rename from receipt/src/main/res/values/styles.xml rename to receiptui/src/main/res/values/styles.xml diff --git a/receipt/src/main/res/xml/network_security_config.xml b/receiptui/src/main/res/xml/network_security_config.xml similarity index 100% rename from receipt/src/main/res/xml/network_security_config.xml rename to receiptui/src/main/res/xml/network_security_config.xml diff --git a/settings.gradle b/settings.gradle index 50c4321f5..8d2059ea0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':ui', ':common', ':receipt', ':receiptrepository' +include ':ui', ':common', ':receiptui', ':receiptrepository' //add libraries here diff --git a/ui/build.gradle b/ui/build.gradle index 6c24f54bb..f8b486480 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation "androidx.recyclerview:recyclerview:$recycleViewVersion" api project(":common") - api project(":receipt") + api project(':receiptui') androidTestImplementation "androidx.test:rules:$testRulesVersion" androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" From 0e15b4bacf0e538c9e276baf038006250813a674 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 17:36:29 +0300 Subject: [PATCH 11/13] fix jacoco-settings --- receiptrepository/config/jacoco-settings.gradle | 5 +---- receiptui/config/jacoco-settings.gradle | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/receiptrepository/config/jacoco-settings.gradle b/receiptrepository/config/jacoco-settings.gradle index e0bb22486..bb4ffa228 100644 --- a/receiptrepository/config/jacoco-settings.gradle +++ b/receiptrepository/config/jacoco-settings.gradle @@ -20,10 +20,7 @@ android { } } -def fileFilter = ['**/BuildConfig.*', - '**/com/hyperwallet/android/ui/receipt/view/*.*', - '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*', - '**/com/hyperwallet/android/ui/receipt/repository/ReceiptRepositoryImpl.*' +def fileFilter = ['**/BuildConfig.*' ] def debugClassPaths = [ diff --git a/receiptui/config/jacoco-settings.gradle b/receiptui/config/jacoco-settings.gradle index e0bb22486..7dbc462e6 100644 --- a/receiptui/config/jacoco-settings.gradle +++ b/receiptui/config/jacoco-settings.gradle @@ -22,8 +22,7 @@ android { def fileFilter = ['**/BuildConfig.*', '**/com/hyperwallet/android/ui/receipt/view/*.*', - '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*', - '**/com/hyperwallet/android/ui/receipt/repository/ReceiptRepositoryImpl.*' + '**/com/hyperwallet/android/ui/receipt/viewmodel/*.*' ] def debugClassPaths = [ From 22285acd9a172d1fbc94e00aed0655634854b764 Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Wed, 17 Jul 2019 19:22:37 +0300 Subject: [PATCH 12/13] HW-54227: Create receiptrepository module --- android-library.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/android-library.gradle b/android-library.gradle index 08c6844be..a06301acd 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,7 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android { @@ -56,7 +53,7 @@ task sourcesJar(type: Jar) { dependencies { implementation "com.google.android.material:material:$androidMaterialVersion" - api "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" + implementation "com.hyperwallet.android:core-sdk:$hyperwalletCoreVersion" implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion" From 6c3b063ebf9258c6723492d5b52301eb5889d83d Mon Sep 17 00:00:00 2001 From: Viktor Shcherbyna Date: Thu, 18 Jul 2019 20:19:00 +0300 Subject: [PATCH 13/13] rollback android-library.gradle --- android-library.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android-library.gradle b/android-library.gradle index a06301acd..0d8012de0 100644 --- a/android-library.gradle +++ b/android-library.gradle @@ -1,4 +1,7 @@ apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' +apply plugin: 'org.sonarqube' apply from: "$projectDir/config/jacoco-settings.gradle" android {