judokit-react-native 3.5.0 → 4.1.0

package/JudoPay.tsx

@@ -1,5 +1,6 @@
 import { NativeModules } from 'react-native'
 import JudoPBBAButton from './components/JudoPBBAButton'
+import { version as packageVersion } from './package.json'
 
 import {
     JudoConfiguration,
@@ -142,10 +143,10 @@ class JudoPay {
         type: JudoTransactionType,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionTypeParameters(
-            type,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionTypeParameters(type, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeTransaction(params)
     }
 
@@ -155,7 +156,8 @@ class JudoPay {
         const params = {
             authorization: this.generateAuthorizationParameters(),
             sandboxed: this.isSandboxed,
-            receiptId
+            receiptId,
+            packageVersion
         }
 
         return NativeModules.RNJudo.fetchTransactionDetails(params)
@@ -181,15 +183,16 @@ class JudoPay {
         cardholderName: string | undefined | null,
         cardScheme: string
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
-        params['cardToken'] = cardToken
-        params['securityCode'] = securityCode
-        params['cardholderName'] = cardholderName
-        params['cardScheme'] = cardScheme
-
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            ...{
+                cardToken,
+                securityCode,
+                cardholderName,
+                cardScheme
+            },
+            packageVersion
+        }
         return NativeModules.RNJudo.performTokenTransaction(params)
     }
 
@@ -207,10 +210,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeApplePay(params)
     }
 
@@ -228,10 +231,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeGooglePay(params)
     }
 
@@ -245,7 +248,10 @@ class JudoPay {
     public async invokePayByBankApp(
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateJudoParameters(configuration)
+        const params = {
+            ...this.generateJudoParameters(configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokePayByBankApp(params)
     }
 
@@ -262,10 +268,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokePaymentMethodScreen(params)
     }
 
@@ -307,16 +313,6 @@ class JudoPay {
         }
     }
 
-    private readonly generateTransactionDetailsParameters = (
-        receiptId: string
-    ): Record<string, any> => {
-        return {
-            authorization: this.generateAuthorizationParameters(),
-            sandboxed: this.isSandboxed,
-            receiptId: receiptId
-        }
-    }
-
     private readonly generateAuthorizationParameters = (): Record<
         string,
         any

package/RNJudopay.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/Classes/**/*.{h,m}"
   s.requires_arc = true
   s.dependency "React"
-  s.dependency "JudoKit-iOS", "3.1.10"
+  s.dependency "JudoKit-iOS", "3.2.2"
 
   s.test_spec 'RNJudoTests' do |test_spec|
     test_spec.source_files = 'ios/RNJudoTests/**/*.{h,m}'

package/android/build.gradle

@@ -1,76 +1,65 @@
 apply plugin: 'com.android.library'
-apply plugin: 'jacoco'
-apply plugin: 'maven'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'de.mannodermaus.android-junit5'
+apply plugin: 'jacoco'
 
-import groovy.json.JsonSlurper
-
-def DEFAULT_COMPILE_SDK_VERSION = 31
-def DEFAULT_BUILD_TOOLS_VERSION = "30.0.3"
+def DEFAULT_COMPILE_SDK_VERSION = 33
 def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 31
+def DEFAULT_TARGET_SDK_VERSION = 33
+
+def isNewArchitectureEnabled() {
+    return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
+def getExtOrIntegerDefault(name, fallback) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (fallback).toInteger()
 }
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    ext.junit5_version = '5.7.0'
+    ext.kotlin_version = '1.7.20'
+    ext.junit5_version = '5.9.1'
 
     repositories {
         maven { url 'https://plugins.gradle.org/m2/' }
-
-        mavenCentral()
         google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1'
+        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1'
     }
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+    compileSdkVersion getExtOrIntegerDefault('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-        versionCode 1
-        versionName "1.0"
-    }
-
-    lintOptions {
-        abortOnError false
+        minSdkVersion getExtOrIntegerDefault('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
+        targetSdkVersion getExtOrIntegerDefault('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
-
-    testOptions {
-        unitTests.returnDefaultValues = true
-    }
-    packagingOptions {
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
-    }
-
     buildTypes {
+        release {
+            minifyEnabled false
+        }
         debug {
             testCoverageEnabled true
         }
     }
-    
+
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+
     testOptions {
         animationsDisabled = true
+        unitTests.returnDefaultValues = true
         unitTests.all {
             jacoco {
                 includeNoLocationClasses = true
@@ -82,26 +71,89 @@ android {
 
 repositories {
     mavenLocal()
-
     mavenCentral()
     google()
 
     maven { url 'https://vocalinkzapp.jfrog.io/artifactory/merchant-library-maven/' }
 
-    maven { url "$projectDir/../node_modules/react-native/android" }
+    def found = false
+    def defaultDir = null
+    def androidSourcesName = 'React Native sources'
+
+    if (rootProject.ext.has('reactNativeAndroidRoot')) {
+        defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+    } else {
+        defaultDir = new File(
+                projectDir,
+                '/../../../node_modules/react-native/android'
+        )
+    }
+
+    if (defaultDir.exists()) {
+        maven {
+            url defaultDir.toString()
+            name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+        found = true
+    } else {
+        def parentDir = rootProject.projectDir
+
+        1.upto(5, {
+            if (found) return true
+            parentDir = parentDir.parentFile
+
+            def androidSourcesDir = new File(
+                    parentDir,
+                    'node_modules/react-native'
+            )
+
+            def androidPrebuiltBinaryDir = new File(
+                    parentDir,
+                    'node_modules/react-native/android'
+            )
+
+            if (androidPrebuiltBinaryDir.exists()) {
+                maven {
+                    url androidPrebuiltBinaryDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+                found = true
+            } else if (androidSourcesDir.exists()) {
+                maven {
+                    url androidSourcesDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+                found = true
+            }
+        })
+    }
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native android sources. " +
+                        "Ensure you have you installed React Native as a dependency in your project and try again."
+        )
+    }
 }
 
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.appcompat:appcompat-resources:1.4.1'
-    implementation 'com.google.android.gms:play-services-wallet:18.0.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat-resources:1.5.1'
+    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation 'com.judopay:judokit-android:3.0.13'
+    implementation 'com.judopay:judokit-android:4.1.0'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
@@ -109,11 +161,19 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit5_version"
 
-    testImplementation 'androidx.test:core:1.4.0'
-    testImplementation 'io.mockk:mockk:1.10.0'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'io.mockk:mockk:1.13.3'
     testImplementation 'android.arch.core:core-testing:1.1.1'
 }
 
+if (isNewArchitectureEnabled()) {
+    react {
+        jsRootDir = file("../src/")
+        libraryName = "JudoKit-ReactNative"
+        codegenJavaPackageName = "com.reactlibrary"
+    }
+}
+
 task generateCodeAnalysisReport {
     group 'Reporting'
     description 'Start reporting code analysis tasks (Jacoco)'
@@ -122,77 +182,6 @@ task generateCodeAnalysisReport {
 
 task jacocoTestReport(type: JacocoReport, group: 'verification', description: 'Generate Jacoco Reports for all android variants')
 
-def configureReactNativePom(def pom) {
-    def packageJson = new JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.reactlibrary"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-
-    task androidJavadoc(type: Javadoc) {
-        source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
-    }
-
-    task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
-        classifier = 'javadoc'
-        from androidJavadoc.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider.get()) {
-            from variant.javaCompileProvider.get().destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocJar
-    }
-
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-
-            configureReactNativePom pom
-        }
-    }
-}
-
 project.afterEvaluate {
     def variants = android.hasProperty('libraryVariants') ? android.libraryVariants : android.applicationVariants
     variants.forEach {
@@ -235,7 +224,7 @@ def addJacocoTask(variant) {
         sourceDirectories.from(files(variant.sourceSets.kotlin.srcDirs.flatten()))
         def kotlinTask = tasks.getByName("compile${variantName}Kotlin")
         if (kotlinTask) {
-            classDirectories += fileTree(dir: kotlinTask.destinationDir, excludes: excludedFiles)
+            classDirectories += fileTree(dir: kotlinTask.destinationDirectory, excludes: excludedFiles)
         }
     }