From 249ff5255646ea0ea588e5941406a4fa8dfb41d0 Mon Sep 17 00:00:00 2001 From: tateisu Date: Tue, 2 Aug 2022 12:17:05 +0900 Subject: [PATCH] - versionCode 500 - versionName 5.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 会話を別タンスで開く際に同期用のステータスURLを整形する - exoplayer:2.18.1 - lifecycle_version=2.5.1 - roomVersion=2.4.3 - kotlin_version1.7.10 - kotlinx_coroutines_version1.6.4 - remove kotlinOptions.useIR=true --- apng/build.gradle | 1 - apng_android/build.gradle | 1 - app/build.gradle | 9 ++++----- .../juggler/subwaytooter/action/Action_Conversation.kt | 8 +++++++- build.gradle | 6 +++--- colorpicker/build.gradle | 1 - emoji/build.gradle | 1 - sample_apng/build.gradle | 1 - 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apng/build.gradle b/apng/build.gradle index 4cabc2c5..db893466 100644 --- a/apng/build.gradle +++ b/apng/build.gradle @@ -19,7 +19,6 @@ compileKotlin { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/apng_android/build.gradle b/apng_android/build.gradle index bf9fa26d..3fdfef2e 100644 --- a/apng_android/build.gradle +++ b/apng_android/build.gradle @@ -29,7 +29,6 @@ android { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/app/build.gradle b/app/build.gradle index ab4f8bc2..de77092e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { targetSdkVersion target_sdk_version minSdkVersion min_sdk_version - versionCode 499 - versionName "4.9.9" + versionCode 500 + versionName "5.0.0" applicationId "jp.juggler.subwaytooter" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -37,7 +37,6 @@ android { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", @@ -228,7 +227,7 @@ dependencies { implementation 'com.astuetz:pagerslidingtabstrip:1.0.1' - implementation 'com.google.android.exoplayer:exoplayer:2.18.0' + implementation 'com.google.android.exoplayer:exoplayer:2.18.1' /* WARNING: [Processor] Library '…\exoplayer-ui-2.12.0.aar' contains references to both AndroidX and old support library. This seems like the library is partially migrated. Jetifier will try to rewrite the library anyway. Example of androidX reference: 'androidx/core/app/NotificationCompat$Builder' @@ -266,7 +265,7 @@ dependencies { implementation 'androidx.work:work-runtime-ktx:2.7.1' - def roomVersion = "2.4.2" + def roomVersion = "2.4.3" implementation "androidx.room:room-runtime:$roomVersion" implementation "androidx.room:room-ktx:$roomVersion" kapt "androidx.room:room-compiler:$roomVersion" diff --git a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Conversation.kt b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Conversation.kt index fc56afee..8450e6b2 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/action/Action_Conversation.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/action/Action_Conversation.kt @@ -232,12 +232,18 @@ private fun ActMain.conversationRemote( // アプリ外部からURLを渡された場合に呼ばれる fun ActMain.conversationOtherInstance( pos: Int, - url: String, + urlArg: String, statusIdOriginal: EntityId? = null, hostAccess: Host? = null, statusIdAccess: EntityId? = null, isReference: Boolean = false, ) { + // 参照の場合、status URLから/references を除去しないとURLでの検索ができない + val url = when { + isReference -> """/references\z""".toRegex().replace(urlArg, "") + else -> urlArg + } + val activity = this val dialog = ActionsDialog() diff --git a/build.gradle b/build.gradle index a3fbe33c..29a18610 100644 --- a/build.gradle +++ b/build.gradle @@ -7,11 +7,11 @@ buildscript { ext.compile_sdk_version = 31 ext.appcompat_version = "1.4.2" - ext.lifecycle_version = "2.5.0" + ext.lifecycle_version = "2.5.1" ext.arch_version = "2.1.0" - ext.kotlin_version = '1.6.21' - ext.kotlinx_coroutines_version = '1.6.2' + ext.kotlin_version = '1.7.10' + ext.kotlinx_coroutines_version = '1.6.4' ext.anko_version = '0.10.8' diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index 564db643..399ab922 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -24,7 +24,6 @@ android { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/emoji/build.gradle b/emoji/build.gradle index bd77e5b3..26da8e1a 100644 --- a/emoji/build.gradle +++ b/emoji/build.gradle @@ -28,7 +28,6 @@ android { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/sample_apng/build.gradle b/sample_apng/build.gradle index d5afcc19..ef1d2289 100644 --- a/sample_apng/build.gradle +++ b/sample_apng/build.gradle @@ -35,7 +35,6 @@ android { kotlinOptions { jvmTarget = jvm_target - useIR = true freeCompilerArgs += [ "-Xopt-in=kotlin.ExperimentalStdlibApi", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",