From 4a09e66c42bb0f33edcee321c895cfed41fd8cd4 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 2 Aug 2022 09:46:31 +0300 Subject: [PATCH] continue package refactor --- build.gradle.kts | 4 ++-- controls-core/build.gradle.kts | 4 ++-- controls-magix-client/build.gradle.kts | 2 +- .../space/kscience/controls/client/controlsMagix.kt | 2 +- .../space/kscience/controls/client/tangoMagix.kt | 2 +- controls-opcua/build.gradle.kts | 4 ++-- controls-serial/build.gradle.kts | 2 +- controls-server/build.gradle.kts | 2 +- .../kscience/controls/server/deviceWebServer.kt | 8 ++++---- .../space/kscience/controls/server/responses.kt | 2 +- controls-storage/build.gradle.kts | 4 ++-- controls-storage/controls-xodus/build.gradle.kts | 4 ++-- controls-tcp/build.gradle.kts | 2 +- .../kscience/controls/demo/DemoControllerView.kt | 8 ++++---- .../space/kscience/controls/demo/demoDeviceServer.kt | 4 ++-- .../kscience/controls/demo/car/MagixVirtualCar.kt | 6 +++--- .../controls/demo/car/VirtualCarController.kt | 8 ++++---- .../kotlin/space/kscience/controls/demo/echo/main.kt | 10 +++++----- demo/magix-demo/build.gradle.kts | 2 +- demo/magix-demo/src/main/kotlin/zmq.kt | 8 ++++---- demo/motors/build.gradle.kts | 4 ++-- gradle.properties | 2 +- magix/magix-api/build.gradle.kts | 4 ++-- .../kscience}/magix/api/MagixEndpoint.kt | 2 +- .../npm => space/kscience}/magix/api/MagixFormat.kt | 4 ++-- .../npm => space/kscience}/magix/api/MagixMessage.kt | 2 +- .../kscience}/magix/api/MagixMessageFilter.kt | 2 +- .../kscience}/magix/api/MagixRegistry.kt | 2 +- .../npm => space/kscience}/magix/api/converters.kt | 2 +- magix/magix-java-client/build.gradle.kts | 4 ++-- .../kscience}/magix/client/MagixClient.java | 4 ++-- .../kscience}/magix/client/ControlsMagixClient.kt | 12 ++++++------ magix/magix-rabbit/build.gradle.kts | 4 ++-- .../kscience}/magix/rabbit/RabbitMQMagixEndpoint.kt | 12 ++++++------ magix/magix-rsocket/build.gradle.kts | 4 ++-- .../kscience}/magix/rsocket/RSocketMagixEndpoint.kt | 10 +++++----- .../magix/rsocket/RSocketStreamMagixEndpoint.kt | 10 +++++----- .../npm => space/kscience}/magix/rsocket/withTcp.kt | 4 ++-- .../src/linuxX64Main/kotlin/rsocket/withTcp.kt | 6 +++--- magix/magix-server/build.gradle.kts | 4 ++-- .../kscience}/magix/server/magixModule.kt | 10 +++++----- .../npm => space/kscience}/magix/server/server.kt | 10 +++++----- .../mipt/npm => space/kscience}/magix/server/sse.kt | 2 +- .../kscience}/magix/server/zmqMagixServerSocket.kt | 6 +++--- .../magix-storage-mongo/build.gradle.kts | 4 ++-- .../magix-storage-xodus/build.gradle.kts | 4 ++-- .../magix/storage/xodus/XodusMagixStorage.kt | 10 +++++----- magix/magix-zmq/build.gradle.kts | 2 +- .../kscince}/magix/zmq/ZmqMagixEndpoint.kt | 10 +++++----- settings.gradle.kts | 10 +++++----- 50 files changed, 127 insertions(+), 127 deletions(-) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/MagixEndpoint.kt (97%) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/MagixFormat.kt (92%) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/MagixMessage.kt (96%) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/MagixMessageFilter.kt (96%) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/MagixRegistry.kt (94%) rename magix/magix-api/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/api/converters.kt (96%) rename magix/magix-java-client/src/main/java/{ru/mipt/npm => space/kscience}/magix/client/MagixClient.java (92%) rename magix/magix-java-client/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/client/ControlsMagixClient.kt (80%) rename magix/magix-rabbit/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/rabbit/RabbitMQMagixEndpoint.kt (87%) rename magix/magix-rsocket/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/rsocket/RSocketMagixEndpoint.kt (92%) rename magix/magix-rsocket/src/commonMain/kotlin/{ru/mipt/npm => space/kscience}/magix/rsocket/RSocketStreamMagixEndpoint.kt (93%) rename magix/magix-rsocket/src/jvmMain/kotlin/{ru/mipt/npm => space/kscience}/magix/rsocket/withTcp.kt (94%) rename magix/magix-server/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/server/magixModule.kt (95%) rename magix/magix-server/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/server/server.kt (90%) rename magix/magix-server/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/server/sse.kt (96%) rename magix/magix-server/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/server/zmqMagixServerSocket.kt (92%) rename magix/magix-storage/magix-storage-xodus/src/main/kotlin/{ru/mipt/npm => space/kscience}/magix/storage/xodus/XodusMagixStorage.kt (93%) rename magix/magix-zmq/src/main/kotlin/{ru/mipt/npm => space/kscince}/magix/zmq/ZmqMagixEndpoint.kt (92%) diff --git a/build.gradle.kts b/build.gradle.kts index 75b36df..ceec553 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("ru.mipt.npm.gradle.project") + id("space.kscience.gradle.project") } val dataforgeVersion: String by extra("0.6.0-dev-12") -val ktorVersion: String by extra(ru.mipt.npm.gradle.KScienceVersions.ktorVersion) +val ktorVersion: String by extra(space.kscience.gradle.KScienceVersions.ktorVersion) val rsocketVersion by extra("0.15.4") allprojects { diff --git a/controls-core/build.gradle.kts b/controls-core/build.gradle.kts index 777cb1e..159e693 100644 --- a/controls-core/build.gradle.kts +++ b/controls-core/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.gradle.mpp") - id("ru.mipt.npm.gradle.native") + id("space.kscience.gradle.mpp") + id("space.kscience.gradle.native") `maven-publish` } diff --git a/controls-magix-client/build.gradle.kts b/controls-magix-client/build.gradle.kts index 7941c2e..2105e37 100644 --- a/controls-magix-client/build.gradle.kts +++ b/controls-magix-client/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.mpp") + id("space.kscience.gradle.mpp") `maven-publish` } diff --git a/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt index 7355df0..be77a4a 100644 --- a/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt +++ b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/controlsMagix.kt @@ -5,13 +5,13 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import ru.mipt.npm.magix.api.* import space.kscience.controls.api.DeviceMessage import space.kscience.controls.manager.DeviceManager import space.kscience.controls.manager.hubMessageFlow import space.kscience.controls.manager.respondHubMessage import space.kscience.dataforge.context.error import space.kscience.dataforge.context.logger +import space.kscience.magix.api.* public val controlsMagixFormat: MagixFormat = MagixFormat( diff --git a/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt index 1638d85..ddec8d6 100644 --- a/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt +++ b/controls-magix-client/src/commonMain/kotlin/space/kscience/controls/client/tangoMagix.kt @@ -5,13 +5,13 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.serialization.Serializable -import ru.mipt.npm.magix.api.* import space.kscience.controls.api.get import space.kscience.controls.api.getOrReadProperty import space.kscience.controls.manager.DeviceManager import space.kscience.dataforge.context.error import space.kscience.dataforge.context.logger import space.kscience.dataforge.meta.Meta +import space.kscience.magix.api.* public const val TANGO_MAGIX_FORMAT: String = "tango" diff --git a/controls-opcua/build.gradle.kts b/controls-opcua/build.gradle.kts index a2a225d..c5894e4 100644 --- a/controls-opcua/build.gradle.kts +++ b/controls-opcua/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") } val ktorVersion: String by rootProject.extra @@ -8,7 +8,7 @@ val miloVersion: String = "0.6.3" dependencies { api(project(":controls-core")) - api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}") + api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${space.kscience.gradle.KScienceVersions.coroutinesVersion}") api("org.eclipse.milo:sdk-client:$miloVersion") api("org.eclipse.milo:bsd-parser:$miloVersion") diff --git a/controls-serial/build.gradle.kts b/controls-serial/build.gradle.kts index 733348c..b28a210 100644 --- a/controls-serial/build.gradle.kts +++ b/controls-serial/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } diff --git a/controls-server/build.gradle.kts b/controls-server/build.gradle.kts index 710550c..e9471a5 100644 --- a/controls-server/build.gradle.kts +++ b/controls-server/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } diff --git a/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt b/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt index 881ad1b..434aaa0 100644 --- a/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt +++ b/controls-server/src/main/kotlin/space/kscience/controls/server/deviceWebServer.kt @@ -26,10 +26,6 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.buildJsonArray import kotlinx.serialization.json.encodeToJsonElement import kotlinx.serialization.json.put -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.server.launchMagixServerRawRSocket -import ru.mipt.npm.magix.server.magixModule import space.kscience.controls.api.DeviceMessage import space.kscience.controls.api.PropertyGetMessage import space.kscience.controls.api.PropertySetMessage @@ -39,6 +35,10 @@ import space.kscience.controls.manager.respondHubMessage import space.kscience.dataforge.meta.toMeta import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.asName +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.server.launchMagixServerRawRSocket +import space.kscience.magix.server.magixModule /** * Create and start a web server for several devices diff --git a/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt b/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt index 96912e2..93d11c4 100644 --- a/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt +++ b/controls-server/src/main/kotlin/space/kscience/controls/server/responses.kt @@ -5,8 +5,8 @@ import io.ktor.server.application.ApplicationCall import io.ktor.server.response.respondText import kotlinx.serialization.json.JsonObjectBuilder import kotlinx.serialization.json.buildJsonObject -import ru.mipt.npm.magix.api.MagixEndpoint import space.kscience.controls.api.DeviceMessage +import space.kscience.magix.api.MagixEndpoint //internal fun Frame.toEnvelope(): Envelope { diff --git a/controls-storage/build.gradle.kts b/controls-storage/build.gradle.kts index ab25e1d..80210e8 100644 --- a/controls-storage/build.gradle.kts +++ b/controls-storage/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.mpp") + id("space.kscience.gradle.mpp") `maven-publish` } @@ -24,5 +24,5 @@ kotlin { } readme{ - maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE + maturity = space.kscience.gradle.Maturity.PROTOTYPE } diff --git a/controls-storage/controls-xodus/build.gradle.kts b/controls-storage/controls-xodus/build.gradle.kts index ae99038..a912825 100644 --- a/controls-storage/controls-xodus/build.gradle.kts +++ b/controls-storage/controls-xodus/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } @@ -15,5 +15,5 @@ dependencies { } readme{ - maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE + maturity = space.kscience.gradle.Maturity.PROTOTYPE } diff --git a/controls-tcp/build.gradle.kts b/controls-tcp/build.gradle.kts index 4ed2905..c15c892 100644 --- a/controls-tcp/build.gradle.kts +++ b/controls-tcp/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") } val ktorVersion: String by rootProject.extra diff --git a/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt index a37430f..4decac5 100644 --- a/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/DemoControllerView.kt @@ -8,10 +8,6 @@ import javafx.stage.Stage import kotlinx.coroutines.launch import org.eclipse.milo.opcua.sdk.server.OpcUaServer import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.rsocket.rSocketWithTcp -import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets -import ru.mipt.npm.magix.server.startMagixServer import space.kscience.controls.client.connectToMagix import space.kscience.controls.demo.DemoDevice.Companion.cosScale import space.kscience.controls.demo.DemoDevice.Companion.sinScale @@ -22,6 +18,10 @@ import space.kscience.controls.opcua.server.OpcUaServer import space.kscience.controls.opcua.server.endpoint import space.kscience.controls.opcua.server.serveDevices import space.kscience.dataforge.context.* +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.rsocket.rSocketWithTcp +import space.kscience.magix.rsocket.rSocketWithWebSockets +import space.kscience.magix.server.startMagixServer import tornadofx.* import java.awt.Desktop import java.net.URI diff --git a/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt index 29791ae..1903416 100644 --- a/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt +++ b/demo/all-things/src/main/kotlin/space/kscience/controls/demo/demoDeviceServer.kt @@ -11,12 +11,12 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import kotlinx.html.div import kotlinx.html.link -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.subscribe import space.kscience.controls.api.PropertyChangedMessage import space.kscience.controls.client.controlsMagixFormat import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.double +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.subscribe import space.kscience.plotly.layout import space.kscience.plotly.models.Trace import space.kscience.plotly.plot diff --git a/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt index b1b57e5..5cf3386 100644 --- a/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/MagixVirtualCar.kt @@ -1,9 +1,6 @@ package space.kscience.controls.demo.car import kotlinx.coroutines.launch -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.subscribe -import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets import space.kscience.controls.api.PropertyChangedMessage import space.kscience.controls.client.controlsMagixFormat import space.kscience.dataforge.context.Context @@ -12,6 +9,9 @@ import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.get import space.kscience.dataforge.meta.string import space.kscience.dataforge.names.Name +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.subscribe +import space.kscience.magix.rsocket.rSocketWithWebSockets import kotlin.time.ExperimentalTime class MagixVirtualCar(context: Context, meta: Meta) : VirtualCar(context, meta) { diff --git a/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt index 143969e..5e6651e 100644 --- a/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt +++ b/demo/car/src/main/kotlin/space/kscience/controls/demo/car/VirtualCarController.kt @@ -8,10 +8,6 @@ import javafx.scene.layout.Priority import javafx.stage.Stage import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.rsocket.rSocketWithTcp -import ru.mipt.npm.magix.server.startMagixServer -import ru.mipt.npm.magix.storage.xodus.storeInXodus import space.kscience.controls.client.connectToMagix import space.kscience.controls.demo.car.IVirtualCar.Companion.acceleration import space.kscience.controls.manager.DeviceManager @@ -20,6 +16,10 @@ import space.kscience.controls.storage.storeMessages import space.kscience.controls.xodus.XodusDeviceMessageStorage import space.kscience.dataforge.context.* import space.kscience.dataforge.meta.Meta +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.rsocket.rSocketWithTcp +import space.kscience.magix.server.startMagixServer +import space.kscience.magix.storage.xodus.storeInXodus import tornadofx.* import java.nio.file.Paths diff --git a/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt b/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt index 05dab38..a02c044 100644 --- a/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt +++ b/demo/echo/src/main/kotlin/space/kscience/controls/demo/echo/main.kt @@ -5,11 +5,11 @@ import kotlinx.coroutines.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.serialization.json.JsonObject -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.rsocket.rSocketStreamWithWebSockets -import ru.mipt.npm.magix.server.startMagixServer +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.rsocket.rSocketStreamWithWebSockets +import space.kscience.magix.server.startMagixServer import kotlin.time.ExperimentalTime import kotlin.time.measureTime diff --git a/demo/magix-demo/build.gradle.kts b/demo/magix-demo/build.gradle.kts index 0b6e72b..411b9c4 100644 --- a/demo/magix-demo/build.gradle.kts +++ b/demo/magix-demo/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") application } diff --git a/demo/magix-demo/src/main/kotlin/zmq.kt b/demo/magix-demo/src/main/kotlin/zmq.kt index c8c4b45..6a7e01d 100644 --- a/demo/magix-demo/src/main/kotlin/zmq.kt +++ b/demo/magix-demo/src/main/kotlin/zmq.kt @@ -7,10 +7,10 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.isActive import kotlinx.serialization.json.* import org.slf4j.LoggerFactory -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.server.startMagixServer -import ru.mipt.npm.magix.zmq.ZmqMagixEndpoint +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.server.startMagixServer +import space.kscince.magix.zmq.ZmqMagixEndpoint import java.awt.Desktop import java.net.URI diff --git a/demo/motors/build.gradle.kts b/demo/motors/build.gradle.kts index 503ab5d..1427557 100644 --- a/demo/motors/build.gradle.kts +++ b/demo/motors/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` application } @@ -15,7 +15,7 @@ kotlin{ } kscience{ - useFx(ru.mipt.npm.gradle.FXModule.CONTROLS, configuration = ru.mipt.npm.gradle.DependencyConfiguration.IMPLEMENTATION) + useFx(space.kscience.gradle.FXModule.CONTROLS, configuration = space.kscience.gradle.DependencyConfiguration.IMPLEMENTATION) } val ktorVersion: String by rootProject.extra diff --git a/gradle.properties b/gradle.properties index 1d1dcc7..52d10eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ org.gradle.parallel=true publishing.github=false publishing.sonatype=false -toolsVersion=0.11.7-kotlin-1.7.0 \ No newline at end of file +toolsVersion=0.12.0-kotlin-1.7.20-Beta \ No newline at end of file diff --git a/magix/magix-api/build.gradle.kts b/magix/magix-api/build.gradle.kts index 7a11b09..0a23e4c 100644 --- a/magix/magix-api/build.gradle.kts +++ b/magix/magix-api/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.gradle.mpp") - id("ru.mipt.npm.gradle.native") + id("space.kscience.gradle.mpp") + id("space.kscience.gradle.native") `maven-publish` } diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixEndpoint.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixEndpoint.kt similarity index 97% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixEndpoint.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixEndpoint.kt index 52d591f..9baafea 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixEndpoint.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixEndpoint.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.coroutines.flow.Flow import kotlinx.serialization.json.Json diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixFormat.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixFormat.kt similarity index 92% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixFormat.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixFormat.kt index a5df654..4921129 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixFormat.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixFormat.kt @@ -1,10 +1,10 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.serialization.KSerializer import kotlinx.serialization.json.JsonElement -import ru.mipt.npm.magix.api.MagixEndpoint.Companion.magixJson +import space.kscience.magix.api.MagixEndpoint.Companion.magixJson public data class MagixFormat( val serializer: KSerializer, diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessage.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessage.kt similarity index 96% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessage.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessage.kt index 44e7d6a..c25c08a 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessage.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessage.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessageFilter.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessageFilter.kt similarity index 96% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessageFilter.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessageFilter.kt index fb6ab4e..f497b97 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixMessageFilter.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixMessageFilter.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixRegistry.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixRegistry.kt similarity index 94% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixRegistry.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixRegistry.kt index a13b9ce..7b3b111 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/MagixRegistry.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/MagixRegistry.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.serialization.json.JsonElement diff --git a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/converters.kt b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/converters.kt similarity index 96% rename from magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/converters.kt rename to magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/converters.kt index 6c558ad..441e141 100644 --- a/magix/magix-api/src/commonMain/kotlin/ru/mipt/npm/magix/api/converters.kt +++ b/magix/magix-api/src/commonMain/kotlin/space/kscience/magix/api/converters.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.api +package space.kscience.magix.api import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job diff --git a/magix/magix-java-client/build.gradle.kts b/magix/magix-java-client/build.gradle.kts index d250b3f..7a14d44 100644 --- a/magix/magix-java-client/build.gradle.kts +++ b/magix/magix-java-client/build.gradle.kts @@ -1,12 +1,12 @@ plugins { java - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } dependencies { implementation(project(":magix:magix-rsocket")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:${ru.mipt.npm.gradle.KScienceVersions.coroutinesVersion}") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:${space.kscience.gradle.KScienceVersions.coroutinesVersion}") } java { diff --git a/magix/magix-java-client/src/main/java/ru/mipt/npm/magix/client/MagixClient.java b/magix/magix-java-client/src/main/java/space/kscience/magix/client/MagixClient.java similarity index 92% rename from magix/magix-java-client/src/main/java/ru/mipt/npm/magix/client/MagixClient.java rename to magix/magix-java-client/src/main/java/space/kscience/magix/client/MagixClient.java index 3da2364..3270544 100644 --- a/magix/magix-java-client/src/main/java/ru/mipt/npm/magix/client/MagixClient.java +++ b/magix/magix-java-client/src/main/java/space/kscience/magix/client/MagixClient.java @@ -1,7 +1,7 @@ -package ru.mipt.npm.magix.client; +package space.kscience.magix.client; import kotlinx.serialization.json.JsonElement; -import ru.mipt.npm.magix.api.MagixMessage; +import space.kscience.magix.api.MagixMessage; import java.io.IOException; import java.util.concurrent.Flow; diff --git a/magix/magix-java-client/src/main/kotlin/ru/mipt/npm/magix/client/ControlsMagixClient.kt b/magix/magix-java-client/src/main/kotlin/space/kscience/magix/client/ControlsMagixClient.kt similarity index 80% rename from magix/magix-java-client/src/main/kotlin/ru/mipt/npm/magix/client/ControlsMagixClient.kt rename to magix/magix-java-client/src/main/kotlin/space/kscience/magix/client/ControlsMagixClient.kt index 4abb15f..1efa746 100644 --- a/magix/magix-java-client/src/main/kotlin/ru/mipt/npm/magix/client/ControlsMagixClient.kt +++ b/magix/magix-java-client/src/main/kotlin/space/kscience/magix/client/ControlsMagixClient.kt @@ -1,12 +1,12 @@ -package ru.mipt.npm.magix.client +package space.kscience.magix.client import kotlinx.coroutines.jdk9.asPublisher import kotlinx.coroutines.runBlocking -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.rsocket.rSocketWithTcp -import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.rsocket.rSocketWithTcp +import space.kscience.magix.rsocket.rSocketWithWebSockets import java.util.concurrent.Flow internal class ControlsMagixClient( diff --git a/magix/magix-rabbit/build.gradle.kts b/magix/magix-rabbit/build.gradle.kts index 960a121..3d7bc4d 100644 --- a/magix/magix-rabbit/build.gradle.kts +++ b/magix/magix-rabbit/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } @@ -13,5 +13,5 @@ dependencies { } readme{ - maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE + maturity = space.kscience.gradle.Maturity.PROTOTYPE } diff --git a/magix/magix-rabbit/src/main/kotlin/ru/mipt/npm/magix/rabbit/RabbitMQMagixEndpoint.kt b/magix/magix-rabbit/src/main/kotlin/space/kscience/magix/rabbit/RabbitMQMagixEndpoint.kt similarity index 87% rename from magix/magix-rabbit/src/main/kotlin/ru/mipt/npm/magix/rabbit/RabbitMQMagixEndpoint.kt rename to magix/magix-rabbit/src/main/kotlin/space/kscience/magix/rabbit/RabbitMQMagixEndpoint.kt index a709df8..33af457 100644 --- a/magix/magix-rabbit/src/main/kotlin/ru/mipt/npm/magix/rabbit/RabbitMQMagixEndpoint.kt +++ b/magix/magix-rabbit/src/main/kotlin/space/kscience/magix/rabbit/RabbitMQMagixEndpoint.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.rabbit +package space.kscience.magix.rabbit import com.rabbitmq.client.* import kotlinx.coroutines.cancel @@ -6,11 +6,11 @@ import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow import kotlinx.coroutines.launch -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.api.filter -import ru.mipt.npm.magix.rabbit.RabbitMQMagixEndpoint.Companion.DEFAULT_MAGIX_QUEUE_NAME +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.api.filter +import space.kscience.magix.rabbit.RabbitMQMagixEndpoint.Companion.DEFAULT_MAGIX_QUEUE_NAME /** * A magix endpoint for RabbitMQ message broker diff --git a/magix/magix-rsocket/build.gradle.kts b/magix/magix-rsocket/build.gradle.kts index b5c1eb8..7f637b3 100644 --- a/magix/magix-rsocket/build.gradle.kts +++ b/magix/magix-rsocket/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("ru.mipt.npm.gradle.mpp") - id("ru.mipt.npm.gradle.native") + id("space.kscience.gradle.mpp") + id("space.kscience.gradle.native") `maven-publish` } diff --git a/magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketMagixEndpoint.kt b/magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketMagixEndpoint.kt similarity index 92% rename from magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketMagixEndpoint.kt rename to magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketMagixEndpoint.kt index cb165cf..43c505c 100644 --- a/magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketMagixEndpoint.kt +++ b/magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketMagixEndpoint.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.rsocket +package space.kscience.magix.rsocket import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.WebSockets @@ -14,10 +14,10 @@ import kotlinx.coroutines.* import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.api.filter +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.api.filter import kotlin.coroutines.CoroutineContext import kotlin.coroutines.coroutineContext diff --git a/magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketStreamMagixEndpoint.kt b/magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketStreamMagixEndpoint.kt similarity index 93% rename from magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketStreamMagixEndpoint.kt rename to magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketStreamMagixEndpoint.kt index 25f99bb..1875602 100644 --- a/magix/magix-rsocket/src/commonMain/kotlin/ru/mipt/npm/magix/rsocket/RSocketStreamMagixEndpoint.kt +++ b/magix/magix-rsocket/src/commonMain/kotlin/space/kscience/magix/rsocket/RSocketStreamMagixEndpoint.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.rsocket +package space.kscience.magix.rsocket import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.WebSockets @@ -18,10 +18,10 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.api.filter +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.api.filter import kotlin.coroutines.CoroutineContext import kotlin.coroutines.coroutineContext diff --git a/magix/magix-rsocket/src/jvmMain/kotlin/ru/mipt/npm/magix/rsocket/withTcp.kt b/magix/magix-rsocket/src/jvmMain/kotlin/space/kscience/magix/rsocket/withTcp.kt similarity index 94% rename from magix/magix-rsocket/src/jvmMain/kotlin/ru/mipt/npm/magix/rsocket/withTcp.kt rename to magix/magix-rsocket/src/jvmMain/kotlin/space/kscience/magix/rsocket/withTcp.kt index 5d76532..23fe0be 100644 --- a/magix/magix-rsocket/src/jvmMain/kotlin/ru/mipt/npm/magix/rsocket/withTcp.kt +++ b/magix/magix-rsocket/src/jvmMain/kotlin/space/kscience/magix/rsocket/withTcp.kt @@ -1,9 +1,9 @@ -package ru.mipt.npm.magix.rsocket +package space.kscience.magix.rsocket import io.ktor.network.sockets.SocketOptions import io.rsocket.kotlin.core.RSocketConnectorBuilder import io.rsocket.kotlin.transport.ktor.tcp.TcpClientTransport -import ru.mipt.npm.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixEndpoint import kotlin.coroutines.coroutineContext diff --git a/magix/magix-rsocket/src/linuxX64Main/kotlin/rsocket/withTcp.kt b/magix/magix-rsocket/src/linuxX64Main/kotlin/rsocket/withTcp.kt index 8e1d596..117bcdd 100644 --- a/magix/magix-rsocket/src/linuxX64Main/kotlin/rsocket/withTcp.kt +++ b/magix/magix-rsocket/src/linuxX64Main/kotlin/rsocket/withTcp.kt @@ -3,9 +3,9 @@ package rsocket import io.ktor.network.sockets.SocketOptions import io.rsocket.kotlin.core.RSocketConnectorBuilder import io.rsocket.kotlin.transport.ktor.tcp.TcpClientTransport -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.rsocket.RSocketMagixEndpoint -import ru.mipt.npm.magix.rsocket.buildConnector +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.rsocket.RSocketMagixEndpoint +import space.kscience.magix.rsocket.buildConnector import kotlin.coroutines.coroutineContext diff --git a/magix/magix-server/build.gradle.kts b/magix/magix-server/build.gradle.kts index f73528d..dc7cb28 100644 --- a/magix/magix-server/build.gradle.kts +++ b/magix/magix-server/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` application } @@ -16,7 +16,7 @@ kscience { val dataforgeVersion: String by rootProject.extra val rsocketVersion: String by rootProject.extra -val ktorVersion: String = ru.mipt.npm.gradle.KScienceVersions.ktorVersion +val ktorVersion: String = space.kscience.gradle.KScienceVersions.ktorVersion dependencies{ api(projects.magix.magixApi) diff --git a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/magixModule.kt b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/magixModule.kt similarity index 95% rename from magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/magixModule.kt rename to magix/magix-server/src/main/kotlin/space/kscience/magix/server/magixModule.kt index 6cbf00a..50c5921 100644 --- a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/magixModule.kt +++ b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/magixModule.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.server +package space.kscience.magix.server import io.ktor.serialization.kotlinx.json.json import io.ktor.server.application.* @@ -19,10 +19,10 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.* import kotlinx.html.* import kotlinx.serialization.encodeToString -import ru.mipt.npm.magix.api.MagixEndpoint.Companion.magixJson -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.api.filter +import space.kscience.magix.api.MagixEndpoint.Companion.magixJson +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.api.filter import java.util.* diff --git a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/server.kt b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/server.kt similarity index 90% rename from magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/server.kt rename to magix/magix-server/src/main/kotlin/space/kscience/magix/server/server.kt index e75b594..8ed3ba5 100644 --- a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/server.kt +++ b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/server.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.server +package space.kscience.magix.server import io.ktor.server.application.Application import io.ktor.server.cio.CIO @@ -12,10 +12,10 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import org.slf4j.LoggerFactory -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_HTTP_PORT -import ru.mipt.npm.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_RAW_PORT -import ru.mipt.npm.magix.api.MagixMessage +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_HTTP_PORT +import space.kscience.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_RAW_PORT +import space.kscience.magix.api.MagixMessage /** * Raw TCP magix server diff --git a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/sse.kt b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/sse.kt similarity index 96% rename from magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/sse.kt rename to magix/magix-server/src/main/kotlin/space/kscience/magix/server/sse.kt index c771ab0..21db0b9 100644 --- a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/sse.kt +++ b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/sse.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.server +package space.kscience.magix.server import io.ktor.http.CacheControl import io.ktor.http.ContentType diff --git a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/zmqMagixServerSocket.kt b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/zmqMagixServerSocket.kt similarity index 92% rename from magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/zmqMagixServerSocket.kt rename to magix/magix-server/src/main/kotlin/space/kscience/magix/server/zmqMagixServerSocket.kt index f0c62b8..18717e4 100644 --- a/magix/magix-server/src/main/kotlin/ru/mipt/npm/magix/server/zmqMagixServerSocket.kt +++ b/magix/magix-server/src/main/kotlin/space/kscience/magix/server/zmqMagixServerSocket.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.server +package space.kscience.magix.server import kotlinx.coroutines.* import kotlinx.coroutines.flow.MutableSharedFlow @@ -9,8 +9,8 @@ import kotlinx.serialization.encodeToString import org.slf4j.LoggerFactory import org.zeromq.SocketType import org.zeromq.ZContext -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage public fun CoroutineScope.launchMagixServerZmqSocket( magixFlow: MutableSharedFlow, diff --git a/magix/magix-storage/magix-storage-mongo/build.gradle.kts b/magix/magix-storage/magix-storage-mongo/build.gradle.kts index fa27fb3..51ed9f4 100644 --- a/magix/magix-storage/magix-storage-mongo/build.gradle.kts +++ b/magix/magix-storage/magix-storage-mongo/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } @@ -11,5 +11,5 @@ dependencies { } readme{ - maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE + maturity = space.kscience.gradle.Maturity.PROTOTYPE } diff --git a/magix/magix-storage/magix-storage-xodus/build.gradle.kts b/magix/magix-storage/magix-storage-xodus/build.gradle.kts index 2ac7af2..9019cf1 100644 --- a/magix/magix-storage/magix-storage-xodus/build.gradle.kts +++ b/magix/magix-storage/magix-storage-xodus/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } @@ -17,5 +17,5 @@ dependencies { } readme{ - maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE + maturity = space.kscience.gradle.Maturity.PROTOTYPE } diff --git a/magix/magix-storage/magix-storage-xodus/src/main/kotlin/ru/mipt/npm/magix/storage/xodus/XodusMagixStorage.kt b/magix/magix-storage/magix-storage-xodus/src/main/kotlin/space/kscience/magix/storage/xodus/XodusMagixStorage.kt similarity index 93% rename from magix/magix-storage/magix-storage-xodus/src/main/kotlin/ru/mipt/npm/magix/storage/xodus/XodusMagixStorage.kt rename to magix/magix-storage/magix-storage-xodus/src/main/kotlin/space/kscience/magix/storage/xodus/XodusMagixStorage.kt index e14a1af..87e4096 100644 --- a/magix/magix-storage/magix-storage-xodus/src/main/kotlin/ru/mipt/npm/magix/storage/xodus/XodusMagixStorage.kt +++ b/magix/magix-storage/magix-storage-xodus/src/main/kotlin/space/kscience/magix/storage/xodus/XodusMagixStorage.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.storage.xodus +package space.kscience.magix.storage.xodus import jetbrains.exodus.entitystore.Entity import jetbrains.exodus.entitystore.PersistentEntityStore @@ -8,10 +8,10 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.serialization.encodeToString import kotlinx.serialization.json.JsonObject -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixEndpoint.Companion.magixJson -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixEndpoint.Companion.magixJson +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter import java.nio.file.Path public class XodusMagixStorage( diff --git a/magix/magix-zmq/build.gradle.kts b/magix/magix-zmq/build.gradle.kts index cf9e4be..b47b568 100644 --- a/magix/magix-zmq/build.gradle.kts +++ b/magix/magix-zmq/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("ru.mipt.npm.gradle.jvm") + id("space.kscience.gradle.jvm") `maven-publish` } diff --git a/magix/magix-zmq/src/main/kotlin/ru/mipt/npm/magix/zmq/ZmqMagixEndpoint.kt b/magix/magix-zmq/src/main/kotlin/space/kscince/magix/zmq/ZmqMagixEndpoint.kt similarity index 92% rename from magix/magix-zmq/src/main/kotlin/ru/mipt/npm/magix/zmq/ZmqMagixEndpoint.kt rename to magix/magix-zmq/src/main/kotlin/space/kscince/magix/zmq/ZmqMagixEndpoint.kt index b621a69..d8c8343 100644 --- a/magix/magix-zmq/src/main/kotlin/ru/mipt/npm/magix/zmq/ZmqMagixEndpoint.kt +++ b/magix/magix-zmq/src/main/kotlin/space/kscince/magix/zmq/ZmqMagixEndpoint.kt @@ -1,4 +1,4 @@ -package ru.mipt.npm.magix.zmq +package space.kscince.magix.zmq import kotlinx.coroutines.* import kotlinx.coroutines.flow.Flow @@ -8,10 +8,10 @@ import org.zeromq.SocketType import org.zeromq.ZContext import org.zeromq.ZMQ import org.zeromq.ZMQException -import ru.mipt.npm.magix.api.MagixEndpoint -import ru.mipt.npm.magix.api.MagixMessage -import ru.mipt.npm.magix.api.MagixMessageFilter -import ru.mipt.npm.magix.api.filter +import space.kscience.magix.api.MagixEndpoint +import space.kscience.magix.api.MagixMessage +import space.kscience.magix.api.MagixMessageFilter +import space.kscience.magix.api.filter import kotlin.coroutines.CoroutineContext import kotlin.coroutines.coroutineContext diff --git a/settings.gradle.kts b/settings.gradle.kts index aff8bbd..5b2bf00 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,10 +15,10 @@ pluginManagement { } plugins { - id("ru.mipt.npm.gradle.project") version toolsVersion - id("ru.mipt.npm.gradle.mpp") version toolsVersion - id("ru.mipt.npm.gradle.jvm") version toolsVersion - id("ru.mipt.npm.gradle.js") version toolsVersion + id("space.kscience.gradle.project") version toolsVersion + id("space.kscience.gradle.mpp") version toolsVersion + id("space.kscience.gradle.jvm") version toolsVersion + id("space.kscience.gradle.js") version toolsVersion } } @@ -34,7 +34,7 @@ dependencyResolutionManagement { versionCatalogs { create("npmlibs") { - from("ru.mipt.npm:version-catalog:$toolsVersion") + from("space.kscience:version-catalog:$toolsVersion") } } }