Update versions

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

View File

@ -1,10 +1,15 @@
import space.kscience.gradle.isInDevelopment
import space.kscience.gradle.useApache2Licence
import space.kscience.gradle.useSPCTeam
plugins { plugins {
id("space.kscience.gradle.project") 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 ktorVersion: String by extra(space.kscience.gradle.KScienceVersions.ktorVersion)
val rsocketVersion by extra("0.15.4") val rsocketVersion by extra("0.15.4")
val xodusVersion by extra("2.0.1")
allprojects { allprojects {
group = "space.kscience" group = "space.kscience"
@ -12,8 +17,19 @@ allprojects {
} }
ksciencePublish { ksciencePublish {
github("controls.kt") pom("https://github.com/SciProgCentre/controls.kt") {
space("https://maven.pkg.jetbrains.space/mipt-npm/p/controls/maven") 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 { apiValidation {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

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

View File

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

View File

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

View File

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

View File

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