Update buld

altavir · altavir · commit a865fcf497fa · 2025-11-15T17:55:19.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,11 +8,6 @@ plugins {
 allprojects {
     group = "space.kscience"
     version = "0.4.0-dev-8"
-
-    repositories {
-        mavenLocal()
-        maven("https://repo.kotlin.link")
-    }
 }
 
 ksciencePublish {
diff --git a/demo/maps/build.gradle.kts b/demo/maps/build.gradle.kts
@@ -19,7 +19,6 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain(17)
     jvm()
     sourceSets {
         val jvmMain by getting {
diff --git a/demo/polygon-editor/build.gradle.kts b/demo/polygon-editor/build.gradle.kts
@@ -10,7 +10,6 @@ val ktorVersion: String by rootProject.extra
 
 kotlin {
     jvm()
-    jvmToolchain(17)
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/demo/scheme/build.gradle.kts b/demo/scheme/build.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 
 kotlin {
     jvm()
-    jvmToolchain(17)
     sourceSets {
         commonMain {
             dependencies {
diff --git a/demo/trajectory-playground/build.gradle.kts b/demo/trajectory-playground/build.gradle.kts
@@ -8,7 +8,6 @@ val ktorVersion: String by rootProject.extra
 
 kotlin {
     jvm()
-    jvmToolchain(17)
     sourceSets {
         val jvmMain by getting {
             dependencies {
diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,6 @@ kotlin.code.style=official
 
 org.gradle.jvmargs=-Xmx4096m
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+
 toolsVersion=0.19.2-kotlin-2.2.20
diff --git a/maps-kt-core/build.gradle.kts b/maps-kt-core/build.gradle.kts
@@ -3,15 +3,15 @@ plugins {
     `maven-publish`
 }
 
-kscience{
+kscience {
     jvm()
     js()
     native()
     wasmJs()
 
     useSerialization()
 
-    dependencies{
+    dependencies {
         api(projects.trajectoryKt)
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -30,8 +30,8 @@ dependencyResolutionManagement {
     repositories {
         mavenLocal()
         maven("https://repo.kotlin.link")
+        google()
         mavenCentral()
-        gradlePluginPortal()
     }
 
     versionCatalogs {
@@ -41,6 +41,9 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
 
 include(
     ":trajectory-kt",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ repositories {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`kotlin {`
`22`		`- jvmToolchain(17)`
`23`	`22`	`jvm()`
`24`	`23`	`sourceSets {`
`25`	`24`	`val jvmMain by getting {`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@ plugins {`
`3`	`3`	`maven-publish`
`4`	`4`	`}`
`5`	`5`
`6`		`-kscience{`
	`6`	`+kscience {`
`7`	`7`	`jvm()`
`8`	`8`	`js()`
`9`	`9`	`native()`
`10`	`10`	`wasmJs()`
`11`	`11`
`12`	`12`	`useSerialization()`
`13`	`13`
`14`		`- dependencies{`
	`14`	`+ dependencies {`
`15`	`15`	`api(projects.trajectoryKt)`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ dependencyResolutionManagement {`
`30`	`30`	`repositories {`
`31`	`31`	`mavenLocal()`
`32`	`32`	`maven("https://repo.kotlin.link")`
	`33`	`+ google()`
`33`	`34`	`mavenCentral()`
`34`		`- gradlePluginPortal()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`versionCatalogs {`
`@@ -41,6 +41,9 @@ dependencyResolutionManagement {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+plugins {`
	`45`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
	`46`	`+}`
`44`	`47`
`45`	`48`	`include(`
`46`	`49`	`":trajectory-kt",`