From 0b2e8ff25ee572c5561d5d5aaa392a7e66332fa1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 8 Mar 2022 23:15:48 +0300
Subject: [PATCH] Build fixes

---
 build.gradle.kts             |  5 +++--
 buildSrc/build.gradle.kts    |  3 ++-
 buildSrc/gradle.properties   |  8 +-------
 buildSrc/settings.gradle.kts |  5 +++--
 gradle.properties            |  3 +--
 settings.gradle.kts          | 16 ----------------
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b48c7328..3372d505d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,17 @@
 plugins {
     id("ru.mipt.npm.gradle.project")
-    id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
+    id("org.jetbrains.kotlinx.kover") version "0.5.0"
 }
 
 allprojects {
     repositories {
+        maven("https://repo.kotlin.link")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         mavenCentral()
     }
 
     group = "space.kscience"
-    version = "0.3.0-dev-19"
+    version = "0.3.0-dev-20"
 }
 
 subprojects {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ceb220bd5..b69ebe6cd 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 java.targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
+    mavenLocal()
     maven("https://repo.kotlin.link")
     mavenCentral()
     gradlePluginPortal()
@@ -14,7 +15,7 @@ repositories {
 
 val toolsVersion: String by extra
 val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
-val benchmarksVersion = "0.4.2"
+val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
 
 dependencies {
     api("ru.mipt.npm:gradle-tools:$toolsVersion")
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index 6678f24a8..05486d4f6 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -4,11 +4,5 @@
 #
 
 kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
 
-kotlin.jupyter.add.scanner=false
-
-org.gradle.configureondemand=true
-org.gradle.parallel=true
-
-toolsVersion=0.10.9-kotlin-1.6.10
+toolsVersion=0.11.1-kotlin-1.6.10
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index 87ff205f6..9c5550602 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -3,7 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
@@ -12,8 +11,10 @@ dependencyResolutionManagement {
     val toolsVersion: String by extra
 
     repositories {
+        mavenLocal()
         maven("https://repo.kotlin.link")
         mavenCentral()
+        gradlePluginPortal()
     }
 
     versionCatalogs {
@@ -21,4 +22,4 @@ dependencyResolutionManagement {
             from("ru.mipt.npm:version-catalog:$toolsVersion")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7dd9e6d61..7d9628621 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,11 +5,10 @@
 
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
+kotlin.native.ignoreDisabledTargets=true
 
 kotlin.jupyter.add.scanner=false
 
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
-
-toolsVersion=0.11.1-kotlin-1.6.10
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3001d000c..a8b473fee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,22 +3,6 @@ rootProject.name = "kmath"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
-dependencyResolutionManagement {
-
-    val toolsVersion: String by extra
-
-    repositories {
-        maven("https://repo.kotlin.link")
-        mavenCentral()
-    }
-
-    versionCatalogs {
-        create("npmlibs") {
-            from("ru.mipt.npm:version-catalog:$toolsVersion")
-        }
-    }
-}
-
 include(
     ":kmath-memory",
     ":kmath-complex",
-- 
2.34.1