diff --git a/README.md b/README.md index ff160d79..286ec9c7 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ pluginManagement { // ... } plugins { - id("com.github.kitakkun.backintime") version "1.0.0" apply false + id("io.github.kitakkun.backintime") version "1.0.0" apply false kotlin("plugin.serialization") version "2.0.0" apply false // required by the plugin } } @@ -59,7 +59,7 @@ dependencyResolutionManagement { ```kotlin plugins { - id("com.github.kitakkun.backintime") version "1.0.0" + id("io.github.kitakkun.backintime") version "1.0.0" kotlin("plugin.serialization") ... } diff --git a/backintime-annotations/build.gradle.kts b/backintime-annotations/build.gradle.kts index cb70aa9b..f7de6850 100644 --- a/backintime-annotations/build.gradle.kts +++ b/backintime-annotations/build.gradle.kts @@ -22,5 +22,5 @@ kotlin { android { compileSdk = 34 - namespace = "com.github.kitakkun.backintime.annotations" + namespace = "io.github.kitakkun.backintime.annotations" } diff --git a/backintime-annotations/src/commonMain/kotlin/com/github/kitakkun/backintime/annotations/Annotations.kt b/backintime-annotations/src/commonMain/kotlin/io/github/kitakkun/backintime/annotations/Annotations.kt similarity index 93% rename from backintime-annotations/src/commonMain/kotlin/com/github/kitakkun/backintime/annotations/Annotations.kt rename to backintime-annotations/src/commonMain/kotlin/io/github/kitakkun/backintime/annotations/Annotations.kt index a9ae4239..f82d8c76 100644 --- a/backintime-annotations/src/commonMain/kotlin/com/github/kitakkun/backintime/annotations/Annotations.kt +++ b/backintime-annotations/src/commonMain/kotlin/io/github/kitakkun/backintime/annotations/Annotations.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package com.github.kitakkun.backintime.annotations +package io.github.kitakkun.backintime.annotations /** * compiler plugin will inject code for debugging if the class is marked with this annotation. diff --git a/backintime-demo/app/build.gradle.kts b/backintime-demo/app/build.gradle.kts index 463040c4..f04c2f93 100644 --- a/backintime-demo/app/build.gradle.kts +++ b/backintime-demo/app/build.gradle.kts @@ -5,15 +5,15 @@ plugins { alias(libs.plugins.kotlinSerialization) alias(libs.plugins.backintimeLint) alias(libs.plugins.compose.compiler) - id("com.github.kitakkun.backintime") version "1.0.0" + id("io.github.kitakkun.backintime") version "1.0.0" } android { - namespace = "com.github.kitakkun.backintime.evaluation" + namespace = "io.github.kitakkun.backintime.evaluation" compileSdk = 34 defaultConfig { - applicationId = "com.github.kitakkun.backintime.evaluation" + applicationId = "io.github.kitakkun.backintime.evaluation" minSdk = 24 targetSdk = 34 versionCode = 1 diff --git a/backintime-demo/app/src/main/AndroidManifest.xml b/backintime-demo/app/src/main/AndroidManifest.xml index 93985baa..7082758f 100644 --- a/backintime-demo/app/src/main/AndroidManifest.xml +++ b/backintime-demo/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt b/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt deleted file mode 100644 index 74f1e9d7..00000000 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.kitakkun.backintime.evaluation.flux.architecture - -interface ActionCreator diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt b/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt deleted file mode 100644 index 476d9186..00000000 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.kitakkun.backintime.evaluation.flux.architecture - -interface ActionEvent diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt b/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt deleted file mode 100644 index 2b1c4982..00000000 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.kitakkun.backintime.evaluation.flux.architecture - -interface Store { - fun reduce(event: ActionEvent) -} diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt b/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt deleted file mode 100644 index d2871add..00000000 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.kitakkun.backintime.evaluation.mvi.architecture - -interface Store diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MainActivity.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MainActivity.kt similarity index 86% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MainActivity.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MainActivity.kt index 1ccd9e73..f9d3ff1e 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MainActivity.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MainActivity.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation +package io.github.kitakkun.backintime.evaluation import android.os.Bundle import androidx.activity.ComponentActivity @@ -15,10 +15,10 @@ import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import com.github.kitakkun.backintime.evaluation.flux.FluxTodoListPage -import com.github.kitakkun.backintime.evaluation.mvi.MVITodoListPage -import com.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListPage -import com.github.kitakkun.backintime.evaluation.ui.theme.BackintimefluxTheme +import io.github.kitakkun.backintime.evaluation.flux.FluxTodoListPage +import io.github.kitakkun.backintime.evaluation.mvi.MVITodoListPage +import io.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListPage +import io.github.kitakkun.backintime.evaluation.ui.theme.BackintimefluxTheme class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MyApplication.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MyApplication.kt similarity index 81% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MyApplication.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MyApplication.kt index ab613542..f44bcbe6 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/MyApplication.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/MyApplication.kt @@ -1,11 +1,11 @@ -package com.github.kitakkun.backintime.evaluation +package io.github.kitakkun.backintime.evaluation import android.app.Application import com.facebook.flipper.android.AndroidFlipperClient import com.facebook.flipper.android.utils.FlipperUtils import com.facebook.soloader.SoLoader -import com.github.kitakkun.backintime.evaluation.di.appModule -import com.github.kitakkun.backintime.runtime.flipper.BackInTimeFlipperPlugin +import io.github.kitakkun.backintime.evaluation.di.appModule +import io.github.kitakkun.backintime.runtime.flipper.BackInTimeFlipperPlugin import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger import org.koin.core.context.startKoin diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/Todo.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/Todo.kt similarity index 83% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/Todo.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/Todo.kt index c815ae0c..63ef5eac 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/Todo.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/Todo.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.data +package io.github.kitakkun.backintime.evaluation.data import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDao.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDao.kt similarity index 91% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDao.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDao.kt index e0685217..4037520d 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDao.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDao.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.data +package io.github.kitakkun.backintime.evaluation.data import androidx.room.Dao import androidx.room.Delete diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt similarity index 78% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt index 58662587..8ecb64b3 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/data/TodoDatabase.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.data +package io.github.kitakkun.backintime.evaluation.data import androidx.room.Database import androidx.room.RoomDatabase diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/di/AppModule.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/di/AppModule.kt similarity index 52% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/di/AppModule.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/di/AppModule.kt index 3d01b66f..4f1fb0ab 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/di/AppModule.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/di/AppModule.kt @@ -1,13 +1,13 @@ -package com.github.kitakkun.backintime.evaluation.di +package io.github.kitakkun.backintime.evaluation.di import androidx.room.Room -import com.github.kitakkun.backintime.evaluation.data.TodoDao -import com.github.kitakkun.backintime.evaluation.data.TodoDatabase -import com.github.kitakkun.backintime.evaluation.flux.FluxTodoListStore -import com.github.kitakkun.backintime.evaluation.flux.TodoListActionCreator -import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher -import com.github.kitakkun.backintime.evaluation.mvi.MVITodoListStore -import com.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListViewModel +import io.github.kitakkun.backintime.evaluation.data.TodoDao +import io.github.kitakkun.backintime.evaluation.data.TodoDatabase +import io.github.kitakkun.backintime.evaluation.flux.FluxTodoListStore +import io.github.kitakkun.backintime.evaluation.flux.TodoListActionCreator +import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher +import io.github.kitakkun.backintime.evaluation.mvi.MVITodoListStore +import io.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListViewModel import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.factoryOf import org.koin.core.module.dsl.singleOf diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt similarity index 89% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt index aa0279cb..a2d59933 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListPage.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.flux +package io.github.kitakkun.backintime.evaluation.flux import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier -import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.TodoList +import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.TodoList import org.koin.androidx.compose.koinViewModel import org.koin.compose.koinInject diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt similarity index 88% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt index 87ff70bf..921822f9 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/FluxTodoListStore.kt @@ -1,14 +1,14 @@ -package com.github.kitakkun.backintime.evaluation.flux +package io.github.kitakkun.backintime.evaluation.flux import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.evaluation.data.Todo -import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent -import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher -import com.github.kitakkun.backintime.evaluation.flux.architecture.Store +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent +import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher +import io.github.kitakkun.backintime.evaluation.flux.architecture.Store @BackInTime class FluxTodoListStore( diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/IOScope.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/IOScope.kt similarity index 84% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/IOScope.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/IOScope.kt index 2419e6fb..0fbf164d 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/IOScope.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/IOScope.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.flux +package io.github.kitakkun.backintime.evaluation.flux import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt similarity index 80% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt index 9afb97b5..abbefd48 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionCreator.kt @@ -1,15 +1,15 @@ -package com.github.kitakkun.backintime.evaluation.flux +package io.github.kitakkun.backintime.evaluation.flux -import com.github.kitakkun.backintime.evaluation.data.Todo -import com.github.kitakkun.backintime.evaluation.data.TodoDao -import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionCreator -import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher +import io.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.TodoDao +import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionCreator +import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch class TodoListActionCreator( private val dispatcher: Dispatcher, - private val todoDao: TodoDao, + private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao, ) : ActionCreator, CoroutineScope by IOScope() { fun reloadToDos() { launch { diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt similarity index 79% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt index a5113280..957c46bb 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/TodoListActionEvent.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.evaluation.flux +package io.github.kitakkun.backintime.evaluation.flux -import com.github.kitakkun.backintime.evaluation.data.Todo -import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent +import io.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent sealed interface TodoListActionEvent : ActionEvent { data class ReloadToDoSucceeded(val todos: List) : TodoListActionEvent diff --git a/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt new file mode 100644 index 00000000..26c2fa7f --- /dev/null +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionCreator.kt @@ -0,0 +1,3 @@ +package io.github.kitakkun.backintime.evaluation.flux.architecture + +interface ActionCreator diff --git a/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt new file mode 100644 index 00000000..a9942a02 --- /dev/null +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/ActionEvent.kt @@ -0,0 +1,3 @@ +package io.github.kitakkun.backintime.evaluation.flux.architecture + +interface ActionEvent diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt similarity index 81% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt index 778e8611..d2d4a40b 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Dispatcher.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.flux.architecture +package io.github.kitakkun.backintime.evaluation.flux.architecture class Dispatcher { private val listeners = mutableListOf() diff --git a/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt new file mode 100644 index 00000000..4e14443d --- /dev/null +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/flux/architecture/Store.kt @@ -0,0 +1,5 @@ +package io.github.kitakkun.backintime.evaluation.flux.architecture + +interface Store { + fun reduce(event: ActionEvent) +} diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt similarity index 90% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt index 1c0dbb2f..8c52128a 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListPage.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.mvi +package io.github.kitakkun.backintime.evaluation.mvi import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier -import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.TodoList +import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.TodoList import org.koin.androidx.compose.koinViewModel @Composable diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt similarity index 90% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt index dc7f6723..287e9bea 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/MVITodoListStore.kt @@ -1,20 +1,20 @@ -package com.github.kitakkun.backintime.evaluation.mvi +package io.github.kitakkun.backintime.evaluation.mvi import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.evaluation.data.Todo -import com.github.kitakkun.backintime.evaluation.data.TodoDao -import com.github.kitakkun.backintime.evaluation.mvi.architecture.Store +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.TodoDao +import io.github.kitakkun.backintime.evaluation.mvi.architecture.Store import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @BackInTime class MVITodoListStore( - private val todoDao: TodoDao, + private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao, ) : Store, ViewModel() { private val mutableTodos = mutableStateListOf() val todos: List = mutableTodos diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt similarity index 91% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt index 09bab17e..a6aa5786 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/TodoListIntent.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.mvi +package io.github.kitakkun.backintime.evaluation.mvi sealed interface TodoListIntent { data object ReloadTodoList : TodoListIntent diff --git a/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt new file mode 100644 index 00000000..c556f4fe --- /dev/null +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvi/architecture/Store.kt @@ -0,0 +1,3 @@ +package io.github.kitakkun.backintime.evaluation.mvi.architecture + +interface Store diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt similarity index 89% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt index dda4be58..8e1d0feb 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListPage.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.mvvm +package io.github.kitakkun.backintime.evaluation.mvvm import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier -import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog -import com.github.kitakkun.backintime.evaluation.ui.TodoList +import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog +import io.github.kitakkun.backintime.evaluation.ui.TodoList import org.koin.androidx.compose.koinViewModel @Composable diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt similarity index 88% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt index ee0fc7d1..737f3689 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/mvvm/MVVMTodoListViewModel.kt @@ -1,19 +1,19 @@ -package com.github.kitakkun.backintime.evaluation.mvvm +package io.github.kitakkun.backintime.evaluation.mvvm import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.evaluation.data.Todo -import com.github.kitakkun.backintime.evaluation.data.TodoDao +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.TodoDao import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @BackInTime class MVVMTodoListViewModel( - private val todoDao: TodoDao, + private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao, ) : ViewModel() { private val mutableTodos = mutableStateListOf() val todos: List = mutableTodos diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt similarity index 97% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt index baa2c0f4..0ecdd434 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/AddTodoDialog.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui +package io.github.kitakkun.backintime.evaluation.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt similarity index 96% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt index afe84330..cef60d5b 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/EditTodoDialog.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui +package io.github.kitakkun.backintime.evaluation.ui import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -27,7 +27,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import com.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.Todo @Composable fun EditTodoDialog( diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt similarity index 87% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt index 04c4a09a..d4e85a67 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoItemView.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui +package io.github.kitakkun.backintime.evaluation.ui import androidx.compose.foundation.layout.Row import androidx.compose.material3.Checkbox @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextDecoration -import com.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.Todo @Composable fun TodoItemView( diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoList.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoList.kt similarity index 90% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoList.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoList.kt index d0e03223..435aac55 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/TodoList.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/TodoList.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui +package io.github.kitakkun.backintime.evaluation.ui import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -7,7 +7,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.github.kitakkun.backintime.evaluation.data.Todo +import io.github.kitakkun.backintime.evaluation.data.Todo @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Color.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Color.kt similarity index 80% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Color.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Color.kt index 9014fa7b..e3db1a64 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Color.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui.theme +package io.github.kitakkun.backintime.evaluation.ui.theme import androidx.compose.ui.graphics.Color diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt similarity index 97% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt index e51b86a2..20c22051 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui.theme +package io.github.kitakkun.backintime.evaluation.ui.theme import android.app.Activity import android.os.Build diff --git a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Type.kt b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Type.kt similarity index 94% rename from backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Type.kt rename to backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Type.kt index f2345735..822d8069 100644 --- a/backintime-demo/app/src/main/kotlin/com/github/kitakkun/backintime/evaluation/ui/theme/Type.kt +++ b/backintime-demo/app/src/main/kotlin/io/github/kitakkun/backintime/evaluation/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.evaluation.ui.theme +package io.github.kitakkun.backintime.evaluation.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/backintime-flipper-plugin/src/BackInTimePlugin.tsx b/backintime-flipper-plugin/src/BackInTimePlugin.tsx index 89b8e9f2..d3f679fb 100644 --- a/backintime-flipper-plugin/src/BackInTimePlugin.tsx +++ b/backintime-flipper-plugin/src/BackInTimePlugin.tsx @@ -12,8 +12,8 @@ import {editAndEmitValueReducer} from "./view/page/edited_value_emitter/EditAndE import {AtomicPersistentState, initPersistentStateSlice, persistentStateReducer} from "./reducer/PersistentStateReducer"; import {rawLogInspectorReducer} from "./view/sidebar/raw_log_inspector/RawLogInspectorReducer"; import {backInTimeReducer} from "./view/page/backintime/BackInTimeReducer"; -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; export default (client: PluginClient) => { initPersistentStateSlice(generatePersistentStates()); diff --git a/backintime-flipper-plugin/src/__tests__/test.incomingEvents.tsx b/backintime-flipper-plugin/src/__tests__/test.incomingEvents.tsx index df727f21..e1c09620 100644 --- a/backintime-flipper-plugin/src/__tests__/test.incomingEvents.tsx +++ b/backintime-flipper-plugin/src/__tests__/test.incomingEvents.tsx @@ -4,9 +4,9 @@ import {InstanceInfo} from "../data/InstanceInfo"; import {AppState} from "../reducer/appReducer"; import {ClassInfo} from "../data/ClassInfo"; import {MethodCallInfo} from "../data/MethodCallInfo"; -import {com} from "backintime-websocket-event"; -import NotifyMethodCall = com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent.NotifyMethodCall; -import NotifyValueChange = com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent.NotifyValueChange; +import {io} from "backintime-websocket-event"; +import NotifyMethodCall = io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent.NotifyMethodCall; +import NotifyValueChange = io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent.NotifyValueChange; test(`register event`, () => { const {instance, sendEvent} = TestUtils.startPlugin(Plugin); diff --git a/backintime-flipper-plugin/src/events/FlipperIncomingEvents.tsx b/backintime-flipper-plugin/src/events/FlipperIncomingEvents.tsx index a6129f76..d025dc81 100644 --- a/backintime-flipper-plugin/src/events/FlipperIncomingEvents.tsx +++ b/backintime-flipper-plugin/src/events/FlipperIncomingEvents.tsx @@ -1,5 +1,5 @@ -import {com} from "backintime-websocket-event"; -import BackInTimeDebugServiceEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebugServiceEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; export type IncomingEvents = { register: BackInTimeDebugServiceEvent.RegisterInstance; diff --git a/backintime-flipper-plugin/src/events/FlipperOutgoingEvents.tsx b/backintime-flipper-plugin/src/events/FlipperOutgoingEvents.tsx index d01dcd25..92dd0298 100644 --- a/backintime-flipper-plugin/src/events/FlipperOutgoingEvents.tsx +++ b/backintime-flipper-plugin/src/events/FlipperOutgoingEvents.tsx @@ -1,6 +1,6 @@ -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; -import BackInTimeDebugServiceEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import BackInTimeDebugServiceEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; export type OutgoingEvents = { forceSetPropertyValue(event: BackInTimeDebuggerEvent.ForceSetPropertyValue): Promise; diff --git a/backintime-flipper-plugin/src/reducer/appReducer.tsx b/backintime-flipper-plugin/src/reducer/appReducer.tsx index 03f89a26..994b2972 100644 --- a/backintime-flipper-plugin/src/reducer/appReducer.tsx +++ b/backintime-flipper-plugin/src/reducer/appReducer.tsx @@ -3,9 +3,9 @@ import {ClassInfo} from "../data/ClassInfo"; import {InstanceInfo} from "../data/InstanceInfo"; import {MethodCallInfo} from "../data/MethodCallInfo"; import {DependencyInfo} from "../data/DependencyInfo"; -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; -import BackInTimeDebugServiceEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import BackInTimeDebugServiceEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent; export interface AppState { activeTabIndex: string; diff --git a/backintime-flipper-plugin/src/view/page/backintime/BackInTimeModalPage.tsx b/backintime-flipper-plugin/src/view/page/backintime/BackInTimeModalPage.tsx index 61ab180e..902d7e52 100644 --- a/backintime-flipper-plugin/src/view/page/backintime/BackInTimeModalPage.tsx +++ b/backintime-flipper-plugin/src/view/page/backintime/BackInTimeModalPage.tsx @@ -6,8 +6,8 @@ import {backInTimeStateSelector} from "./BackInTimeSelector"; import {MethodCallHistoryInfo} from "./HistoryInfo"; import {appActions} from "../../../reducer/appReducer"; import {backInTimeActions} from "./BackInTimeReducer"; -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; export function BackInTimeModalPage() { const state = useSelector(backInTimeStateSelector); diff --git a/backintime-flipper-plugin/src/view/page/edited_value_emitter/EditAndEmitValueModalPage.tsx b/backintime-flipper-plugin/src/view/page/edited_value_emitter/EditAndEmitValueModalPage.tsx index f47c5286..c1eee15e 100644 --- a/backintime-flipper-plugin/src/view/page/edited_value_emitter/EditAndEmitValueModalPage.tsx +++ b/backintime-flipper-plugin/src/view/page/edited_value_emitter/EditAndEmitValueModalPage.tsx @@ -4,8 +4,8 @@ import {EditAndEmitValueView} from "./EditAndEmitValueView"; import React from "react"; import {Modal} from "antd"; import {appActions} from "../../../reducer/appReducer"; -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; export function EditAndEmitValueModalPage() { const state = useSelector(editAndEmitValueStateSelector); diff --git a/backintime-flipper-plugin/src/view/page/instance_list/InstanceListPage.tsx b/backintime-flipper-plugin/src/view/page/instance_list/InstanceListPage.tsx index b5cedd7e..f4309856 100644 --- a/backintime-flipper-plugin/src/view/page/instance_list/InstanceListPage.tsx +++ b/backintime-flipper-plugin/src/view/page/instance_list/InstanceListPage.tsx @@ -7,8 +7,8 @@ import {appActions} from "../../../reducer/appReducer"; import {propertyInspectorActions} from "../../sidebar/property_inspector/propertyInspectorReducer"; import {backInTimeActions} from "../backintime/BackInTimeReducer"; import {BackInTimeModalPage} from "../backintime/BackInTimeModalPage"; -import {com} from "backintime-websocket-event"; -import createCheckInstanceAliveEvent = com.github.kitakkun.backintime.websocket.event.createCheckInstanceAliveEvent; +import {io} from "backintime-websocket-event"; +import createCheckInstanceAliveEvent = io.github.kitakkun.backintime.websocket.event.createCheckInstanceAliveEvent; export function InstanceListPage() { const state = useSelector(selectInstanceList); diff --git a/backintime-flipper-plugin/src/view/page/value_emit/ValueEmitModalPage.tsx b/backintime-flipper-plugin/src/view/page/value_emit/ValueEmitModalPage.tsx index 07c5cd3c..3fa3af3f 100644 --- a/backintime-flipper-plugin/src/view/page/value_emit/ValueEmitModalPage.tsx +++ b/backintime-flipper-plugin/src/view/page/value_emit/ValueEmitModalPage.tsx @@ -6,8 +6,8 @@ import {Modal} from "antd"; import {editAndEmitValueActions} from "../edited_value_emitter/EditAndEmitValueReducer"; import {appActions} from "../../../reducer/appReducer"; import {EditAndEmitValueModalPage} from "../edited_value_emitter/EditAndEmitValueModalPage"; -import {com} from "backintime-websocket-event"; -import BackInTimeDebuggerEvent = com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; +import {io} from "backintime-websocket-event"; +import BackInTimeDebuggerEvent = io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent; export function ValueEmitModalPage() { const state = useSelector(valueEmitStateSelector); diff --git a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt b/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt deleted file mode 100644 index e9347798..00000000 --- a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.kitakkun.backintime.plugin - -object BackInTimePluginConsts { - const val PLUGIN_ID = "com.github.kitakkun.backintime" -} diff --git a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt similarity index 74% rename from backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt rename to backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt index 71c030f1..1bee8e15 100644 --- a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt +++ b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimeCompilerOptionKey.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.plugin +package io.github.kitakkun.backintime.plugin object BackInTimeCompilerOptionKey { const val ENABLED = "enabled" diff --git a/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt new file mode 100644 index 00000000..4c912be7 --- /dev/null +++ b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/BackInTimePluginConsts.kt @@ -0,0 +1,5 @@ +package io.github.kitakkun.backintime.plugin + +object BackInTimePluginConsts { + const val PLUGIN_ID = "io.github.kitakkun.backintime" +} diff --git a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt similarity index 86% rename from backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt rename to backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt index 94e2022d..72840ccf 100644 --- a/backintime-plugin/common/src/main/kotlin/com/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt +++ b/backintime-plugin/common/src/main/kotlin/io/github/kitakkun/backintime/plugin/extension/ValueContainerConfig.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.plugin.extension +package io.github.kitakkun.backintime.plugin.extension import kotlinx.serialization.Serializable diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt b/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt deleted file mode 100644 index 3d7f66da..00000000 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.kitakkun.backintime.compiler.configuration - -import com.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo - -data class BackInTimeCompilerConfiguration( - val enabled: Boolean, - val valueContainers: List, -) diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt b/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt deleted file mode 100644 index 3b5ee221..00000000 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.kitakkun.backintime.compiler.consts - -import org.jetbrains.kotlin.javac.resolve.classId -import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName - -object BackInTimeAnnotations { - val backInTimeAnnotationFqName = FqName("com.github.kitakkun.backintime.annotations.BackInTime") - val backInTimeAnnotationClassId = ClassId.topLevel(backInTimeAnnotationFqName) - - val valueContainerAnnotationFqName = FqName("com.github.kitakkun.backintime.annotations.ValueContainer") - val captureAnnotationFqName = FqName("com.github.kitakkun.backintime.annotations.Capture") - val getterAnnotationFqName = FqName("com.github.kitakkun.backintime.annotations.Getter") - val setterAnnotationFqName = FqName("com.github.kitakkun.backintime.annotations.Setter") - - val valueContainerAnnotationClassId = ClassId.topLevel(valueContainerAnnotationFqName) - val captureAnnotationClassId = ClassId.topLevel(captureAnnotationFqName) - val getterAnnotationClassId = ClassId.topLevel(getterAnnotationFqName) - val setterAnnotationClassId = ClassId.topLevel(setterAnnotationFqName) - val serializableItSelfAnnotationClassId = classId("com.github.kitakkun.backintime.annotations", "SerializableItself") -} diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt b/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt deleted file mode 100644 index baa03b84..00000000 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.kitakkun.backintime.compiler.fir - -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration -import com.github.kitakkun.backintime.compiler.fir.checkers.BackInTimeFirAdditionalCheckersExtension -import com.github.kitakkun.backintime.compiler.fir.extension.BackInTimeCompilerConfigurationProvider -import com.github.kitakkun.backintime.compiler.fir.extension.BackInTimeFirDeclarationGenerationExtension -import com.github.kitakkun.backintime.compiler.fir.extension.BackInTimeFirSupertypeGenerationExtension -import com.github.kitakkun.backintime.compiler.fir.matcher.DebuggableStateHolderPredicateMatcher -import com.github.kitakkun.backintime.compiler.fir.matcher.ValueContainerPredicateMatcher -import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar - -class BackInTimeFirExtensionRegistrar( - private val config: BackInTimeCompilerConfiguration, -) : FirExtensionRegistrar() { - override fun ExtensionRegistrarContext.configurePlugin() { - +::BackInTimeFirSupertypeGenerationExtension - +::BackInTimeFirDeclarationGenerationExtension - - +::DebuggableStateHolderPredicateMatcher - +::ValueContainerPredicateMatcher - - +::BackInTimeFirAdditionalCheckersExtension - +BackInTimeCompilerConfigurationProvider.getFactory(config) - } -} diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt similarity index 84% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt index e6716626..78132abd 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCommandLineProcessor.kt @@ -1,10 +1,10 @@ -package com.github.kitakkun.backintime.compiler +package io.github.kitakkun.backintime.compiler -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfigurationKey -import com.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey -import com.github.kitakkun.backintime.plugin.BackInTimePluginConsts -import com.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import com.google.auto.service.AutoService +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfigurationKey +import io.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey +import io.github.kitakkun.backintime.plugin.BackInTimePluginConsts +import io.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import kotlinx.serialization.json.Json import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption import org.jetbrains.kotlin.compiler.plugin.CliOption diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt similarity index 76% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt index 065647b3..20d9c55c 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/BackInTimeCompilerRegistrar.kt @@ -1,10 +1,10 @@ -package com.github.kitakkun.backintime.compiler +package io.github.kitakkun.backintime.compiler -import com.github.kitakkun.backintime.compiler.backend.BackInTimeIrGenerationExtension -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfigurationProcessor -import com.github.kitakkun.backintime.compiler.fir.BackInTimeFirExtensionRegistrar -import com.github.kitakkun.backintime.compiler.util.MessageCollectorHolder import com.google.auto.service.AutoService +import io.github.kitakkun.backintime.compiler.backend.BackInTimeIrGenerationExtension +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfigurationProcessor +import io.github.kitakkun.backintime.compiler.fir.BackInTimeFirExtensionRegistrar +import io.github.kitakkun.backintime.compiler.util.MessageCollectorHolder import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt similarity index 61% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt index 5b84fd72..26529c17 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimeIrGenerationExtension.kt @@ -1,10 +1,10 @@ -package com.github.kitakkun.backintime.compiler.backend +package io.github.kitakkun.backintime.compiler.backend -import com.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer -import com.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableCaptureMethodInvocationTransformer -import com.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableConstructorTransformer -import com.github.kitakkun.backintime.compiler.backend.transformer.implement.BackInTimeDebuggableImplementTransformer -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration +import io.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer +import io.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableCaptureMethodInvocationTransformer +import io.github.kitakkun.backintime.compiler.backend.transformer.capture.BackInTimeDebuggableConstructorTransformer +import io.github.kitakkun.backintime.compiler.backend.transformer.implement.BackInTimeDebuggableImplementTransformer +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.ir.declarations.IrModuleFragment diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt similarity index 87% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt index 097bb264..273f8fc2 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/BackInTimePluginContext.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.compiler.backend +package io.github.kitakkun.backintime.compiler.backend -import com.github.kitakkun.backintime.compiler.backend.analyzer.UserDefinedValueContainerAnalyzer -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.backend.analyzer.UserDefinedValueContainerAnalyzer +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.jvm.ir.isReifiable import org.jetbrains.kotlin.ir.declarations.IrModuleFragment @@ -20,7 +20,7 @@ class BackInTimePluginContext( val pluginContext: IrPluginContext = baseContext val valueContainerClassInfoList: List = config.valueContainers + UserDefinedValueContainerAnalyzer.analyzeAdditionalValueContainerClassInfo(moduleFragment) - private val internalCompilerApiPackageFqName = FqName("com.github.kitakkun.backintime.runtime.internal") + private val internalCompilerApiPackageFqName = FqName("io.github.kitakkun.backintime.runtime.internal") // event report functions val reportInstanceRegistrationFunctionSymbol = referenceFunctions(CallableId(internalCompilerApiPackageFqName, Name.identifier("reportInstanceRegistration"))).first() @@ -36,7 +36,7 @@ class BackInTimePluginContext( val captureThenReturnValueFunctionSymbol = referenceFunctions(CallableId(internalCompilerApiPackageFqName, Name.identifier("captureThenReturnValue"))).first() /** - * Used in [com.github.kitakkun.backintime.compiler.backend.transformer.BackInTimeDebuggableConstructorTransformer] + * Used in [io.github.kitakkun.backintime.compiler.backend.transformer.BackInTimeDebuggableConstructorTransformer] */ val propertyInfoClass = referenceClass(BackInTimeConsts.propertyInfoClassId)!! val propertyInfoClassConstructor = propertyInfoClass.constructors.first { it.owner.isPrimary } diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt similarity index 86% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt index 2fd3f889..57380878 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/ValueContainerClassInfo.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.backend +package io.github.kitakkun.backintime.compiler.backend import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt similarity index 93% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt index e0966635..eff49937 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/UserDefinedValueContainerAnalyzer.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.compiler.backend.analyzer +package io.github.kitakkun.backintime.compiler.backend.analyzer -import com.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrModuleFragment @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull class UserDefinedValueContainerAnalyzer private constructor() : IrElementVisitorVoid { companion object { fun analyzeAdditionalValueContainerClassInfo(moduleFragment: IrModuleFragment): List { - with(UserDefinedValueContainerAnalyzer()) { + with(io.github.kitakkun.backintime.compiler.backend.analyzer.UserDefinedValueContainerAnalyzer()) { moduleFragment.acceptChildrenVoid(this) return collectedInfoList } diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt similarity index 86% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt index 7b32b932..64c5992e 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/analyzer/ValueContainerStateChangeInsideFunctionAnalyzer.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.compiler.backend.analyzer +package io.github.kitakkun.backintime.compiler.backend.analyzer -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.getCorrespondingProperty -import com.github.kitakkun.backintime.compiler.backend.utils.isValueContainerSetterCall -import com.github.kitakkun.backintime.compiler.backend.utils.receiver +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.getCorrespondingProperty +import io.github.kitakkun.backintime.compiler.backend.utils.isValueContainerSetterCall +import io.github.kitakkun.backintime.compiler.backend.utils.receiver import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrProperty import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt similarity index 89% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt index bd69b431..bbf09b84 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureLazyDebuggablePropertyAccessTransformer.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.capture +package io.github.kitakkun.backintime.compiler.backend.transformer.capture -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable -import com.github.kitakkun.backintime.compiler.backend.utils.receiver -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable +import io.github.kitakkun.backintime.compiler.backend.utils.receiver +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.irComposite diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt similarity index 84% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt index 03417e86..919f8e3d 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableCaptureMethodInvocationTransformer.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.capture +package io.github.kitakkun.backintime.compiler.backend.transformer.capture -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.generateUUIDVariable -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeGenerated +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.generateUUIDVariable +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeGenerated import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.irCall diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt similarity index 88% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt index 2a617108..02b51e20 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/BackInTimeDebuggableConstructorTransformer.kt @@ -1,11 +1,11 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.capture +package io.github.kitakkun.backintime.compiler.backend.transformer.capture -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.getCompletedName -import com.github.kitakkun.backintime.compiler.backend.utils.getGenericTypes -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.getCompletedName +import io.github.kitakkun.backintime.compiler.backend.utils.getGenericTypes +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope @@ -63,7 +63,7 @@ class BackInTimeDebuggableConstructorTransformer : IrElementTransformerVoid() { return declaration } - /** see [com.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent.RegisterTarget] */ + /** see [io.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent.RegisterTarget] */ private fun IrBuilderWithScope.generateRegisterCall(parentClass: IrClass) = irCall(reportInstanceRegistrationFunctionSymbol).apply { putValueArgument(0, irGet(parentClass.thisReceiver!!)) putValueArgument(1, irString(parentClass.fqNameWhenAvailable?.asString() ?: "unknown")) diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt similarity index 86% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt index 1da21d51..69fa0462 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/CaptureValueChangeTransformer.kt @@ -1,14 +1,14 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.capture - -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.analyzer.ValueContainerStateChangeInsideFunctionAnalyzer -import com.github.kitakkun.backintime.compiler.backend.utils.generateCaptureValueCallForValueContainer -import com.github.kitakkun.backintime.compiler.backend.utils.getCorrespondingProperty -import com.github.kitakkun.backintime.compiler.backend.utils.getRelevantLambdaExpressions -import com.github.kitakkun.backintime.compiler.backend.utils.isIndirectValueContainerSetterCall -import com.github.kitakkun.backintime.compiler.backend.utils.isLambdaFunctionRelevantCall -import com.github.kitakkun.backintime.compiler.backend.utils.isValueContainerSetterCall -import com.github.kitakkun.backintime.compiler.backend.utils.receiver +package io.github.kitakkun.backintime.compiler.backend.transformer.capture + +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.analyzer.ValueContainerStateChangeInsideFunctionAnalyzer +import io.github.kitakkun.backintime.compiler.backend.utils.generateCaptureValueCallForValueContainer +import io.github.kitakkun.backintime.compiler.backend.utils.getCorrespondingProperty +import io.github.kitakkun.backintime.compiler.backend.utils.getRelevantLambdaExpressions +import io.github.kitakkun.backintime.compiler.backend.utils.isIndirectValueContainerSetterCall +import io.github.kitakkun.backintime.compiler.backend.utils.isLambdaFunctionRelevantCall +import io.github.kitakkun.backintime.compiler.backend.utils.isValueContainerSetterCall +import io.github.kitakkun.backintime.compiler.backend.utils.receiver import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.jvm.ir.receiverAndArgs import org.jetbrains.kotlin.ir.backend.js.utils.valueArguments diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt similarity index 89% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt index 34931aa2..ace73880 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/capture/LambdaArgumentBodyTransformer.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.capture +package io.github.kitakkun.backintime.compiler.backend.transformer.capture -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.generateCaptureValueCallForValueContainer -import com.github.kitakkun.backintime.compiler.backend.utils.receiver +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.generateCaptureValueCallForValueContainer +import io.github.kitakkun.backintime.compiler.backend.utils.receiver import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.builders.irCall diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt similarity index 93% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt index 6ce95b79..338d28cc 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/transformer/implement/BackInTimeDebuggableImplementTransformer.kt @@ -1,11 +1,11 @@ -package com.github.kitakkun.backintime.compiler.backend.transformer.implement +package io.github.kitakkun.backintime.compiler.backend.transformer.implement -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.utils.irPropertySetterCall -import com.github.kitakkun.backintime.compiler.backend.utils.irValueContainerPropertySetterCall -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable -import com.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeGenerated -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.utils.irPropertySetterCall +import io.github.kitakkun.backintime.compiler.backend.utils.irValueContainerPropertySetterCall +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeDebuggable +import io.github.kitakkun.backintime.compiler.backend.utils.isBackInTimeGenerated +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope @@ -74,7 +74,7 @@ class BackInTimeDebuggableImplementTransformer : IrElementTransformerVoid() { } /** - * generate body for [com.github.kitakkun.backintime.runtime.BackInTimeDebuggable.forceSetValue]: + * generate body for [io.github.kitakkun.backintime.runtime.BackInTimeDebuggable.forceSetValue]: * ```kotlin * fun forceSetValue(propertyOwnerClassFqName: String, propertyName: String, value: Any?) { * if (ownerClassFqName == "com.example.MyClass") { @@ -146,7 +146,7 @@ class BackInTimeDebuggableImplementTransformer : IrElementTransformerVoid() { } /** - * generate body for [com.github.kitakkun.backintime.runtime.BackInTimeDebuggable.serializeValue]: + * generate body for [io.github.kitakkun.backintime.runtime.BackInTimeDebuggable.serializeValue]: * ```kotlin * override fun serializeValue(propertyOwnerClassFqName: String, propertyName: String, value: Any?): String = * if (ownerClassFqName == "com.example.MyClass") { @@ -220,7 +220,7 @@ class BackInTimeDebuggableImplementTransformer : IrElementTransformerVoid() { } /** - * generate body for [com.github.kitakkun.backintime.runtime.BackInTimeDebuggable.deserializeValue]: + * generate body for [io.github.kitakkun.backintime.runtime.BackInTimeDebuggable.deserializeValue]: * ```kotlin * override fun deserializeValue(propertyOwnerClassFqName: String, propertyName: String, value: Any?): String = * if (ownerClassFqName == "com.example.MyClass") { @@ -348,7 +348,7 @@ class BackInTimeDebuggableImplementTransformer : IrElementTransformerVoid() { } /** - * add a backing field for the [com.github.kitakkun.backintime.runtime.BackInTimeDebuggable.backInTimeInstanceUUID] property + * add a backing field for the [io.github.kitakkun.backintime.runtime.BackInTimeDebuggable.backInTimeInstanceUUID] property */ private fun IrProperty.addBackingFieldOfBackInTimeUUID() { val irBuilder = irBuiltIns.createIrBuilder(symbol) @@ -362,7 +362,7 @@ class BackInTimeDebuggableImplementTransformer : IrElementTransformerVoid() { } /** - * add a backing field for the [com.github.kitakkun.backintime.runtime.BackInTimeDebuggable.backInTimeInitializedPropertyMap] property + * add a backing field for the [io.github.kitakkun.backintime.runtime.BackInTimeDebuggable.backInTimeInitializedPropertyMap] property */ private fun IrProperty.addBackingFieldOfBackInTimeInitializedPropertyMap() { val irBuilder = irBuiltIns.createIrBuilder(symbol) diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt similarity index 95% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt index df062933..ae6d5b13 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackInTimeIrGenerateUtils.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.irGet diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt similarity index 87% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt index f87251e9..6d3fb440 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/BackendUtils.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts -import com.github.kitakkun.backintime.compiler.consts.BackInTimePluginKey +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.consts.BackInTimePluginKey import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.parent diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt similarity index 94% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt index 7973bd3d..79c6cef2 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrBuilderUtils.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils -import com.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo +import io.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope import org.jetbrains.kotlin.ir.builders.irCall diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt similarity index 88% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt index 6f235837..d9f256dd 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrCallUtils.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils -import com.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext -import com.github.kitakkun.backintime.compiler.backend.analyzer.ValueContainerStateChangeInsideFunctionAnalyzer +import io.github.kitakkun.backintime.compiler.backend.BackInTimePluginContext +import io.github.kitakkun.backintime.compiler.backend.analyzer.ValueContainerStateChangeInsideFunctionAnalyzer import org.jetbrains.kotlin.backend.jvm.ir.receiverAndArgs import org.jetbrains.kotlin.ir.declarations.IrVariable import org.jetbrains.kotlin.ir.expressions.IrCall diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt similarity index 92% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt index 7ce3445b..f3b91059 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrClassUtils.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt similarity index 90% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt index a79cf9a1..5dae3f09 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrExpressionUtils.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils import org.jetbrains.kotlin.ir.declarations.IrProperty import org.jetbrains.kotlin.ir.declarations.IrVariable diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt similarity index 92% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt index cc824f45..14b588cc 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/backend/utils/IrTypeUtils.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.backend.utils +package io.github.kitakkun.backintime.compiler.backend.utils import org.jetbrains.kotlin.ir.types.IrSimpleType import org.jetbrains.kotlin.ir.types.IrType diff --git a/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt new file mode 100644 index 00000000..7e830c55 --- /dev/null +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfiguration.kt @@ -0,0 +1,8 @@ +package io.github.kitakkun.backintime.compiler.configuration + +import io.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo + +data class BackInTimeCompilerConfiguration( + val enabled: Boolean, + val valueContainers: List, +) diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt similarity index 61% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt index d5e64ddf..d37dbad6 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationKey.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.compiler.configuration +package io.github.kitakkun.backintime.compiler.configuration -import com.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey -import com.github.kitakkun.backintime.plugin.extension.ValueContainerConfig +import io.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey +import io.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import org.jetbrains.kotlin.config.CompilerConfigurationKey object BackInTimeCompilerConfigurationKey { diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt similarity index 89% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt index e2adcf59..b2d77a87 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/configuration/BackInTimeCompilerConfigurationProcessor.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.configuration +package io.github.kitakkun.backintime.compiler.configuration -import com.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo +import io.github.kitakkun.backintime.compiler.backend.ValueContainerClassInfo import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name diff --git a/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt new file mode 100644 index 00000000..dea5d5f2 --- /dev/null +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeAnnotations.kt @@ -0,0 +1,21 @@ +package io.github.kitakkun.backintime.compiler.consts + +import org.jetbrains.kotlin.javac.resolve.classId +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqName + +object BackInTimeAnnotations { + val backInTimeAnnotationFqName = FqName("io.github.kitakkun.backintime.annotations.BackInTime") + val backInTimeAnnotationClassId = ClassId.topLevel(backInTimeAnnotationFqName) + + val valueContainerAnnotationFqName = FqName("io.github.kitakkun.backintime.annotations.ValueContainer") + val captureAnnotationFqName = FqName("io.github.kitakkun.backintime.annotations.Capture") + val getterAnnotationFqName = FqName("io.github.kitakkun.backintime.annotations.Getter") + val setterAnnotationFqName = FqName("io.github.kitakkun.backintime.annotations.Setter") + + val valueContainerAnnotationClassId = ClassId.topLevel(valueContainerAnnotationFqName) + val captureAnnotationClassId = ClassId.topLevel(captureAnnotationFqName) + val getterAnnotationClassId = ClassId.topLevel(getterAnnotationFqName) + val setterAnnotationClassId = ClassId.topLevel(setterAnnotationFqName) + val serializableItSelfAnnotationClassId = classId("io.github.kitakkun.backintime.annotations", "SerializableItself") +} diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt similarity index 74% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt index c9e3c2c4..cf3c66e8 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimeConsts.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.consts +package io.github.kitakkun.backintime.compiler.consts import org.jetbrains.kotlin.javac.resolve.classId import org.jetbrains.kotlin.name.CallableId @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name object BackInTimeConsts { - val backInTimeDebuggableInterfaceClassId = classId("com.github.kitakkun.backintime.runtime", "BackInTimeDebuggable") + val backInTimeDebuggableInterfaceClassId = classId("io.github.kitakkun.backintime.runtime", "BackInTimeDebuggable") val backInTimeDebuggableInterfaceClassFqName = backInTimeDebuggableInterfaceClassId.asSingleFqName() val serializeMethodName = Name.identifier("serializeValue") @@ -15,13 +15,13 @@ object BackInTimeConsts { val backInTimeInstanceUUIDName = Name.identifier("backInTimeInstanceUUID") val backInTimeInitializedPropertyMapName = Name.identifier("backInTimeInitializedPropertyMap") - val propertyInfoClassId = classId("com.github.kitakkun.backintime.websocket.event.model", "PropertyInfo") + val propertyInfoClassId = classId("io.github.kitakkun.backintime.websocket.event.model", "PropertyInfo") val listOfFunctionId = CallableId(FqName("kotlin.collections"), Name.identifier("listOf")) val UUIDClassId = classId("java.util", "UUID") const val RANDOM_UUID_FUNCTION_NAME = "randomUUID" // kotlinx.serialization - val backInTimeJsonCallableId = CallableId(FqName("com.github.kitakkun.backintime.runtime"), Name.identifier("backInTimeJson")) + val backInTimeJsonCallableId = CallableId(FqName("io.github.kitakkun.backintime.runtime"), Name.identifier("backInTimeJson")) val kotlinxSerializationEncodeToStringCallableId = CallableId(FqName("kotlinx.serialization"), Name.identifier("encodeToString")) val kotlinxSerializationDecodeFromStringCallableId = CallableId(FqName("kotlinx.serialization"), Name.identifier("decodeFromString")) } diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt similarity index 66% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt index 159e8a36..fbc5c6ba 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/consts/BackInTimePluginKey.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.consts +package io.github.kitakkun.backintime.compiler.consts import org.jetbrains.kotlin.GeneratedDeclarationKey diff --git a/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt new file mode 100644 index 00000000..8472cd0e --- /dev/null +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/BackInTimeFirExtensionRegistrar.kt @@ -0,0 +1,25 @@ +package io.github.kitakkun.backintime.compiler.fir + +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration +import io.github.kitakkun.backintime.compiler.fir.checkers.BackInTimeFirAdditionalCheckersExtension +import io.github.kitakkun.backintime.compiler.fir.extension.BackInTimeCompilerConfigurationProvider +import io.github.kitakkun.backintime.compiler.fir.extension.BackInTimeFirDeclarationGenerationExtension +import io.github.kitakkun.backintime.compiler.fir.extension.BackInTimeFirSupertypeGenerationExtension +import io.github.kitakkun.backintime.compiler.fir.matcher.DebuggableStateHolderPredicateMatcher +import io.github.kitakkun.backintime.compiler.fir.matcher.ValueContainerPredicateMatcher +import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar + +class BackInTimeFirExtensionRegistrar( + private val config: BackInTimeCompilerConfiguration, +) : FirExtensionRegistrar() { + override fun ExtensionRegistrarContext.configurePlugin() { + +::BackInTimeFirSupertypeGenerationExtension + +::BackInTimeFirDeclarationGenerationExtension + + +::DebuggableStateHolderPredicateMatcher + +::ValueContainerPredicateMatcher + + +::BackInTimeFirAdditionalCheckersExtension + +BackInTimeCompilerConfigurationProvider.getFactory(config) + } +} diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt similarity index 91% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt index f5555102..3851ba63 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/BackInTimeFirAdditionalCheckersExtension.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.fir.checkers +package io.github.kitakkun.backintime.compiler.fir.checkers import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.declaration.DeclarationCheckers diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt similarity index 93% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt index 1c94ac89..0297f606 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/DebuggableStateHolderPropertyChecker.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.compiler.fir.checkers +package io.github.kitakkun.backintime.compiler.fir.checkers -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations -import com.github.kitakkun.backintime.compiler.fir.extension.backInTimeCompilerConfigurationProvider -import com.github.kitakkun.backintime.compiler.fir.matcher.debuggableStateHolderPredicateMatcher -import com.github.kitakkun.backintime.compiler.fir.matcher.valueContainerPredicateMatcher +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.fir.extension.backInTimeCompilerConfigurationProvider +import io.github.kitakkun.backintime.compiler.fir.matcher.debuggableStateHolderPredicateMatcher +import io.github.kitakkun.backintime.compiler.fir.matcher.valueContainerPredicateMatcher import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt similarity index 92% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt index a0f2057c..dd8f2b12 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/FirBackInTimeErrors.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.fir.checkers +package io.github.kitakkun.backintime.compiler.fir.checkers import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory import org.jetbrains.kotlin.diagnostics.warning0 diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt similarity index 97% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt index e3a1af41..23950de3 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/KtDefaultErrorMessagesBackInTime.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.fir.checkers +package io.github.kitakkun.backintime.compiler.fir.checkers import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt similarity index 94% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt index 197af426..71640c35 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/checkers/ValueContainerDefinitionChecker.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.fir.checkers +package io.github.kitakkun.backintime.compiler.fir.checkers -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt similarity index 79% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt index 68aee1ca..1d27c656 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeCompilerConfigurationProvider.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.fir.extension +package io.github.kitakkun.backintime.compiler.fir.extension -import com.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration +import io.github.kitakkun.backintime.compiler.configuration.BackInTimeCompilerConfiguration import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.FirExtensionSessionComponent diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt similarity index 93% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt index 3c95e1bb..087c5868 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirDeclarationGenerationExtension.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.compiler.fir.extension +package io.github.kitakkun.backintime.compiler.fir.extension -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts -import com.github.kitakkun.backintime.compiler.consts.BackInTimePluginKey -import com.github.kitakkun.backintime.compiler.fir.matcher.debuggableStateHolderPredicateMatcher +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.consts.BackInTimePluginKey +import io.github.kitakkun.backintime.compiler.fir.matcher.debuggableStateHolderPredicateMatcher import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.FirDeclarationGenerationExtension diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt similarity index 84% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt index cbb8f1e4..eb1c774a 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/extension/BackInTimeFirSupertypeGenerationExtension.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.compiler.fir.extension +package io.github.kitakkun.backintime.compiler.fir.extension -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations -import com.github.kitakkun.backintime.compiler.consts.BackInTimeConsts +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.consts.BackInTimeConsts import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.hasAnnotationSafe diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt similarity index 81% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt index efb4b00f..ee06e1e2 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/DebuggableStateHolderPredicateMatcher.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.fir.matcher +package io.github.kitakkun.backintime.compiler.fir.matcher -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate import org.jetbrains.kotlin.fir.extensions.utils.AbstractSimpleClassPredicateMatchingService diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt similarity index 81% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt index c9dae7e6..8e555b58 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/fir/matcher/ValueContainerPredicateMatcher.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.compiler.fir.matcher +package io.github.kitakkun.backintime.compiler.fir.matcher -import com.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations +import io.github.kitakkun.backintime.compiler.consts.BackInTimeAnnotations import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate import org.jetbrains.kotlin.fir.extensions.utils.AbstractSimpleClassPredicateMatchingService diff --git a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt similarity index 90% rename from backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt rename to backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt index 1a30eb47..4531b53f 100644 --- a/backintime-plugin/compiler/src/main/kotlin/com/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt +++ b/backintime-plugin/compiler/src/main/kotlin/io/github/kitakkun/backintime/compiler/util/MessageCollectorHolder.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.compiler.util +package io.github.kitakkun.backintime.compiler.util import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector diff --git a/backintime-plugin/gradle/build.gradle.kts b/backintime-plugin/gradle/build.gradle.kts index de51eb99..80032fde 100644 --- a/backintime-plugin/gradle/build.gradle.kts +++ b/backintime-plugin/gradle/build.gradle.kts @@ -9,8 +9,8 @@ plugins { gradlePlugin { plugins { create("backInTime") { - id = "com.github.kitakkun.backintime" - implementationClass = "com.github.kitakkun.backintime.BackInTimePlugin" + id = "io.github.kitakkun.backintime" + implementationClass = "io.github.kitakkun.backintime.BackInTimePlugin" } } } diff --git a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/BackInTimePlugin.kt b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/BackInTimePlugin.kt similarity index 83% rename from backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/BackInTimePlugin.kt rename to backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/BackInTimePlugin.kt index d78649f7..0553e1f3 100644 --- a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/BackInTimePlugin.kt +++ b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/BackInTimePlugin.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime +package io.github.kitakkun.backintime -import com.github.kitakkun.backintime.extension.BackInTimeExtension -import com.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey -import com.github.kitakkun.backintime.plugin.BackInTimePluginConsts +import io.github.kitakkun.backintime.extension.BackInTimeExtension +import io.github.kitakkun.backintime.plugin.BackInTimeCompilerOptionKey +import io.github.kitakkun.backintime.plugin.BackInTimePluginConsts import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.gradle.api.Project @@ -26,9 +26,9 @@ class BackInTimePlugin : KotlinCompilerPluginSupportPlugin { // FIXME: can get a version of back-in-time plugin from some reliable source? val version = "1.0.0" - val annotationDependencyNotation = "com.github.kitakkun.backintime:backintime-annotations:$version" - val runtimeDependencyNotation = "com.github.kitakkun.backintime:backintime-runtime:$version" - val eventDependencyNotation = "com.github.kitakkun.backintime:backintime-websocket-event:$version" + val annotationDependencyNotation = "io.github.kitakkun.backintime:backintime-annotations:$version" + val runtimeDependencyNotation = "io.github.kitakkun.backintime:backintime-runtime:$version" + val eventDependencyNotation = "io.github.kitakkun.backintime:backintime-websocket-event:$version" when (kotlinExtension) { is KotlinSingleTargetExtension<*> -> { @@ -79,7 +79,7 @@ class BackInTimePlugin : KotlinCompilerPluginSupportPlugin { override fun getPluginArtifact(): SubpluginArtifact { return SubpluginArtifact( - groupId = "com.github.kitakkun.backintime", + groupId = "io.github.kitakkun.backintime", artifactId = "backintime-compiler", version = "1.0.0", ) diff --git a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/BackInTimeExtension.kt b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/BackInTimeExtension.kt similarity index 84% rename from backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/BackInTimeExtension.kt rename to backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/BackInTimeExtension.kt index 511f9b89..e7ff2b2d 100644 --- a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/BackInTimeExtension.kt +++ b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/BackInTimeExtension.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.extension +package io.github.kitakkun.backintime.extension -import com.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import groovy.lang.Closure +import io.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import kotlinx.serialization.Serializable @Serializable diff --git a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/ValueContainersScope.kt b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/ValueContainersScope.kt similarity index 97% rename from backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/ValueContainersScope.kt rename to backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/ValueContainersScope.kt index 70239fa3..c90d3a55 100644 --- a/backintime-plugin/gradle/src/main/kotlin/com/github/kitakkun/backintime/extension/ValueContainersScope.kt +++ b/backintime-plugin/gradle/src/main/kotlin/io/github/kitakkun/backintime/extension/ValueContainersScope.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.extension +package io.github.kitakkun.backintime.extension -import com.github.kitakkun.backintime.plugin.extension.ValueContainerConfig import groovy.lang.Closure +import io.github.kitakkun.backintime.plugin.extension.ValueContainerConfig class ValueContainersScope { var containers: MutableList = mutableListOf() diff --git a/backintime-runtime/build.gradle.kts b/backintime-runtime/build.gradle.kts index ed869a14..e6df9016 100644 --- a/backintime-runtime/build.gradle.kts +++ b/backintime-runtime/build.gradle.kts @@ -33,5 +33,5 @@ kotlin { android { compileSdk = 34 - namespace = "com.github.kitakkun.backintime.runtime" + namespace = "io.github.kitakkun.backintime.runtime" } diff --git a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.android.kt b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.android.kt similarity index 85% rename from backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.android.kt rename to backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.android.kt index 62c23d8a..bf0b0dea 100644 --- a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.android.kt +++ b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.android.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime class WeakReferenceImpl(value: T) : WeakReference { private val ref = java.lang.ref.WeakReference(value) diff --git a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt similarity index 84% rename from backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt rename to backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt index e98b91bb..1c525e83 100644 --- a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt +++ b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperConnector.kt @@ -1,11 +1,11 @@ -package com.github.kitakkun.backintime.runtime.flipper +package io.github.kitakkun.backintime.runtime.flipper import com.facebook.flipper.core.FlipperConnection import com.facebook.flipper.core.FlipperObject -import com.github.kitakkun.backintime.runtime.backInTimeJson -import com.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.runtime.backInTimeJson +import io.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow diff --git a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt similarity index 69% rename from backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt rename to backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt index aac5e62a..6767fb83 100644 --- a/backintime-runtime/src/androidMain/kotlin/com/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt +++ b/backintime-runtime/src/androidMain/kotlin/io/github/kitakkun/backintime/runtime/flipper/BackInTimeFlipperPlugin.kt @@ -1,10 +1,10 @@ -package com.github.kitakkun.backintime.runtime.flipper +package io.github.kitakkun.backintime.runtime.flipper import com.facebook.flipper.core.FlipperConnection import com.facebook.flipper.core.FlipperPlugin -import com.github.kitakkun.backintime.runtime.BackInTimeDebugService -import com.github.kitakkun.backintime.runtime.getBackInTimeDebugService -import com.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi +import io.github.kitakkun.backintime.runtime.BackInTimeDebugService +import io.github.kitakkun.backintime.runtime.getBackInTimeDebugService +import io.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi class BackInTimeFlipperPlugin : FlipperPlugin { @OptIn(BackInTimeCompilerInternalApi::class) diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt b/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt deleted file mode 100644 index b8470a3d..00000000 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.kitakkun.backintime.runtime - -import com.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector -import com.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent - -interface BackInTimeDebugService { - fun startService() - fun stopService() - fun setConnector(connector: BackInTimeWebSocketConnector) - fun processInstanceEvent(event: BackInTimeDebuggableInstanceEvent) - fun processDebuggerEvent(event: BackInTimeDebuggerEvent) -} diff --git a/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt new file mode 100644 index 00000000..f1fca2f0 --- /dev/null +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugService.kt @@ -0,0 +1,13 @@ +package io.github.kitakkun.backintime.runtime + +import io.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector +import io.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent + +interface BackInTimeDebugService { + fun startService() + fun stopService() + fun setConnector(connector: BackInTimeWebSocketConnector) + fun processInstanceEvent(event: BackInTimeDebuggableInstanceEvent) + fun processDebuggerEvent(event: BackInTimeDebuggerEvent) +} diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt similarity index 94% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt index e7fc2ffc..482e7681 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebugServiceImpl.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime -import com.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector -import com.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector +import io.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob @@ -92,7 +92,7 @@ class BackInTimeDebugServiceImpl( } /** - * process event from [com.github.kitakkun.backintime.websocket.server.BackInTimeWebSocketServer] + * process event from [io.github.kitakkun.backintime.websocket.server.BackInTimeWebSocketServer] * consume it and generate [BackInTimeDebugServiceEvent] */ override fun processDebuggerEvent(event: BackInTimeDebuggerEvent) { diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt similarity index 87% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt index ebe9faef..46ed62d2 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeDebuggable.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime -import com.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException +import io.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException import kotlinx.serialization.SerializationException interface BackInTimeDebuggable { diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt similarity index 93% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt index a19a33a2..47d604f5 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManager.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime /** * For back-in-time debugging, we need to have references to the debug-target instances. diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt similarity index 94% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt index 928ecd6f..be5c7d2f 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeInstanceManagerImpl.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime /** * The default implementation of [BackInTimeInstanceManager]. @@ -25,4 +25,4 @@ internal class BackInTimeInstanceManagerImpl : BackInTimeInstanceManager { .keys .forEach(mutableInstances::remove) } -} \ No newline at end of file +} diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeJson.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeJson.kt similarity index 87% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeJson.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeJson.kt index 6f943bcd..c9db36c9 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/BackInTimeJson.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/BackInTimeJson.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt similarity index 81% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt index 29ccb6ca..09846899 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/DefaultBackInTimeDebugService.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime -import com.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi +import io.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.kt similarity index 72% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.kt index 6478571e..8fccc84e 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime expect fun weakReferenceOf(value: T): WeakReference diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt similarity index 83% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt index e948df1d..f1aeeee1 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeKtorWebSocketConnector.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.runtime.connector +package io.github.kitakkun.backintime.runtime.connector -import com.github.kitakkun.backintime.websocket.client.BackInTimeWebSocketClient -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.websocket.client.BackInTimeWebSocketClient +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession import io.ktor.websocket.Frame import io.ktor.websocket.close diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt similarity index 55% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt index 5c77e4f2..0e780b02 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketConnector.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.runtime.connector +package io.github.kitakkun.backintime.runtime.connector -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import kotlinx.coroutines.flow.Flow interface BackInTimeWebSocketConnector { diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt similarity index 91% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt index d7e0276f..569dab22 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/event/BackInTimeDebuggableInstanceEvent.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.runtime.event +package io.github.kitakkun.backintime.runtime.event -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.websocket.event.model.PropertyInfo +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.websocket.event.model.PropertyInfo /** * events inside the BackInTimeDebuggable instance diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt similarity index 88% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt index 753130fe..70efd556 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/exception/BackInTimeRuntimeException.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime.exception +package io.github.kitakkun.backintime.runtime.exception sealed class BackInTimeRuntimeException(message: String) : RuntimeException(message) { class NoSuchPropertyException(parentClassFqName: String, propertyName: String) : diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt similarity index 76% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt index ae11d298..205a200b 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/BackInTimeCompilerInternalApi.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime.internal +package io.github.kitakkun.backintime.runtime.internal @RequiresOptIn(message = "This is an internal API for back-in-time compiler. Do not use it directly.", level = RequiresOptIn.Level.ERROR) annotation class BackInTimeCompilerInternalApi diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt similarity index 81% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt index fe529c18..395e6121 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/CaptureUtils.kt @@ -1,8 +1,8 @@ @file:Suppress("UNUSED") -package com.github.kitakkun.backintime.runtime.internal +package io.github.kitakkun.backintime.runtime.internal -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable @BackInTimeCompilerInternalApi internal fun captureThenReturnValue( diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt similarity index 83% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt index c7fc6cd6..d24bf5de 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/EventReportUtils.kt @@ -1,11 +1,11 @@ @file:Suppress("UNUSED") -package com.github.kitakkun.backintime.runtime.internal +package io.github.kitakkun.backintime.runtime.internal -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent -import com.github.kitakkun.backintime.runtime.getBackInTimeDebugService -import com.github.kitakkun.backintime.websocket.event.model.PropertyInfo +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.runtime.event.BackInTimeDebuggableInstanceEvent +import io.github.kitakkun.backintime.runtime.getBackInTimeDebugService +import io.github.kitakkun.backintime.websocket.event.model.PropertyInfo @BackInTimeCompilerInternalApi internal fun reportInstanceRegistration( diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt similarity index 80% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt index edb86e48..5b8ac370 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/ThrowErrorUtils.kt @@ -1,8 +1,8 @@ @file:Suppress("UNUSED") -package com.github.kitakkun.backintime.runtime.internal +package io.github.kitakkun.backintime.runtime.internal -import com.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException +import io.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException @BackInTimeCompilerInternalApi internal fun throwTypeMismatchException( diff --git a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt similarity index 65% rename from backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt rename to backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt index d9a2546b..3422e882 100644 --- a/backintime-runtime/src/commonMain/kotlin/com/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt +++ b/backintime-runtime/src/commonMain/kotlin/io/github/kitakkun/backintime/runtime/internal/UUIDUtil.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime.internal +package io.github.kitakkun.backintime.runtime.internal import com.benasher44.uuid.uuid4 diff --git a/backintime-runtime/src/jvmMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.jvm.kt b/backintime-runtime/src/jvmMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.jvm.kt similarity index 85% rename from backintime-runtime/src/jvmMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.jvm.kt rename to backintime-runtime/src/jvmMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.jvm.kt index 62c23d8a..bf0b0dea 100644 --- a/backintime-runtime/src/jvmMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.jvm.kt +++ b/backintime-runtime/src/jvmMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.jvm.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime class WeakReferenceImpl(value: T) : WeakReference { private val ref = java.lang.ref.WeakReference(value) diff --git a/backintime-runtime/src/nativeMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.native.kt b/backintime-runtime/src/nativeMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.native.kt similarity index 88% rename from backintime-runtime/src/nativeMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.native.kt rename to backintime-runtime/src/nativeMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.native.kt index d255a267..61cbc43c 100644 --- a/backintime-runtime/src/nativeMain/kotlin/com/github/kitakkun/backintime/runtime/WeakReference.native.kt +++ b/backintime-runtime/src/nativeMain/kotlin/io/github/kitakkun/backintime/runtime/WeakReference.native.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.runtime +package io.github.kitakkun.backintime.runtime import kotlin.experimental.ExperimentalNativeApi diff --git a/backintime-websocket-client/build.gradle.kts b/backintime-websocket-client/build.gradle.kts index e0e122f3..96b5a907 100644 --- a/backintime-websocket-client/build.gradle.kts +++ b/backintime-websocket-client/build.gradle.kts @@ -32,6 +32,6 @@ kotlin { } android { - namespace = "com.github.kitakkun.backintime.websocket.client" + namespace = "io.github.kitakkun.backintime.websocket.client" compileSdk = 34 } diff --git a/backintime-websocket-client/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt b/backintime-websocket-client/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt similarity index 94% rename from backintime-websocket-client/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt rename to backintime-websocket-client/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt index ee87faec..ea7735f3 100644 --- a/backintime-websocket-client/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt +++ b/backintime-websocket-client/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.websocket.client +package io.github.kitakkun.backintime.websocket.client import io.ktor.client.HttpClient import io.ktor.client.engine.HttpClientEngine diff --git a/backintime-websocket-client/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt b/backintime-websocket-client/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt similarity index 95% rename from backintime-websocket-client/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt rename to backintime-websocket-client/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt index ddfa178e..438cb585 100644 --- a/backintime-websocket-client/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt +++ b/backintime-websocket-client/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClientTest.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.websocket.client +package io.github.kitakkun.backintime.websocket.client -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import io.ktor.server.application.install import io.ktor.server.engine.connector import io.ktor.server.testing.ApplicationTestBuilder diff --git a/backintime-websocket-event/build.gradle.kts b/backintime-websocket-event/build.gradle.kts index 1887c7ad..7fc2a275 100644 --- a/backintime-websocket-event/build.gradle.kts +++ b/backintime-websocket-event/build.gradle.kts @@ -29,6 +29,6 @@ kotlin { } android { - namespace = "com.github.kitakkun.backintime.websocket.event" + namespace = "io.github.kitakkun.backintime.websocket.event" compileSdk = 34 } diff --git a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt similarity index 92% rename from backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt rename to backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt index 505d7605..9c249ca0 100644 --- a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt +++ b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebugServiceEvent.kt @@ -1,9 +1,9 @@ @file:OptIn(ExperimentalJsExport::class) @file:JsExport -package com.github.kitakkun.backintime.websocket.event +package io.github.kitakkun.backintime.websocket.event -import com.github.kitakkun.backintime.websocket.event.model.PropertyInfo +import io.github.kitakkun.backintime.websocket.event.model.PropertyInfo import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport import kotlin.js.JsExport diff --git a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt similarity index 93% rename from backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt rename to backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt index 79feb531..b575e887 100644 --- a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt +++ b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/BackInTimeDebuggerEvent.kt @@ -1,7 +1,7 @@ @file:OptIn(ExperimentalJsExport::class) @file:JsExport -package com.github.kitakkun.backintime.websocket.event +package io.github.kitakkun.backintime.websocket.event import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt similarity index 84% rename from backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt rename to backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt index d6d42cd9..9ab89ce7 100644 --- a/backintime-websocket-event/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt +++ b/backintime-websocket-event/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/event/model/PropertyInfo.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.websocket.event.model +package io.github.kitakkun.backintime.websocket.event.model import kotlinx.serialization.Serializable import kotlin.js.ExperimentalJsExport diff --git a/backintime-websocket-event/src/jsMain/kotlin/com/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt b/backintime-websocket-event/src/jsMain/kotlin/io/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt similarity index 81% rename from backintime-websocket-event/src/jsMain/kotlin/com/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt rename to backintime-websocket-event/src/jsMain/kotlin/io/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt index 18bda106..71eddb07 100644 --- a/backintime-websocket-event/src/jsMain/kotlin/com/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt +++ b/backintime-websocket-event/src/jsMain/kotlin/io/github/kitakkun/backintime/websocket/event/EventGenerationHelper.kt @@ -1,7 +1,7 @@ @file:OptIn(ExperimentalJsExport::class) @file:Suppress("NON_EXPORTABLE_TYPE") -package com.github.kitakkun.backintime.websocket.event +package io.github.kitakkun.backintime.websocket.event @JsExport fun createCheckInstanceAliveEvent(instanceUUIDs: Array) = BackInTimeDebuggerEvent.CheckInstanceAlive(instanceUUIDs = instanceUUIDs.toList()) diff --git a/backintime-websocket-server/build.gradle.kts b/backintime-websocket-server/build.gradle.kts index 0e290f29..6342bef4 100644 --- a/backintime-websocket-server/build.gradle.kts +++ b/backintime-websocket-server/build.gradle.kts @@ -32,6 +32,6 @@ kotlin { } android { - namespace = "com.github.kitakkun.backintime.websocket.server" + namespace = "io.github.kitakkun.backintime.websocket.server" compileSdk = 34 } diff --git a/backintime-websocket-server/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt b/backintime-websocket-server/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt similarity index 93% rename from backintime-websocket-server/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt rename to backintime-websocket-server/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt index a6b65e74..53599e8c 100644 --- a/backintime-websocket-server/src/commonMain/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt +++ b/backintime-websocket-server/src/commonMain/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeWebSocketServer.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.websocket.server +package io.github.kitakkun.backintime.websocket.server import com.benasher44.uuid.uuid4 -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import io.ktor.server.application.Application import io.ktor.server.application.install import io.ktor.server.cio.CIO diff --git a/backintime-websocket-server/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt b/backintime-websocket-server/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt similarity index 95% rename from backintime-websocket-server/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt rename to backintime-websocket-server/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt index cbb3c2e3..a29b0a7c 100644 --- a/backintime-websocket-server/src/commonTest/kotlin/com/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt +++ b/backintime-websocket-server/src/commonTest/kotlin/io/github/kitakkun/backintime/websocket/server/BackInTimeDebugServerTest.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.websocket.server +package io.github.kitakkun.backintime.websocket.server -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession import io.ktor.client.plugins.websocket.WebSockets import io.ktor.client.plugins.websocket.webSocket diff --git a/build-logic-for-testing/build.gradle.kts b/build-logic-for-testing/build.gradle.kts index 784903b9..5759837c 100644 --- a/build-logic-for-testing/build.gradle.kts +++ b/build-logic-for-testing/build.gradle.kts @@ -9,5 +9,5 @@ plugins { alias(libs.plugins.backintimeLint) apply false } -group = "com.github.kitakkun.backintime" +group = "io.github.kitakkun.backintime" version = "1.0.0" diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 29bb4580..38a20bf5 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -4,9 +4,9 @@ plugins { gradlePlugin { plugins { - register("com.github.kitakkun.backintime.conventions.ktlint") { + register("io.github.kitakkun.backintime.conventions.ktlint") { id = "backintime.lint" - implementationClass = "com.github.kitakkun.backintime.convention.LintConventionPlugin" + implementationClass = "io.github.kitakkun.backintime.convention.LintConventionPlugin" } } } diff --git a/build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/LintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/LintConventionPlugin.kt similarity index 86% rename from build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/LintConventionPlugin.kt rename to build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/LintConventionPlugin.kt index 85a82f46..db1fb6b4 100644 --- a/build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/LintConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/LintConventionPlugin.kt @@ -1,6 +1,6 @@ -package com.github.kitakkun.backintime.convention +package io.github.kitakkun.backintime.convention -import com.github.kitakkun.backintime.convention.extension.libs +import io.github.kitakkun.backintime.convention.extension.libs import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure @@ -23,4 +23,4 @@ class LintConventionPlugin : Plugin { } } } -} \ No newline at end of file +} diff --git a/build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/extension/Project.kt b/build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/extension/Project.kt similarity index 68% rename from build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/extension/Project.kt rename to build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/extension/Project.kt index f4233d48..eda71313 100644 --- a/build-logic/convention/src/main/kotlin/com/github/kitakkun/backintime/convention/extension/Project.kt +++ b/build-logic/convention/src/main/kotlin/io/github/kitakkun/backintime/convention/extension/Project.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.convention.extension +package io.github.kitakkun.backintime.convention.extension import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.kotlin.dsl.getByType -val Project.libs get() = this.extensions.getByType().named("libs") \ No newline at end of file +val Project.libs get() = this.extensions.getByType().named("libs") diff --git a/build.gradle.kts b/build.gradle.kts index 6c7a34a0..137da5e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { alias(libs.plugins.backintimeLint) apply false } -group = "com.github.kitakkun.backintime" +group = "io.github.kitakkun.backintime" version = "1.0.0" subprojects { diff --git a/renovate.json b/renovate.json index 01c8262f..97dfbf51 100644 --- a/renovate.json +++ b/renovate.json @@ -5,7 +5,7 @@ ], "ignoreDeps": [ "kmp-lib", - "com.github.kitakkun.backintime:com.github.kitakkun.backintime.gradle.plugin", + "io.github.kitakkun.backintime:io.github.kitakkun.backintime.gradle.plugin", "backintime.lint:backintime.lint.gradle.plugin" ] } diff --git a/test/build.gradle.kts b/test/build.gradle.kts index 831a59ef..93dc9da0 100644 --- a/test/build.gradle.kts +++ b/test/build.gradle.kts @@ -4,7 +4,7 @@ plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) alias(libs.plugins.backintimeLint) - id("com.github.kitakkun.backintime") version "1.0.0" + id("io.github.kitakkun.backintime") version "1.0.0" } kotlin { @@ -48,7 +48,7 @@ kotlin { android { compileSdk = 34 - namespace = "com.github.kitakkun.backintime.test" + namespace = "io.github.kitakkun.backintime.test" } backInTime { @@ -59,7 +59,7 @@ backInTime { collections() container { - className = "com/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.GradleConfiguredValueContainer" + className = "io/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.GradleConfiguredValueContainer" captures = listOf("", "update") getter = "" setter = "" diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt similarity index 88% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt index 2a48fbbb..0f0d03b1 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/BackInTimeDebugServiceTest.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test -import com.github.kitakkun.backintime.runtime.BackInTimeDebugService -import com.github.kitakkun.backintime.runtime.DebuggableStateHolderEvent +import io.github.kitakkun.backintime.runtime.BackInTimeDebugService +import io.github.kitakkun.backintime.runtime.DebuggableStateHolderEvent import io.mockk.every import io.mockk.mockkObject import io.mockk.slot diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/LambdaViewModelTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/LambdaViewModelTest.kt similarity index 95% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/LambdaViewModelTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/LambdaViewModelTest.kt index 884bf26b..24c2ac52 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/LambdaViewModelTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/LambdaViewModelTest.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import kotlin.test.Test import kotlin.test.assertEquals diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModelTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModelTest.kt similarity index 96% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModelTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModelTest.kt index 8fb2836d..12b1f1c8 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModelTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModelTest.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import kotlin.test.Test import kotlin.test.assertEquals diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt similarity index 87% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt index 48832ae9..aae2ff63 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModelTest.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import org.junit.Test import kotlin.test.assertEquals diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureTest.kt similarity index 91% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureTest.kt index f5e0bed5..123a7c9d 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureTest.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import org.junit.Test import kotlin.test.assertEquals diff --git a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt similarity index 94% rename from test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt rename to test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt index a37dbc6c..d45fd703 100644 --- a/test/src/androidDebugUnitTest/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt +++ b/test/src/androidDebugUnitTest/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModelTest.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import org.junit.Test import kotlin.test.assertEquals diff --git a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/LambdaViewModel.kt b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/LambdaViewModel.kt similarity index 90% rename from test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/LambdaViewModel.kt rename to test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/LambdaViewModel.kt index 41a80649..b3048e41 100644 --- a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/LambdaViewModel.kt +++ b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/LambdaViewModel.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf -import com.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.BackInTime @BackInTime class LambdaViewModel { diff --git a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModel.kt b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModel.kt similarity index 92% rename from test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModel.kt rename to test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModel.kt index b9c213d8..e529f136 100644 --- a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/MutableStateViewModel.kt +++ b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/MutableStateViewModel.kt @@ -1,4 +1,4 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import androidx.compose.runtime.mutableDoubleStateOf import androidx.compose.runtime.mutableFloatStateOf @@ -6,7 +6,7 @@ import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateMapOf -import com.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.BackInTime @BackInTime class MutableStateViewModel { diff --git a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt similarity index 84% rename from test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt rename to test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt index 91bc8f7a..2ea20736 100644 --- a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt +++ b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/PlusAssignMutableStateViewModel.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import androidx.compose.runtime.mutableStateOf -import com.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.BackInTime /** * MutableState> なプロパティを宣言し， diff --git a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt similarity index 87% rename from test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt rename to test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt index c0d082fa..865c780d 100644 --- a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt +++ b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/StateFlowCaptureViewModel.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.BackInTime import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.getAndUpdate import kotlinx.coroutines.flow.update diff --git a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt similarity index 95% rename from test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt rename to test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt index 9284ac0e..b2c4f60d 100644 --- a/test/src/androidMain/kotlin/com/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt +++ b/test/src/androidMain/kotlin/io/github/kitakkun/backintime/test/WeirdCodeStyleViewModel.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.test +package io.github.kitakkun.backintime.test import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.MutableLiveData -import com.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.BackInTime import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt similarity index 77% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt index bdf7653c..4e56eb0a 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/BackInTimeDebugServiceTest.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.test.base +package io.github.kitakkun.backintime.test.base -import com.github.kitakkun.backintime.runtime.BackInTimeDebugService -import com.github.kitakkun.backintime.runtime.getBackInTimeDebugService -import com.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.runtime.BackInTimeDebugService +import io.github.kitakkun.backintime.runtime.getBackInTimeDebugService +import io.github.kitakkun.backintime.runtime.internal.BackInTimeCompilerInternalApi +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent import kotlin.test.AfterTest import kotlin.test.BeforeTest diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/MockConnector.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/MockConnector.kt similarity index 71% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/MockConnector.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/MockConnector.kt index 1dfb4d69..5fb86d78 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/base/MockConnector.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/base/MockConnector.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.base +package io.github.kitakkun.backintime.test.base -import com.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent -import com.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent +import io.github.kitakkun.backintime.runtime.connector.BackInTimeWebSocketConnector +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebugServiceEvent +import io.github.kitakkun.backintime.websocket.event.BackInTimeDebuggerEvent import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt similarity index 81% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt index 9a8511ed..0da97634 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodCallEventTest.kt @@ -1,7 +1,7 @@ -package com.github.kitakkun.backintime.test.basic +package io.github.kitakkun.backintime.test.basic -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt similarity index 70% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt index 06674de5..fa2dcca2 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/MethodGenerationTest.kt @@ -1,9 +1,9 @@ -package com.github.kitakkun.backintime.test.basic +package io.github.kitakkun.backintime.test.basic -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith @@ -11,7 +11,7 @@ import kotlin.test.assertIs class MethodGenerationTest : BackInTimeDebugServiceTest() { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.basic.MethodGenerationTest.TestStateHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.basic.MethodGenerationTest.TestStateHolder" private const val PROPERTY_NAME = "property" } diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt similarity index 76% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt index 3d1bd2f7..7c0cb9a4 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/PropertyChangeEventTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.basic +package io.github.kitakkun.backintime.test.basic -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test @@ -11,7 +11,7 @@ import kotlin.test.assertIs class PropertyChangeEventTest : BackInTimeDebugServiceTest() { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.basic.PropertyChangeEventTest.TestStateHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.basic.PropertyChangeEventTest.TestStateHolder" private const val PROPERTY_NAME = "property" } diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt similarity index 70% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt index 2395ac1c..3f4cd7bb 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterInstanceEventTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.basic +package io.github.kitakkun.backintime.test.basic -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import org.junit.Assert.assertEquals diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt similarity index 90% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt index 97c58cef..1a69013c 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/basic/RegisterRelationShipTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.basic +package io.github.kitakkun.backintime.test.basic -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt similarity index 80% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt index 17f327fb..989b8241 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/NoSuchPropertyExceptionTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.exception +package io.github.kitakkun.backintime.test.exception -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException import kotlin.test.Test import kotlin.test.assertFailsWith import kotlin.test.assertIs diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt similarity index 67% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt index 0f4dc718..cb48b16c 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/exception/TypeMismatchExceptionTest.kt @@ -1,19 +1,19 @@ -package com.github.kitakkun.backintime.test.exception +package io.github.kitakkun.backintime.test.exception -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.annotations.Capture -import com.github.kitakkun.backintime.annotations.Getter -import com.github.kitakkun.backintime.annotations.Setter -import com.github.kitakkun.backintime.annotations.ValueContainer -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.Capture +import io.github.kitakkun.backintime.annotations.Getter +import io.github.kitakkun.backintime.annotations.Setter +import io.github.kitakkun.backintime.annotations.ValueContainer +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.runtime.exception.BackInTimeRuntimeException import kotlin.test.Test import kotlin.test.assertFailsWith import kotlin.test.assertIs class TypeMismatchExceptionTest { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.exception.TypeMismatchExceptionTest.TestStateHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.exception.TypeMismatchExceptionTest.TestStateHolder" private const val PROPERTY_NAME = "property" private const val VALUE_CONTAINER_PROPERTY_NAME = "valueContainerProperty" } diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt similarity index 75% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt index f036fab7..a44a5666 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/AnnotationConfiguredValueContainerTest.kt @@ -1,12 +1,12 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.annotations.Capture -import com.github.kitakkun.backintime.annotations.Getter -import com.github.kitakkun.backintime.annotations.Setter -import com.github.kitakkun.backintime.annotations.ValueContainer -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.Capture +import io.github.kitakkun.backintime.annotations.Getter +import io.github.kitakkun.backintime.annotations.Setter +import io.github.kitakkun.backintime.annotations.ValueContainer +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test @@ -15,7 +15,7 @@ import kotlin.test.assertIs class AnnotationConfiguredValueContainerTest : BackInTimeDebugServiceTest() { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.AnnotationConfiguredValueContainerTest.ValueContainerHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.AnnotationConfiguredValueContainerTest.ValueContainerHolder" private const val CONTAINER_NAME = "container" } diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt similarity index 79% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt index bc9af46c..1855565e 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test @@ -11,7 +11,7 @@ import kotlin.test.assertIs class GradleConfiguredValueContainerTest : BackInTimeDebugServiceTest() { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.GradleConfiguredValueContainerTest.ValueContainerHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.GradleConfiguredValueContainerTest.ValueContainerHolder" private const val CONTAINER_NAME = "container" } @@ -21,7 +21,7 @@ class GradleConfiguredValueContainerTest : BackInTimeDebugServiceTest() { * valueContainers { * ... * container { - * className = "com/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.GradleConfiguredValueContainer" + * className = "io/github/kitakkun/backintime/test/specific/GradleConfiguredValueContainerTest.GradleConfiguredValueContainer" * captures = listOf("", "update") * getter = "" * setter = "" diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/InheritanceTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/InheritanceTest.kt similarity index 86% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/InheritanceTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/InheritanceTest.kt index 0169ef5f..6c0b6026 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/InheritanceTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/InheritanceTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test @@ -11,12 +11,12 @@ import kotlin.test.assertIs class InheritanceTest : BackInTimeDebugServiceTest() { companion object { - private const val SUPER_CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.InheritanceTest.SuperClass" + private const val SUPER_CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.InheritanceTest.SuperClass" private const val SUPER_PROPERTY_NAME = "superProperty" private const val OVERRIDABLE_PROPERTY_NAME = "overridableProperty" private const val PRIVATE_SUPER_PROPERTY_NAME = "privateSuperProperty" private const val SUPER_CLASS_CONFLICTED_PRIVATE_PROPERTY_NAME = "conflictedPrivateProperty" - private const val SUB_CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.InheritanceTest.SubClass" + private const val SUB_CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.InheritanceTest.SubClass" private const val SUB_PROPERTY_NAME = "subProperty" private const val SUB_CLASS_CONFLICTED_PRIVATE_PROPERTY_NAME = "conflictedPrivateProperty" } @@ -49,9 +49,9 @@ class InheritanceTest : BackInTimeDebugServiceTest() { assertEquals(2, registerInstanceEvents.size) assertEquals(instance.backInTimeInstanceUUID, registerInstanceEvents[0].instanceUUID) // super class - assertEquals("com.github.kitakkun.backintime.test.specific.InheritanceTest.SuperClass", registerInstanceEvents[0].className) // super class + assertEquals("io.github.kitakkun.backintime.test.specific.InheritanceTest.SuperClass", registerInstanceEvents[0].className) // super class assertEquals(instance.backInTimeInstanceUUID, registerInstanceEvents[1].instanceUUID) // sub class - assertEquals("com.github.kitakkun.backintime.test.specific.InheritanceTest.SubClass", registerInstanceEvents[1].className) // super class + assertEquals("io.github.kitakkun.backintime.test.specific.InheritanceTest.SubClass", registerInstanceEvents[1].className) // super class } @Test diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt similarity index 88% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt index f5d340a2..c7a95e2b 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/MutableCollectionsCaptureTest.kt @@ -1,8 +1,8 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlin.test.Test diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt similarity index 96% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt index ae0f273a..b38af249 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/PureVarsHolderTest.kt @@ -1,14 +1,14 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertIs class PureVarsHolderTest { companion object { - private const val HOLDER_CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.PureVarsHolderTest.PureVarsHolder" + private const val HOLDER_CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.PureVarsHolderTest.PureVarsHolder" } @BackInTime diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt similarity index 83% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt index 2895d153..edfe5b2c 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/ScopeFunctionsTest.kt @@ -1,12 +1,12 @@ -package com.github.kitakkun.backintime.test.specific - -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.annotations.Capture -import com.github.kitakkun.backintime.annotations.Getter -import com.github.kitakkun.backintime.annotations.Setter -import com.github.kitakkun.backintime.annotations.ValueContainer -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable -import com.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest +package io.github.kitakkun.backintime.test.specific + +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.annotations.Capture +import io.github.kitakkun.backintime.annotations.Getter +import io.github.kitakkun.backintime.annotations.Setter +import io.github.kitakkun.backintime.annotations.ValueContainer +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.test.base.BackInTimeDebugServiceTest import kotlinx.coroutines.test.runTest import kotlin.test.Ignore import kotlin.test.Test @@ -15,7 +15,7 @@ import kotlin.test.assertIs class ScopeFunctionsTest : BackInTimeDebugServiceTest() { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.ScopeFunctionsTest.ValueContainerHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.ScopeFunctionsTest.ValueContainerHolder" private const val CONTAINER_PROPERTY_NAME = "container" } diff --git a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt similarity index 80% rename from test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt rename to test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt index f0884103..ef86e62e 100644 --- a/test/src/commonTest/kotlin/com/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt +++ b/test/src/commonTest/kotlin/io/github/kitakkun/backintime/test/specific/SelfSerializableValueHolderTest.kt @@ -1,14 +1,14 @@ -package com.github.kitakkun.backintime.test.specific +package io.github.kitakkun.backintime.test.specific -import com.github.kitakkun.backintime.annotations.BackInTime -import com.github.kitakkun.backintime.runtime.BackInTimeDebuggable +import io.github.kitakkun.backintime.annotations.BackInTime +import io.github.kitakkun.backintime.runtime.BackInTimeDebuggable import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs class SelfSerializableValueHolderTest { companion object { - private const val CLASS_FQ_NAME = "com.github.kitakkun.backintime.test.specific.SelfSerializableValueHolderTest.TestStateHolder" + private const val CLASS_FQ_NAME = "io.github.kitakkun.backintime.test.specific.SelfSerializableValueHolderTest.TestStateHolder" private const val MUTABLE_LIST_PROPERTY_NAME = "mutableList" }