Test Squash of Base Recovery Branch

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve
+body:
+- type: input
+  attributes:
+    label: Braintree SDK Version
+    placeholder: "e.g. 4.24.0"
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: Environment
+    options:
+      - Sandbox
+      - Production
+      - Both
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Android Version & Device
+    placeholder: "e.g Google Pixel 6a - Android 12.0"
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Braintree dependencies
+    placeholder: |
+      <!-- Examples -->
+      <!--  - com.braintreepayments.api:braintree:x.y.z -->
+      <!--  - compile 'com.braintreepayments.api:data-collector:2.+' -->
+      <!--  - com.braintreepayments.api:visa-checkout:x.y.z-SNAPSHOT -->
+      <!--  - com.braintreepayments.api:drop-in:x.y.z -->
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe the bug
+    description: Description of what the bug is. Please include as many details as possible.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: To reproduce
+    description: Steps to reproduce the behavior.
+    placeholder: |
+      1. Go to '...'
+      2. Click on '....'
+      3. See error
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: Description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem.
+    placeholder: |
+      Do not reveal sensitive data. For example, credit card numbers & customer credentials.
+  validations:
+    required: false
+- type: markdown
+  attributes:
+    value: |
+      Note - Please do not open an issue for translation requests for new languages. We support the same languages that are supported by PayPal, and have a dedicated localization team to provide translations. If there is an error in a specific translation, you may open an issue here and we will escalate it to our localization team.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,17 @@
+name: Feature request
+description: Suggest an idea for our SDK
+body:
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the problem is.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like.
+    description: Description of what you want to happen.
+    placeholder: |
+      Follow the [user story](https://en.wikipedia.org/wiki/User_story) format to clearly describe the use case.
+  validations:
+    required: false

.github/workflows/release.yml

@@ -294,6 +294,8 @@ jobs:
           ./gradlew -PversionParam=${{ github.event.inputs.version }} changeREADMEVersion
           ./gradlew -PversionParam=${{ github.event.inputs.version }} changeMigrationGuideVersion
           ./gradlew -PversionParam=${{ github.event.inputs.version }} updateCHANGELOGVersion
+          ./gradlew dokkaHtmlMultiModule
+          git add -A
           git commit -am 'Release ${{ github.event.inputs.version }}'
           git tag ${{ github.event.inputs.version }} -a -m 'Release ${{ github.event.inputs.version }}'
 

AmericanExpress/build.gradle

@@ -1,5 +1,7 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jetbrains.dokka'
     id 'de.marcphilipp.nexus-publish'
     id 'signing'
 }
@@ -47,17 +49,6 @@ dependencies {
 
 // region signing and publishing
 
-task javadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    failOnError false
-}
-
-task javadocsJar(type: Jar, dependsOn: javadocs) {
-    archiveClassifier.set('javadoc')
-    from javadocs.destinationDir
-}
-
 task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
@@ -86,7 +77,6 @@ afterEvaluate {
                 from components.release
 
                 artifact sourcesJar
-                artifact javadocsJar
 
                 groupId = 'com.braintreepayments.api'
                 artifactId = 'american-express'

AmericanExpress/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1,2 @@
+mock-maker-inline
+

BraintreeCore/build.gradle

@@ -1,10 +1,13 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
+    id 'org.jetbrains.dokka'
     id 'de.marcphilipp.nexus-publish'
     id 'signing'
+    id 'kotlin-kapt'
 }
 
-def DEVELOPMENT_URL = System.properties['DEVELOPMENT_URL'] ?: '"http://10.0.2.2:3000/"';
+def DEVELOPMENT_URL = System.properties['DEVELOPMENT_URL'] ?: '"http://10.0.2.2:3000/"'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
@@ -49,10 +52,15 @@ android {
 
 dependencies {
     implementation deps.appCompat
-    implementation deps.work
+    implementation deps.workKtx
+
+    implementation deps.coreKtx
+    implementation deps.kotlinStdLib
 
     implementation deps.roomRuntime
-    annotationProcessor deps.roomCompiler
+
+    // Ref: https://stackoverflow.com/a/51067251
+    kapt deps.roomCompiler
 
     api deps.browserSwitch
     api project(':SharedUtils')
@@ -76,10 +84,14 @@ dependencies {
     testImplementation deps.powermockMockito
     testImplementation deps.powermockClassloading
     testImplementation deps.jsonAssert
+    testImplementation deps.mockk
     testImplementation project(':PayPal')
     testImplementation project(':TestUtils')
     testImplementation project(':UnionPay')
     testImplementation project(':Venmo')
+
+    // Ref: https://kotlin.github.io/dokka/1.8.0-SNAPSHOT/user_guide/applying/gradle/#applying-plugins
+    dokkaHtmlPartialPlugin 'org.jetbrains.dokka:android-documentation-plugin:1.7.20'
 }
 
 android.buildTypes.each { type ->
@@ -101,22 +113,6 @@ gradle.taskGraph.whenReady { taskGraph ->
 
 // region signing and publishing
 
-task javadocs(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    failOnError false
-
-    // Used to exclude docstrings from public site
-    exclude "com/braintreepayments/api/PreferredPaymentMethods.java"
-    exclude "com/braintreepayments/api/models/PreferredPaymentMethodsResult.java"
-    exclude "com/braintreepayments/api/interfaces/PreferredPaymentMethodsListener.java"
-}
-
-task javadocsJar(type: Jar, dependsOn: javadocs) {
-    archiveClassifier.set('javadoc')
-    from javadocs.destinationDir
-}
-
 task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
@@ -145,7 +141,6 @@ afterEvaluate {
                 from components.release
 
                 artifact sourcesJar
-                artifact javadocsJar
 
                 groupId = 'com.braintreepayments.api'
                 artifactId = 'braintree-core'

BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsBaseWorker.kt

@@ -0,0 +1,23 @@
+package com.braintreepayments.api
+
+import android.content.Context
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+
+// NEXT_MAJOR_VERSION: remove this class, it may no longer be needed
+
+/**
+ * Class for background analytics tasks.
+ * This class is used internally by the SDK and should not be used directly.
+ * It is not subject to semantic versioning and may change at any time.
+ * @suppress
+ */
+abstract class AnalyticsBaseWorker(
+    context: Context,
+    workerParams: WorkerParameters
+) : Worker(context, workerParams) {
+
+    internal open fun createAnalyticsClientFromInputData(): AnalyticsClient {
+        return AnalyticsClient(applicationContext)
+    }
+}