Merge branch 'master' into handle_non_existing_deeplink_app

omise · Sep 9, 2024 · 0d89c52 · 0d89c52
2 parents ece36b7 + dd8d70f
commit 0d89c52
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 135 deletions.
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -20,12 +20,6 @@ android {
         compileSdk compile_sdk_version
         buildConfigField "int", "VERSION_CODE", "$omise_sdk_code_version"
         buildConfigField "String", "VERSION_NAME", "\"$omise_sdk_version\""
-        buildConfigField "String", "NETCETERA_API_KEY", "\"${System.getenv('NETCETERA_API_KEY')}\""
-        buildConfigField "String", "SCHEME_NAME", "\"${System.getenv('SCHEME_NAME')}\""
-        buildConfigField "String", "DS_ID", "\"${System.getenv('DS_ID')}\""
-        buildConfigField "String", "MESSAGE_VERSION", "\"${System.getenv('MESSAGE_VERSION')}\""
-        buildConfigField "String", "ACS_REF_NUMBER", "\"${System.getenv('ACS_REF_NUMBER')}\""
-        buildConfigField "String", "DS_PUBLIC_KEY", "\"${System.getenv('DS_PUBLIC_KEY')}\""
         testInstrumentationRunner "co.omise.android.OmiseTestRunner"
     }
 
@@ -173,7 +167,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation 'com.google.android.gms:play-services-wallet:19.1.0'
     // Required by Netcetera, check https://3dss.netcetera.com/3dssdk/doc/2.10.0/android-error-handling error [1322]
-    implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.77'
 
     debugImplementation("androidx.fragment:fragment-testing:$fragment_testing_version") {
         exclude group: 'androidx.test', module: 'core'

diff --git a/sdk/libs/classes.jar b/sdk/libs/classes.jar
diff --git a/sdk/proguard-rules.pro b/sdk/proguard-rules.pro
@@ -87,3 +87,7 @@
 # Keep the classes from slf4j
 -keep class org.slf4j.** { *; }
 
+# Keep kotlin.KotlinVersion if present
+-keep class kotlin.KotlinVersion { *; }
+-dontwarn kotlin.KotlinVersion
+
diff --git a/sdk/src/main/assets/support_server_prev.p12 b/sdk/src/main/assets/support_server_prev.p12
diff --git a/sdk/src/main/assets/support_server_prod.p12 b/sdk/src/main/assets/support_server_prod.p12
diff --git a/sdk/src/main/jniLibs/arm64-v8a/libef4c.so → sdk/src/main/jniLibs/arm64-v8a/libeb90.so b/sdk/src/main/jniLibs/arm64-v8a/libef4c.so → sdk/src/main/jniLibs/arm64-v8a/libeb90.so
diff --git a/sdk/src/main/jniLibs/armeabi-v7a/libef4c.so → sdk/src/main/jniLibs/armeabi-v7a/libeb90.so b/sdk/src/main/jniLibs/armeabi-v7a/libef4c.so → sdk/src/main/jniLibs/armeabi-v7a/libeb90.so
diff --git a/sdk/src/main/jniLibs/x86/libef4c.so → sdk/src/main/jniLibs/x86/libeb90.so b/sdk/src/main/jniLibs/x86/libef4c.so → sdk/src/main/jniLibs/x86/libeb90.so
diff --git a/sdk/src/main/jniLibs/x86_64/libef4c.so → sdk/src/main/jniLibs/x86_64/libeb90.so b/sdk/src/main/jniLibs/x86_64/libef4c.so → sdk/src/main/jniLibs/x86_64/libeb90.so
diff --git a/sdk/src/main/res/drawable/ds_logo_amex.xml b/sdk/src/main/res/drawable/ds_logo_amex.xml
diff --git a/sdk/src/main/res/drawable/ds_logo_amex_dark.xml b/sdk/src/main/res/drawable/ds_logo_amex_dark.xml
diff --git a/sdk/src/main/res/raw/keep.xml b/sdk/src/main/res/raw/keep.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+  tools:keep="
+        @drawable/ds_logo_amex,
+        @drawable/ds_logo_amex_dark,
+        @drawable/ds_logo_diners,
+        @drawable/ds_logo_mastercard,
+        @drawable/ds_logo_mastercard_dark,
+        @drawable/ds_logo_visa,
+        @drawable/ic_password_toggle_masked,
+        @drawable/ic_password_toggle_visible,
+        @drawable/cb_bakground,
+        @drawable/ds_logo_cb,
+        @drawable/ds_logo_eftpos,
+        @drawable/ds_logo_jcb,
+        @drawable/ds_logo_union,
+        @values/challenge_ui_ids
+    " />