diff --git a/app/build.gradle b/app/build.gradle index 2215710..ad75483 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,8 +71,7 @@ dependencies { // Zowie 0.1.1 has incorrect obfuscation strategy (default, consecutive alphabet letters, no package, no prefix) // The problem is fixed in zowie 0.1.2 - implementation 'ai.zowie:android-sdk:0.1.1' -// implementation 'ai.zowie:android-sdk:0.1.2' + implementation 'ai.zowie:android-sdk:0.1.2' // When checkout 3ds is added to the project together with ai.zowie:0.1.1, we have the following error: // Duplicate class a.a found in modules android-sdk-0.1.1-runtime (ai.zowie:android-sdk:0.1.1) and checkout-sdk-3ds-android-2.0.4-runtime (com.checkout:checkout-sdk-3ds-android:2.0.4) @@ -86,10 +85,10 @@ dependencies { // Duplicate class f.c found in modules android-sdk-0.1.1-runtime (ai.zowie:android-sdk:0.1.1) and checkout-sdk-3ds-android-2.0.4-runtime (com.checkout:checkout-sdk-3ds-android:2.0.4) // Duplicate class g.a found in modules android-sdk-0.1.1-runtime (ai.zowie:android-sdk:0.1.1) and checkout-sdk-3ds-android-2.0.4-runtime (com.checkout:checkout-sdk-3ds-android:2.0.4) // Duplicate class g.b found in modules android-sdk-0.1.1-runtime (ai.zowie:android-sdk:0.1.1) and checkout-sdk-3ds-android-2.0.4-runtime (com.checkout:checkout-sdk-3ds-android:2.0.4) - implementation 'com.checkout:checkout-sdk-3ds-android:2.0.4' + implementation 'com.checkout:checkout-sdk-3ds-android:3.0.1-testonly-07' // when frames is added to the project together with checkout 3ds, we have the following error: // Type com.checkout.eventlogger.R is defined multiple times: /Users/jangonera/projekty/poligon/checkoutminify/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:com/checkout/eventlogger/R.class, /Users/jangonera/.gradle/caches/transforms-3/31d124a7cd8ba916f4f23c0cd71dc755/transformed/checkout-sdk-3ds-android-2.0.4-runtime.jar:com/checkout/eventlogger/R.class -// implementation 'com.github.checkout:frames-android:4.0.1' + implementation 'com.github.checkout:frames-android:4.0.2' } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 08e15d1..e69de29 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,65 +0,0 @@ --keepclassmembers,allowoptimization enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - private static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# remove runtime assertions, they are enforced in compile-time by Kotlin compiler --assumenosideeffects class kotlin.jvm.internal.Intrinsics { - public static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String); - public static void checkFieldIsNotNull(java.lang.Object, java.lang.String); - public static void checkFieldIsNotNull(java.lang.Object, java.lang.String, java.lang.String); - public static void checkNotNull(java.lang.Object); - public static void checkNotNull(java.lang.Object, java.lang.String); - public static void checkNotNullExpressionValue(java.lang.Object, java.lang.String); - public static void checkNotNullParameter(java.lang.Object, java.lang.String); - public static void checkParameterIsNotNull(java.lang.Object, java.lang.String); - public static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String); - public static void checkReturnedValueIsNotNull(java.lang.Object, java.lang.String, java.lang.String); - public static void throwUninitializedPropertyAccessException(java.lang.String); -} - -### remove logs ### --assumenosideeffects class android.util.Log { - public static *** d(...); - public static *** w(...); - public static *** v(...); - public static *** i(...); - public static *** e(...); - public static *** wtf(...); -} --keep class com.google.errorprone.annotations.Immutable --keep class org.conscrypt.** {*; } --keep class org.conscrypt.** {*; } --keep class org.conscrypt.** {*; } --keep class org.openjsse.** {*; } --keep class org.openjsse.** {*; } --keep class org.openjsse.** {*; } --dontwarn org.conscrypt.** --dontwarn org.bouncycastle.** --dontwarn org.openjsse.** --dontwarn com.google.errorprone.annotations.Immutable --dontwarn d.a.c.** -# -#-dontwarn com.google.errorprone.annotations.Immutable -#-dontwarn d.a.c.g.b -#-dontwarn d.a.c.g.f -#-dontwarn d.a.c.g.k$a -#-dontwarn d.a.c.g.k$b -#-dontwarn d.a.c.g.o -#-dontwarn d.a.c.g.p -#-dontwarn d.a.c.g.t -#-dontwarn d.a.c.l.a -#-dontwarn org.conscrypt.Conscrypt$Version -#-dontwarn org.conscrypt.Conscrypt -#-dontwarn org.conscrypt.ConscryptHostnameVerifier -#-dontwarn org.openjsse.javax.net.ssl.SSLParameters -#-dontwarn org.openjsse.javax.net.ssl.SSLSocket -#-dontwarn org.openjsse.net.ssl.OpenJSSE \ No newline at end of file diff --git a/build.gradle b/build.gradle index dabac3a..d03df87 100644 --- a/build.gradle +++ b/build.gradle @@ -7,12 +7,14 @@ plugins { allprojects { repositories { mavenCentral() + mavenLocal() google() maven { url = uri("https://maven.pkg.github.com/checkout/checkout-3ds-sdk-android") credentials { - username = githubTokenUserName - password = githubToken + username = "username" + password = "token" + // Please add permission for write packages while creating token } } maven { url 'https://jitpack.io' }