kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Fix ktor imports

Browse Source
This commit is contained in:
Alexander Nozik 2022-01-18 17:37:25 +03:00
parent 0c4c2e4cc0
commit 786e1637b4
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
9 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.space/CODEOWNERS Normal file
View File

@ -0,0 +1 @@
./space/* "Project Admin"

2
controls-core/build.gradle.kts
View File

@ -17,7 +17,7 @@ kotlin {
commonMain{
dependencies {
api("space.kscience:dataforge-io:$dataforgeVersion")
api(npm.kotlinx.datetime)
api(npmlibs.kotlinx.datetime)
}
}
}

3
controls-storage/build.gradle.kts
View File

@ -4,14 +4,12 @@ plugins {
}
val dataforgeVersion: String by rootProject.extra
val kotlinx_io_version = "0.1.1"
kotlin {
sourceSets {
commonMain {
dependencies {
implementation(projects.controlsCore)
implementation("org.jetbrains.kotlinx:kotlinx-io:$kotlinx_io_version")
}
}
@ -20,7 +18,6 @@ kotlin {
implementation(projects.magix.magixApi)
implementation(projects.controlsMagixClient)
implementation(projects.magix.magixServer)
implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:$kotlinx_io_version")
}
}
}

2
controls-storage/src/commonMain/kotlin/ru.mipt.npm.controls.storage/asynchronous/AsynchronousStorageClient.kt
View File

@ -1,6 +1,6 @@
package ru.mipt.npm.controls.storage.asynchronous
import kotlinx.io.core.Closeable
import io.ktor.utils.io.core.Closeable
import kotlinx.serialization.KSerializer
import kotlinx.serialization.serializer
import ru.mipt.npm.controls.api.PropertyChangedMessage

2
controls-storage/src/commonMain/kotlin/ru.mipt.npm.controls.storage/asynchronous/commonApi.kt
View File

@ -1,11 +1,11 @@
package ru.mipt.npm.controls.storage.asynchronous
import io.ktor.utils.io.core.use
import kotlinx.coroutines.InternalCoroutinesApi
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import kotlinx.io.core.use
import ru.mipt.npm.controls.api.DeviceMessage
import ru.mipt.npm.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.controllers.DeviceManager

2
controls-storage/src/commonMain/kotlin/ru.mipt.npm.controls.storage/synchronous/SynchronousStorageClient.kt
View File

@ -1,6 +1,6 @@
package ru.mipt.npm.controls.storage.synchronous
import kotlinx.io.core.Closeable
import io.ktor.utils.io.core.Closeable
import kotlinx.serialization.KSerializer
import kotlinx.serialization.serializer
import ru.mipt.npm.controls.api.PropertyChangedMessage

6
controls-storage/src/commonMain/kotlin/ru.mipt.npm.controls.storage/synchronous/commonApi.kt
View File

@ -1,9 +1,11 @@
package ru.mipt.npm.controls.storage.synchronous
import io.ktor.utils.io.core.use
import kotlinx.coroutines.InternalCoroutinesApi
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.*
import kotlinx.io.core.use
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import ru.mipt.npm.controls.api.DeviceMessage
import ru.mipt.npm.controls.api.PropertyChangedMessage
import ru.mipt.npm.controls.controllers.DeviceManager

12
gradle.properties Normal file
View File

@ -0,0 +1,12 @@
kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
kotlin.jupyter.add.scanner=false
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
org.gradle.parallel=true
publishing.github=false
publishing.sonatype=false
toolsVersion=0.10.9-kotlin-1.6.10

12
settings.gradle.kts
View File

@ -1,13 +1,13 @@
rootProject.name = "controls-kt"
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
enableFeaturePreview("VERSION_CATALOGS")
pluginManagement {
val toolsVersion = "0.10.5"
val toolsVersion: String by extra
repositories {
mavenLocal()
maven("https://repo.kotlin.link")
mavenCentral()
gradlePluginPortal()
@ -22,14 +22,18 @@ pluginManagement {
}
dependencyResolutionManagement {
val toolsVersion: String by extra
repositories {
mavenLocal()
maven("https://repo.kotlin.link")
mavenCentral()
}
versionCatalogs {
create("npm") {
from("ru.mipt.npm:version-catalog:0.10.5")
create("npmlibs") {
from("ru.mipt.npm:version-catalog:$toolsVersion")
}
}
}