Compare commits

..

5 Commits

Author SHA1 Message Date
5c7dc3c729 Kotlin 2.0.20 + JDK 17 + versions update 2024-08-26 10:21:27 +03:00
d6276e0ca0 update versions 2024-07-25 10:08:06 +03:00
2bd93104d6 Return optins 2024-07-25 09:56:40 +03:00
91a82153fd Kotlin 2.0.20-Beta2.
Add KSP
2024-07-25 09:48:40 +03:00
53517859d4 fix pom organization 2024-06-24 16:58:16 +03:00
5 changed files with 33 additions and 32 deletions

View File

@ -6,8 +6,8 @@ plugins {
`version-catalog` `version-catalog`
alias(libs.plugins.jetbrains.changelog) alias(libs.plugins.jetbrains.changelog)
alias(libs.plugins.jetbrains.dokka) alias(libs.plugins.jetbrains.dokka)
alias(libs.plugins.com.github.ben.manes.versions) alias(libs.plugins.versions)
alias(libs.plugins.version.catalog.update) alias(libs.plugins.versions.update)
} }
group = "space.kscience" group = "space.kscience"
@ -23,8 +23,6 @@ repositories {
maven("https://repo.kotlin.link") maven("https://repo.kotlin.link")
} }
kotlin.explicitApiWarning()
dependencies { dependencies {
api(libs.kotlin.gradle) api(libs.kotlin.gradle)
api(libs.foojay.resolver) api(libs.foojay.resolver)
@ -207,9 +205,8 @@ publishing {
} }
kotlin { kotlin {
jvmToolchain { explicitApiWarning()
languageVersion.set(JavaLanguageVersion.of(11)) jvmToolchain(17)
}
} }
tasks.processResources.configure { tasks.processResources.configure {
@ -223,6 +220,7 @@ tasks.withType<AbstractPublishToMaven>().configureEach {
} }
versionCatalogUpdate { versionCatalogUpdate {
sortByKey.set(false)
keep { keep {
keepUnusedVersions = true keepUnusedVersions = true
keepUnusedPlugins = true keepUnusedPlugins = true

View File

@ -1,39 +1,39 @@
[versions] [versions]
atomicfu = "0.24.0" # @pin
changelog = "2.2.0" kotlin = "2.0.20"
# @pin
tools = "0.15.6-kotlin-2.0.20"
atomicfu = "0.25.0"
changelog = "2.2.1"
compose = "1.6.11" compose = "1.6.11"
dokka = "1.9.20" dokka = "1.9.20"
jsBom = "1.0.0-pre.754" jsBom = "1.0.0-pre.798"
junit = "5.10.2" junit = "5.10.2"
# @pin kotlin-jupyter = "0.12.0-275"
kotlin = "2.0.0" kotlinx-benchmark = "0.4.12"
kotlin-jupyter = "0.12.0-230"
kotlinx-benchmark = "0.4.10"
kotlinx-cli = "0.3.6" kotlinx-cli = "0.3.6"
kotlinx-coroutines = "1.8.1" kotlinx-coroutines = "1.8.1"
kotlinx-datetime = "0.6.0" kotlinx-datetime = "0.6.1"
kotlinx-html = "0.11.0" kotlinx-html = "0.11.0"
kotlinx-knit = "0.5.0" kotlinx-knit = "0.5.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.6.3" kotlinx-serialization = "1.7.1"
kover = "0.8.0" kover = "0.8.3"
ktor = "2.3.11" ktor = "2.3.12"
logback = "1.5.6" ksp = "2.0.20-1.0.24"
slf4j = "2.0.13" logback = "1.5.7"
# @pin slf4j = "2.0.16"
tools = "0.15.4-kotlin-2.0.0" xmlutil = "0.90.1"
xmlutil = "0.86.3"
yamlkt = "0.13.0" yamlkt = "0.13.0"
[plugins] [plugins]
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" } compose-jb = { id = "org.jetbrains.compose", version.ref = "compose" }
jetbrains-changelog = "org.jetbrains.changelog:2.2.0" jetbrains-changelog = "org.jetbrains.changelog:2.2.1"
jetbrains-dokka = "org.jetbrains.dokka:1.9.20" jetbrains-dokka = "org.jetbrains.dokka:1.9.20"
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" } kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" }
kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:4.4.0" kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:5.1.0"
kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" } kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" } kotlin-jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@ -52,13 +52,15 @@ kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kot
kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
kscience-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" } kscience-mpp = { id = "space.kscience.gradle.mpp", version.ref = "tools" }
kscience-project = { id = "space.kscience.gradle.project", version.ref = "tools" } kscience-project = { id = "space.kscience.gradle.project", version.ref = "tools" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
ktor = { id = "io.ktor.plugin", version.ref = "ktor" } ktor = { id = "io.ktor.plugin", version.ref = "ktor" }
version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4" versions = "com.github.ben-manes.versions:0.51.0"
versions-update = "nl.littlerobots.version-catalog-update:0.8.4"
[libraries] [libraries]
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" } atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" } atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }
binary-compatibility-validator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.2" binary-compatibility-validator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.15.0-Beta.3"
changelog-gradle = { module = "org.jetbrains.intellij.plugins:gradle-changelog-plugin", version.ref = "changelog" } changelog-gradle = { module = "org.jetbrains.intellij.plugins:gradle-changelog-plugin", version.ref = "changelog" }
dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" } dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
@ -104,6 +106,7 @@ kotlinx-serialization-hocon = { module = "org.jetbrains.kotlinx:kotlinx-serializ
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
kotlinx-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlinx-serialization" } kotlinx-serialization-properties = { module = "org.jetbrains.kotlinx:kotlinx-serialization-properties", version.ref = "kotlinx-serialization" }
kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" } kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
ktor-bom = { module = "io.ktor:ktor-bom", version.ref = "ktor" } ktor-bom = { module = "io.ktor:ktor-bom", version.ref = "ktor" }
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

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-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -11,6 +11,7 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.kotlin.dsl.* import org.gradle.kotlin.dsl.*
import org.gradle.language.jvm.tasks.ProcessResources import org.gradle.language.jvm.tasks.ProcessResources
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
@ -18,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBrowserDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinWasmJsTargetDsl
@ -52,7 +52,7 @@ public val Project.isInDevelopment: Boolean
|| version.toString().endsWith("SNAPSHOT") || version.toString().endsWith("SNAPSHOT")
private const val defaultJdkVersion = 11 private const val defaultJdkVersion = 17
public abstract class KScienceExtension @Inject constructor(public val project: Project): ExtensionAware { public abstract class KScienceExtension @Inject constructor(public val project: Project): ExtensionAware {

View File

@ -17,7 +17,7 @@ public fun MavenPom.useSPCTeam(){
developer { developer {
id.set("SPC") id.set("SPC")
name.set("Scientific programming centre") name.set("Scientific programming centre")
organization.set("MIPT") organization.set("SPC")
organizationUrl.set("https://sciprog.center/") organizationUrl.set("https://sciprog.center/")
} }
} }