From e89e049d6bfc7130d3a88a3bd90ea81a6ec05ccb Mon Sep 17 00:00:00 2001 From: Hyukgyu Kwon Date: Thu, 25 Jul 2024 17:20:43 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20js=20sdk=201.3.0=20=EC=97=85=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../iamport/sampleapp/ui/PaymentResultFragment.kt | 2 +- build.gradle.kts | 15 --------------- buildSrc/src/main/java/Dependencies.kt | 13 +++++-------- sdk/build.gradle.kts | 10 +--------- sdk/src/main/assets/iamportcdn.html | 2 +- sdk/src/main/assets/mobileweb.html | 2 +- .../com/iamport/sdk/data/sdk/IamPortResponse.kt | 3 +++ sdk/src/main/java/com/iamport/sdk/data/sdk/PG.kt | 6 +++--- .../sdk/presentation/activity/WebViewActivity.kt | 4 ++-- sdk/src/main/res/layout/loading.xml | 15 +++++++-------- sdk/src/main/res/raw/animation.json | 1 + settings.gradle.kts | 13 +++++++++++++ 13 files changed, 39 insertions(+), 49 deletions(-) create mode 100644 sdk/src/main/res/raw/animation.json diff --git a/app/build.gradle b/app/build.gradle index b5ea32fd..50f832aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -89,7 +89,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1' implementation project(':sdk') // 가맹점은 이 코드가 아닌 아래와 같은 "버전"을 통한 implementation 으로 반영해주세요 -// implementation 'com.github.iamport:iamport-android:1.3.4' +// implementation 'com.github.iamport:iamport-android:1.4.5' // implementation 'com.github.iamport:iamport-android:fix~custom_data-SNAPSHOT' } diff --git a/app/src/main/java/com/iamport/sampleapp/ui/PaymentResultFragment.kt b/app/src/main/java/com/iamport/sampleapp/ui/PaymentResultFragment.kt index eba83b6a..1181d935 100644 --- a/app/src/main/java/com/iamport/sampleapp/ui/PaymentResultFragment.kt +++ b/app/src/main/java/com/iamport/sampleapp/ui/PaymentResultFragment.kt @@ -38,6 +38,6 @@ class PaymentResultFragment : Fragment() { if (iamPortResponse == null) { return false } - return iamPortResponse.success == true || iamPortResponse.imp_success == true + return iamPortResponse.imp_success == true || iamPortResponse.success == true || (iamPortResponse.error_code == null && iamPortResponse.code == null) } } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index dc426b63..418bdaf1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - google() - mavenCentral() - gradlePluginPortal() - maven { setUrl("https://jitpack.io") } - } dependencies { classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin_stdlib_jdk}") } @@ -16,15 +10,6 @@ plugins { `update-dependency` } -allprojects { - repositories { - google() - mavenCentral() - gradlePluginPortal() - maven { setUrl("https://jitpack.io") } - } -} - tasks.register("clean") { delete(rootProject.layout.buildDirectory) } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 3206fd6d..58d43bb0 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,8 +1,8 @@ // 디펜던시 업데이트 확인 ./gradlew dependencyUpdates object Versions { - const val versionCode = 240215000 // yymmdd000 - const val versionName = "1.4.4" // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6 + const val versionCode = 240725000 // yymmdd000 + const val versionName = "1.4.5" // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6 const val multidex = "2.0.1" const val kotlin_stdlib_jdk = "1.9.10" @@ -44,14 +44,13 @@ object Versions { const val rxandroid = "2.1.1" const val rxjava2_debug = "1.4.0" - // loading animation - const val spinKit = "1.4.0" - const val robolectric = "4.7.3" const val serialization = "1.6.0" const val workRuntimeKtx = "2.8.1" + + const val lottie = "6.4.1" } object Libs { @@ -120,14 +119,12 @@ object Libs { const val rxandroid = "io.reactivex.rxjava2:rxandroid:${Versions.rxandroid}" const val rxjava2_debug = "com.akaita.java:rxjava2-debug:${Versions.rxjava2_debug}" - // loading animation - const val spinKit = "com.github.ybq:Android-SpinKit:${Versions.spinKit}" - const val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.serialization}" // target android 12 pending intent 처리를 위해 추가 // Targeting S+ (version 31 and above) requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE be specified when creating a PendingIntent. const val workRuntimeKtx = "androidx.work:work-runtime-ktx:${Versions.workRuntimeKtx}" + const val lottie = "com.airbnb.android:lottie:${Versions.lottie}" } diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index ff051f5c..bf2e2a15 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -43,12 +43,6 @@ android { } } - repositories { - flatDir { - dirs("libs") - } - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -143,10 +137,8 @@ dependencies { implementation(Libs.rxandroid) implementation(Libs.rxjava2_debug) - // loading animation - implementation(Libs.spinKit) - implementation(Libs.serialization) implementation(Libs.workRuntimeKtx) + implementation(Libs.lottie) } \ No newline at end of file diff --git a/sdk/src/main/assets/iamportcdn.html b/sdk/src/main/assets/iamportcdn.html index 75b94399..9b4e6a62 100644 --- a/sdk/src/main/assets/iamportcdn.html +++ b/sdk/src/main/assets/iamportcdn.html @@ -62,6 +62,6 @@ - + \ No newline at end of file diff --git a/sdk/src/main/assets/mobileweb.html b/sdk/src/main/assets/mobileweb.html index 7b3f9294..f414436b 100644 --- a/sdk/src/main/assets/mobileweb.html +++ b/sdk/src/main/assets/mobileweb.html @@ -7,7 +7,7 @@ - +