merge: 2.6.1 (#107)

.gitignore

@@ -1,57 +1,61 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
 # Gradle files
 .gradle/
 build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
+# Log/OS Files
 *.log
 
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
+# Android Studio generated files and folders
 captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+*.aab
+output.json
 
-# Intellij
+# IntelliJ
 *.iml
 .idea/
 misc.xml
 deploymentTargetDropDown.xml
-render.experimental.xml
+render.experimental.xml/
 
 # Keystore files
 *.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
+*.keystore
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json
 
+# Android Profiling
+*.hprof
+
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Intellij
+render.experimental.xml
+
+
 # Freeline
 freeline.py
 freeline/
 freeline_project_description.json
 
 # Mac files
-.DS_Store
+.DS_Store

app/build.gradle.kts

@@ -62,7 +62,7 @@ android {
         buildConfig = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
+        kotlinCompilerExtensionVersion = "1.5.3"
     }
 }
 
@@ -72,12 +72,12 @@ dependencies {
 
     // Dependencies
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
-    implementation("androidx.activity:activity-compose:1.7.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
+    implementation("androidx.activity:activity-compose:1.8.0")
 
     // Jetpack Compose
-    implementation(platform("androidx.compose:compose-bom:2023.08.00"))
+    implementation(platform("androidx.compose:compose-bom:2023.10.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.1.0" apply false
-    id("com.android.library") version "8.1.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+    id("com.android.application") version "8.1.2" apply false
+    id("com.android.library") version "8.1.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.10" apply false
 }

cardpresent/build.gradle.kts

@@ -0,0 +1,107 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    `maven-publish`
+}
+
+group = "com.github.fattmerchantorg"
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("release") {
+                from(components["release"])
+                groupId = "com.github.fattmerchantorg"
+                artifactId = "cardpresent"
+                version = "2.6.1"
+            }
+        }
+    }
+}
+
+android {
+    namespace = "com.fattmerchant"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 23
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    packaging {
+        resources {
+            excludes += "META-INF/*.kotlin_module"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test:core:1.5.0")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test:runner:1.5.2")
+    androidTestImplementation("androidx.test:rules:1.5.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("org.hamcrest:hamcrest-library:2.2")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
+    androidTestImplementation("net.zetetic:android-database-sqlcipher:4.0.1")
+
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("androidx.test:runner:1.5.2")
+    testImplementation("androidx.test:rules:1.5.0")
+    testImplementation("androidx.test:core:1.5.0")
+    testImplementation("org.robolectric:robolectric:4.9")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
+
+    // ChipDNA (NMI)
+    api(files("libs/CardEaseXMLClient.jar"))
+    api(files("libs/ChipDnaMobile.jar"))
+
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
+    implementation("com.squareup.moshi:moshi-kotlin:1.13.0")
+    implementation("com.jakewharton.timber:timber:4.7.1")
+    implementation("net.zetetic:android-database-sqlcipher:4.0.1@aar")
+
+    implementation("com.google.code.gson:gson:2.9.1")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
+    implementation("com.github.smart-fun:XmlToJson:1.4.4")
+    api("org.slf4j:slf4j-api:1.7.30")
+    api("com.github.tony19:logback-android:2.0.0")
+    api("com.googlecode.libphonenumber:libphonenumber:8.5.0")
+    implementation("com.squareup.retrofit2:converter-scalars:2.3.0")
+    implementation("org.simpleframework:simple-xml:2.7.1") {
+        exclude(group = "stax", module = "stax-api")
+        exclude(group = "xpp3", module = "xpp3")
+    }
+
+    // Ktor
+    implementation("io.ktor:ktor-client-core:1.1.4")
+    implementation("io.ktor:ktor-client-okhttp:1.1.4")
+    implementation("io.ktor:ktor-client-ios:1.1.4")
+    implementation("io.ktor:ktor-client-json:1.1.4")
+    implementation("io.ktor:ktor-client-gson:1.1.4")
+}

cardpresent/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

cardpresent/src/main/java/com/fattmerchant/omni/usecase/TakePayment.kt

@@ -40,7 +40,7 @@ internal class TakePayment(
 
         tokenizedPaymentMethod.id?.let {
             val chargeRequest = createChargeRequest(request.amount, it)
-            omniApi.charge(chargeRequest) { error ->
+            omniApi.charge(chargeRequest) {
                 failure(OmniException("Charging the payment method was unsuccessful."))
             }
         } ?: return@coroutineScope null

cardpresent/src/main/java/com/fattmerchant/omni/usecase/VoidTransaction.kt

@@ -19,7 +19,7 @@ class VoidTransaction(
         shouldn't be hitting this code for anything except NMI. With that assumption, we can get
         away with asking the Stax API to perform the capture for us
          */
-        val transaction = omniApi.voidTransaction(transactionId) { error ->
+        val transaction = omniApi.voidTransaction(transactionId) {
             failure(OmniException("Voiding the transaction was unsuccessful."))
         }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 21 14:17:30 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists