1
0
mirror of https://github.com/tateisu/SubwayTooter synced 2024-12-22 23:28:15 +01:00

- versionCode 500

- versionName 5.0.0

- 会話を別タンスで開く際に同期用のステータス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
This commit is contained in:
tateisu 2022-08-02 12:17:05 +09:00
parent 406ce8e5c5
commit 249ff52556
8 changed files with 14 additions and 14 deletions

View File

@ -19,7 +19,6 @@ compileKotlin {
kotlinOptions {
jvmTarget = jvm_target
useIR = true
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

View File

@ -29,7 +29,6 @@ android {
kotlinOptions {
jvmTarget = jvm_target
useIR = true
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

View File

@ -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"

View File

@ -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()

View File

@ -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'

View File

@ -24,7 +24,6 @@ android {
kotlinOptions {
jvmTarget = jvm_target
useIR = true
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

View File

@ -28,7 +28,6 @@ android {
kotlinOptions {
jvmTarget = jvm_target
useIR = true
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

View File

@ -35,7 +35,6 @@ android {
kotlinOptions {
jvmTarget = jvm_target
useIR = true
freeCompilerArgs += [
"-Xopt-in=kotlin.ExperimentalStdlibApi",
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",