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

Update versions

Browse Source
This commit is contained in:
Alexander Nozik 2023-02-18 20:05:26 +03:00
parent dc6847196d
commit a0fd8913eb
15 changed files with 81 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.gradle.kts
View File

@ -1,10 +1,15 @@
import space.kscience.gradle.isInDevelopment
import space.kscience.gradle.useApache2Licence
import space.kscience.gradle.useSPCTeam
plugins {
id("space.kscience.gradle.project")
}
val dataforgeVersion: String by extra("0.6.0-dev-13")
val dataforgeVersion: String by extra("0.6.0-dev-15")
val ktorVersion: String by extra(space.kscience.gradle.KScienceVersions.ktorVersion)
val rsocketVersion by extra("0.15.4")
val xodusVersion by extra("2.0.1")
allprojects {
group = "space.kscience"
@ -12,8 +17,19 @@ allprojects {
}
ksciencePublish {
github("controls.kt")
space("https://maven.pkg.jetbrains.space/mipt-npm/p/controls/maven")
pom("https://github.com/SciProgCentre/controls.kt") {
useApache2Licence()
useSPCTeam()
}
github("controls.kt", "SciProgCentre")
space(
if (isInDevelopment) {
"https://maven.pkg.jetbrains.space/spc/p/sci/dev"
} else {
"https://maven.pkg.jetbrains.space/spc/p/sci/release"
}
)
space("https://maven.pkg.jetbrains.space/spc/p/controls/maven")
}
apiValidation {

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

@ -1,25 +1,20 @@
plugins {
id("space.kscience.gradle.mpp")
id("space.kscience.gradle.native")
`maven-publish`
}
val dataforgeVersion: String by rootProject.extra
kscience {
jvm()
js()
native()
useCoroutines()
useSerialization{
json()
}
}
kotlin {
sourceSets {
commonMain{
dependencies {
api("space.kscience:dataforge-io:$dataforgeVersion")
api(npmlibs.kotlinx.datetime)
}
}
dependencies {
api("space.kscience:dataforge-io:$dataforgeVersion")
api(npmlibs.kotlinx.datetime)
}
}
}

17
controls-magix-client/build.gradle.kts
View File

@ -4,18 +4,13 @@ plugins {
}
kscience{
jvm()
js()
useSerialization {
json()
}
}
kotlin {
sourceSets {
commonMain {
dependencies {
implementation(project(":magix:magix-rsocket"))
implementation(project(":controls-core"))
}
}
dependencies {
implementation(project(":magix:magix-rsocket"))
implementation(project(":controls-core"))
}
}
}

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

@ -5,21 +5,16 @@ plugins {
val dataforgeVersion: String by rootProject.extra
kotlin {
sourceSets {
commonMain {
dependencies {
api(projects.controlsCore)
}
}
jvmMain {
dependencies {
api(projects.magix.magixApi)
api(projects.controlsMagixClient)
api(projects.magix.magixServer)
}
}
kscience{
jvm()
js()
dependencies {
api(projects.controlsCore)
}
dependencies(jvmMain){
api(projects.magix.magixApi)
api(projects.controlsMagixClient)
api(projects.magix.magixServer)
}
}

2
controls-storage/controls-xodus/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
`maven-publish`
}
val xodusVersion = "2.0.1"
val xodusVersion: String by rootProject.extra
dependencies {
api(projects.controlsStorage)

4
demo/all-things/build.gradle.kts
View File

@ -1,6 +1,6 @@
plugins {
kotlin("jvm")
id("org.openjfx.javafxplugin") version "0.0.10"
id("org.openjfx.javafxplugin") version "0.0.13"
application
}
@ -37,7 +37,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
}
javafx {
version = "14"
version = "17"
modules("javafx.controls")
}

11
demo/motors/build.gradle.kts
View File

@ -1,11 +1,16 @@
plugins {
id("space.kscience.gradle.jvm")
`maven-publish`
application
id("org.openjfx.javafxplugin")
}
//TODO to be moved to a separate project
javafx {
version = "17"
modules = listOf("javafx.controls")
}
application{
mainClass.set("ru.mipt.npm.devices.pimotionmaster.PiMotionMasterAppKt")
}
@ -14,10 +19,6 @@ kotlin{
explicitApi = null
}
kscience{
useFx(space.kscience.gradle.FXModule.CONTROLS, configuration = space.kscience.gradle.DependencyConfiguration.IMPLEMENTATION)
}
val ktorVersion: String by rootProject.extra
val dataforgeVersion: String by extra

2
gradle.properties
View File

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

4
magix/magix-api/build.gradle.kts
View File

@ -1,10 +1,12 @@
plugins {
id("space.kscience.gradle.mpp")
id("space.kscience.gradle.native")
`maven-publish`
}
kscience {
jvm()
js()
native()
useCoroutines()
useSerialization{
json()

8
magix/magix-java-client/build.gradle.kts
View File

@ -12,10 +12,10 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:${KScienceVersions.coroutinesVersion}")
}
java {
sourceCompatibility = KScienceVersions.JVM_TARGET
targetCompatibility = KScienceVersions.JVM_TARGET
}
//java {
// sourceCompatibility = KScienceVersions.JVM_TARGET
// targetCompatibility = KScienceVersions.JVM_TARGET
//}
//FIXME https://youtrack.jetbrains.com/issue/KT-52815/Compiler-option-Xjdk-release-fails-to-compile-mixed-projects

38
magix/magix-rsocket/build.gradle.kts
View File

@ -1,6 +1,5 @@
plugins {
id("space.kscience.gradle.mpp")
id("space.kscience.gradle.native")
`maven-publish`
}
@ -8,30 +7,29 @@ description = """
Magix endpoint (client) based on RSocket
""".trimIndent()
kscience {
useSerialization {
json()
}
}
val ktorVersion: String by rootProject.extra
val rsocketVersion: String by rootProject.extra
kscience {
jvm()
js()
native()
useSerialization {
json()
}
dependencies {
api(projects.magix.magixApi)
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.rsocket.kotlin:rsocket-ktor-client:$rsocketVersion")
}
dependencies(jvmMain) {
implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}
}
kotlin {
sourceSets {
commonMain {
dependencies {
api(projects.magix.magixApi)
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.rsocket.kotlin:rsocket-ktor-client:$rsocketVersion")
}
}
jvmMain {
dependencies {
implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}
}
linuxX64Main{
getByName("linuxX64Main") {
dependencies {
implementation("io.rsocket.kotlin:rsocket-transport-ktor-tcp:$rsocketVersion")
}

2
magix/magix-storage/magix-storage-xodus/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
`maven-publish`
}
val xodusVersion = "2.0.1"
val xodusVersion: String by rootProject.extra
kscience{
useCoroutines()

2
magix/magix-storage/magix-storage-xodus/src/main/kotlin/space/kscience/magix/storage/xodus/XodusMagixStorage.kt
View File

@ -46,7 +46,7 @@ public class XodusMagixStorage(
}
}.launchIn(scope)
private fun Entity.parseMagixMessage(): MagixMessage = MagixMessage(
private fun Entity.parseMagixMessage(): MagixMessage = MagixMessage(
format = getProperty(MagixMessage::format.name).toString(),
payload = getBlobString(MagixMessage::payload.name)?.let {
magixJson.parseToJsonElement(it)

1
settings.gradle.kts
View File

@ -19,6 +19,7 @@ pluginManagement {
id("space.kscience.gradle.mpp") version toolsVersion
id("space.kscience.gradle.jvm") version toolsVersion
id("space.kscience.gradle.js") version toolsVersion
id("org.openjfx.javafxplugin") version "0.0.13"
}
}