continue package refactor

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 {

controls-core/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    id("space.kscience.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.native")
     `maven-publish`
 }
 

controls-magix-client/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    id("space.kscience.gradle.mpp")
     `maven-publish`
 }
 

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<DeviceMessage> = MagixFormat(

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"
 

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

controls-serial/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
     `maven-publish`
 }
 

controls-server/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
     `maven-publish`
 }
 

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

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 {

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
 }

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
 }

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

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

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

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) {

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
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.rsocket.rSocketStreamWithWebSockets
+import space.kscience.magix.rsocket.rSocketStreamWithWebSockets
-import ru.mipt.npm.magix.server.startMagixServer
+import space.kscience.magix.server.startMagixServer
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTime
 

demo/magix-demo/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
     application
 }
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.server.startMagixServer
+import space.kscience.magix.server.startMagixServer
-import ru.mipt.npm.magix.zmq.ZmqMagixEndpoint
+import space.kscince.magix.zmq.ZmqMagixEndpoint
 import java.awt.Desktop
 import java.net.URI
 

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

gradle.properties

@@ -7,4 +7,4 @@ org.gradle.parallel=true
 publishing.github=false
 publishing.sonatype=false
 
-toolsVersion=0.11.7-kotlin-1.7.0
+toolsVersion=0.12.0-kotlin-1.7.20-Beta

magix/magix-api/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    id("space.kscience.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.native")
     `maven-publish`
 }
 

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

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<T>(
     val serializer: KSerializer<T>,

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

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

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
 

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

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 {

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;

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.rsocket.rSocketWithTcp
+import space.kscience.magix.rsocket.rSocketWithTcp
-import ru.mipt.npm.magix.rsocket.rSocketWithWebSockets
+import space.kscience.magix.rsocket.rSocketWithWebSockets
 import java.util.concurrent.Flow
 
 internal class ControlsMagixClient<T>(

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
 }

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.api.filter
+import space.kscience.magix.api.filter
-import ru.mipt.npm.magix.rabbit.RabbitMQMagixEndpoint.Companion.DEFAULT_MAGIX_QUEUE_NAME
+import space.kscience.magix.rabbit.RabbitMQMagixEndpoint.Companion.DEFAULT_MAGIX_QUEUE_NAME
 
 /**
  * A magix endpoint for RabbitMQ message broker

magix/magix-rsocket/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("ru.mipt.npm.gradle.mpp")
+    id("space.kscience.gradle.mpp")
-    id("ru.mipt.npm.gradle.native")
+    id("space.kscience.gradle.native")
     `maven-publish`
 }
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.api.filter
+import space.kscience.magix.api.filter
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.api.filter
+import space.kscience.magix.api.filter
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 

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
 
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.rsocket.RSocketMagixEndpoint
+import space.kscience.magix.rsocket.RSocketMagixEndpoint
-import ru.mipt.npm.magix.rsocket.buildConnector
+import space.kscience.magix.rsocket.buildConnector
 import kotlin.coroutines.coroutineContext
 
 

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)

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 space.kscience.magix.api.MagixEndpoint.Companion.magixJson
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.api.filter
+import space.kscience.magix.api.filter
 import java.util.*
 
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_HTTP_PORT
+import space.kscience.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_HTTP_PORT
-import ru.mipt.npm.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_RAW_PORT
+import space.kscience.magix.api.MagixEndpoint.Companion.DEFAULT_MAGIX_RAW_PORT
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
 
 /**
  * Raw TCP magix server

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

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
 
 public fun CoroutineScope.launchMagixServerZmqSocket(
     magixFlow: MutableSharedFlow<MagixMessage>,

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
 }

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
 }

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixEndpoint.Companion.magixJson
+import space.kscience.magix.api.MagixEndpoint.Companion.magixJson
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
 import java.nio.file.Path
 
 public class XodusMagixStorage(

magix/magix-zmq/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("ru.mipt.npm.gradle.jvm")
+    id("space.kscience.gradle.jvm")
     `maven-publish`
 }
 

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 space.kscience.magix.api.MagixEndpoint
-import ru.mipt.npm.magix.api.MagixMessage
+import space.kscience.magix.api.MagixMessage
-import ru.mipt.npm.magix.api.MagixMessageFilter
+import space.kscience.magix.api.MagixMessageFilter
-import ru.mipt.npm.magix.api.filter
+import space.kscience.magix.api.filter
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 

settings.gradle.kts

@@ -15,10 +15,10 @@ pluginManagement {
     }
 
     plugins {
-        id("ru.mipt.npm.gradle.project") version toolsVersion
+        id("space.kscience.gradle.project") version toolsVersion
-        id("ru.mipt.npm.gradle.mpp") version toolsVersion
+        id("space.kscience.gradle.mpp") version toolsVersion
-        id("ru.mipt.npm.gradle.jvm") version toolsVersion
+        id("space.kscience.gradle.jvm") version toolsVersion
-        id("ru.mipt.npm.gradle.js") 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")
         }
     }
 }