Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Androidでの利用 | PAY.JP https://pay.jp/docs/mobileapp-android

## 動作環境

- Android Studio 3.0以上
- Android OS 4.1 (API Level 16) 以上
- Android Studio Ladybug Feature Drop (2024.2.2) 以上
- Android OS 5.0 (API Level 21) 以上

## インストール

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ tasks.named("dokkaHtmlCollector") {
}

ext {
minSdkVersion = 16
minSdkVersion = 21
sdkVersion = 35
numberOfCommits = numberOfCommits()
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ junitKtx = "1.1.5"
kotlin = "2.0.0"
browser = "1.6.0"
leakcanaryAndroid = "2.14"
okHttp3 = "3.12.13"
okHttp3 = "4.12.0"
moshi = "1.15.1"
retrofit = "2.11.0"
lifecycle = "2.6.2"
Expand All @@ -23,7 +23,7 @@ recyclerview = "1.3.2"
cardio = "5.5.1"
androidxCore = "1.12.0"
annotation = "1.8.1"
robolectric = "4.12.2"
robolectric = "4.14"
swiperefreshlayout = "1.1.0"
viewpager2 = "1.0.0"
webkit = "1.8.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
# SOFTWARE.
#

sdk=19,34
sdk=21,35
constants=jp.pay.android.BuildConfig

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ package jp.pay.android.network

import com.squareup.moshi.Moshi
import jp.pay.android.PayjpApi
import jp.pay.android.PayjpLogger
import jp.pay.android.model.BundleJsonAdapter
import jp.pay.android.model.CardBrand
import jp.pay.android.model.ClientInfo
Expand Down Expand Up @@ -73,9 +72,6 @@ internal object TokenApiClientFactory {
)
}
}
.let {
OkHttpTlsHelper.enableTls12OnPreLollipop(it, PayjpLogger.get(debuggable))
}
.dispatcher(Dispatcher(NetworkExecutorFactory.create()))
.build()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
# SOFTWARE.
#

sdk=19,34
sdk=21,35
constants=jp.pay.android.BuildConfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
# SOFTWARE.
#

sdk=19,34
sdk=21,35
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ internal class VerifierWebView @JvmOverloads constructor(
domStorageEnabled = true
@SuppressLint("SetJavaScriptEnabled")
javaScriptEnabled = true
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
savePassword = false
}
}
if (WebViewFeature.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE)) {
WebSettingsCompat.setSafeBrowsingEnabled(settings, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
# SOFTWARE.
#

sdk=19,34
sdk=21,35
Loading