Skip to content

Commit 97a153b

Browse files
YuKongAYuKongA
committed
app: bump version to 1.6.2
1 parent f257e00 commit 97a153b

File tree

11 files changed

+27
-40
lines changed

11 files changed

+27
-40
lines changed

‎buildSrc/src/main/kotlin/ProjectConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object ProjectConfig {
22
const val JVM_VERSION = 21
33
const val APP_NAME = "Updater"
44
const val PACKAGE_NAME = "top.yukonga.updater.kmp"
5-
const val VERSION_NAME = "1.6.1"
5+
const val VERSION_NAME = "1.6.2"
66
val VERSION_CODE = getGitVersionCode()
77

88
object Android {

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
android-gradle-plugin = "9.0.0"
3-
androidx-activity-compose = "1.12.3"
3+
androidx-activity-compose = "1.12.4"
44
compose-hotReload = "1.0.0"
55
compose-plugin = "1.10.1"
66
cryptography = "0.5.0"
@@ -15,6 +15,8 @@ miuix = "0.8.1"
1515

1616
[libraries]
1717
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
18+
compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-plugin" }
19+
compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-plugin" }
1820
cryptography-core = { module = "dev.whyoleg.cryptography:cryptography-core", version.ref = "cryptography" }
1921
cryptography-provider-apple = { module = "dev.whyoleg.cryptography:cryptography-provider-apple", version.ref = "cryptography" }
2022
cryptography-provider-jdk = { module = "dev.whyoleg.cryptography:cryptography-provider-jdk", version.ref = "cryptography" }
@@ -31,8 +33,6 @@ ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "kto
3133
ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor-client" }
3234
miuix = { module = "top.yukonga.miuix.kmp:miuix", version.ref = "miuix" }
3335
miuix-icons = { module = "top.yukonga.miuix.kmp:miuix-icons", version.ref = "miuix" }
34-
ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-plugin" }
35-
components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-plugin" }
3636

3737
[plugins]
3838
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }

‎ios/iosApp/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.6.1</string>
20+
<string>1.6.2</string>
2121
<key>CFBundleVersion</key>
22-
<string>524</string>
22+
<string>526</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UIApplicationSceneManifest</key>

‎shared/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ kotlin {
5454
kotlin.srcDir(generatedSrcDir.resolve("kotlin").absolutePath)
5555
}
5656
commonMain.dependencies {
57-
api(libs.ui)
58-
api(libs.components.resources)
57+
api(libs.compose.ui)
58+
api(libs.compose.components.resources)
5959
// Added
6060
implementation(libs.cryptography.core)
6161
implementation(libs.image.loader)

‎shared/src/commonMain/composeResources/values-ja-rJP/strings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@
6868
<string name="device_list_update_failed">更新に失敗しました</string>
6969
<string name="device_list_no_updates">更新なし</string>
7070
<string name="device_list_version">バージョン</string>
71-
<string name="login_tips1">二次認証が検出されました。検証コードの取得ボタンをクリックしてください</string>
72-
<string name="login_tips2">検証コードの入力が必要です。検証コードの取得ボタンをクリックしてください</string>
73-
<string name="verification_code">検証コード</string>L
71+
<string name="login_tips">二次認証が検出されました。検証コードの取得ボタンをクリックしてください</string>
72+
<string name="get_verification_code">検証コードを取得</string>
73+
<string name="do_not_enter_in_browser">ブラウザに検証コードを入力しないでください！</string>
74+
<string name="verification_code">検証コード</string>
7475
<string name="send_email_code">メールコードを送信</string>
7576
<string name="send_phone_code">電話コードを送信</string>
7677
<string name="send_code_error">検証コードの送信に失敗しました。別の検証方法を試してください！</string>

‎shared/src/commonMain/composeResources/values-pt-rBR/strings.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@
6868
<string name="device_list_update_failed">A atualização falhou</string>
6969
<string name="device_list_no_updates">Nenhuma atualização disponível</string>
7070
<string name="device_list_version">Versão</string>
71-
<string name="login_tips1">Detectada autenticação de dois fatores, clique no botão Obter código de verificação</string>
72-
<string name="login_tips2">É necessário inserir o código de verificação, clique no botão Obter código de verificação</string>
71+
<string name="login_tips">Detectada autenticação de dois fatores, clique no botão Obter código de verificação</string>
7372
<string name="verification_code_get">Obter código de verificação</string>
73+
<string name="do_not_enter_in_browser">Não insira o código de verificação no navegador!</string>
74+
<string name="verification_code">Código de verificação</string>
7475
<string name="send_email_code">Enviar código de e-mail</string>
7576
<string name="send_phone_code">Enviar código de telefone</string>
7677
<string name="send_code_error">Falha ao enviar o código de verificação, tente outros métodos de verificação!</string>

‎shared/src/commonMain/composeResources/values-zh-rCN/strings.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@
6868
<string name="device_list_update_failed">更新失败</string>
6969
<string name="device_list_no_updates">无可用更新</string>
7070
<string name="device_list_version">版本</string>
71-
<string name="login_tips1">检测到二次认证，请点击获取验证码按钮</string>
72-
<string name="login_tips2">需要输入验证码，请点击获取验证码按钮</string>
71+
<string name="login_tips">检测到二次认证，请点击获取验证码按钮</string>
7372
<string name="get_verification_code">获取验证码</string>
74-
<string name="do_not_enter_in_browser">不要在浏览器内输入验证码</string>
73+
<string name="do_not_enter_in_browser">不要在浏览器内输入验证码！</string>
7574
<string name="verification_code">验证码</string>
7675
<string name="send_email_code">发送邮箱验证码</string>
7776
<string name="send_phone_code">发送手机验证码</string>

‎shared/src/commonMain/composeResources/values-zh-rTW/strings.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@
6868
<string name="device_list_update_failed">更新失敗</string>
6969
<string name="device_list_no_updates">無可用更新</string>
7070
<string name="device_list_version">版本</string>
71-
<string name="login_tips1">檢測到二次認證，請點擊獲取驗證碼按鈕</string>
72-
<string name="login_tips2">需要輸入驗證碼，請點擊獲取驗證碼按鈕</string>
71+
<string name="login_tips">檢測到二次認證，請點擊獲取驗證碼按鈕</string>
72+
<string name="get_verification_code">獲取驗證碼</string>
73+
<string name="do_not_enter_in_browser">不要在瀏覽器內輸入驗證碼！</string>
7374
<string name="verification_code">驗證碼</string>
7475
<string name="send_email_code">發送郵箱驗證碼</string>
7576
<string name="send_phone_code">發送手機驗證碼</string>

‎shared/src/commonMain/composeResources/values/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
<string name="device_list_update_failed">Update failed</string>
7070
<string name="device_list_no_updates">No updates</string>
7171
<string name="device_list_version">Version</string>
72-
<string name="login_tips1">Detected two-factor authentication, please click the get verification code button</string>
73-
<string name="login_tips2">Verification code is required, please click the get verification code button</string>
72+
<string name="login_tips">Detected two-factor authentication, please click the get verification code button</string>
7473
<string name="get_verification_code">Get Verification Code</string>
7574
<string name="do_not_enter_in_browser">Do not enter the verification code in the browser</string>
7675
<string name="verification_code">Verification Code</string>

‎shared/src/commonMain/kotlin/Login.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,9 @@ class Login {
139139

140140
val content = Json.decodeFromString<JsonObject>(removeResponsePrefix(response.bodyAsText()))
141141
val ssecurity = content["ssecurity"]?.jsonPrimitive?.content
142-
val captchaUrl = content["captchaUrl"]?.jsonPrimitive?.content
143142
val notificationUrl = content["notificationUrl"]?.jsonPrimitive?.content
144143
val result = content["result"]?.jsonPrimitive?.content
145144

146-
if (captchaUrl != null && captchaUrl != "null") {
147-
prefSet("captchaUrl", captchaUrl)
148-
return 6 // 6: 前往浏览器完成图片验证码
149-
}
150-
151145
if (notificationUrl != null && notificationUrl != "null") {
152146
val context = getQueryParam(notificationUrl, "context")
153147
if (context.isNullOrEmpty()) return 3 // 3: 登录失败

0 commit comments

Comments
 (0)