From 484d1d5c827461f304698fe7ea18ff4c106ec03b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 15 Nov 2023 15:52:47 +0300 Subject: [PATCH] update versions --- build.gradle.kts | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ru/inr/mass/trapping/crosssections.kt | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b367665..c53df37 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,32 +1,32 @@ plugins { - kotlin("jvm") version "1.4.10" + kotlin("jvm") version "1.9.20" application - id("com.github.johnrengelman.shadow") version "6.1.0" + id("com.github.johnrengelman.shadow") version "8.1.1" } group = "ru.inr.mass" -version = "1.1.0" +version = "1.1.1" description = "Numass trapping simulation" application { - mainClassName = "ru.inr.mass.trapping.MainKt" + mainClass.set("ru.inr.mass.trapping.MainKt") } repositories { - jcenter() + maven("https://repo.kotlin.link") mavenCentral() } dependencies { implementation("org.apache.commons:commons-math3:3.6.1") implementation("org.apache.commons:commons-rng-simple:1.1") - implementation("kscience.plotlykt:plotlykt-core:0.2.0") + implementation("space.kscience:plotlykt-core:0.5.0") implementation("de.m3y.kformat:kformat:0.7") - testImplementation("junit:junit:4.12") + testImplementation(kotlin("test-junit")) } -tasks.compileKotlin { - kotlinOptions.jvmTarget = "1.8" +kotlin{ + jvmToolchain(11) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/ru/inr/mass/trapping/crosssections.kt b/src/main/kotlin/ru/inr/mass/trapping/crosssections.kt index 6684070..68137df 100644 --- a/src/main/kotlin/ru/inr/mass/trapping/crosssections.kt +++ b/src/main/kotlin/ru/inr/mass/trapping/crosssections.kt @@ -2,11 +2,11 @@ package ru.inr.mass.trapping import de.m3y.kformat.Table import de.m3y.kformat.table -import kscience.plotly.Plotly -import kscience.plotly.layout -import kscience.plotly.makeFile -import kscience.plotly.models.AxisType -import kscience.plotly.scatter +import space.kscience.plotly.Plotly +import space.kscience.plotly.layout +import space.kscience.plotly.makeFile +import space.kscience.plotly.models.AxisType +import space.kscience.plotly.scatter infix fun ClosedFloatingPointRange.step(step: Double): Sequence = sequence { var current = start