Skip to content

Commit 92ba439

Browse files
authored
Merge pull request #468 from mipt-npm/dev
Build fixes
2 parents df07571 + 0b2e8ff commit 92ba439

File tree

6 files changed

+10
-30
lines changed

6 files changed

+10
-30
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
plugins {
22
id("ru.mipt.npm.gradle.project")
3-
id("org.jetbrains.kotlinx.kover") version "0.5.0-RC"
3+
id("org.jetbrains.kotlinx.kover") version "0.5.0"
44
}
55

66
allprojects {
77
repositories {
8+
maven("https://repo.kotlin.link")
89
maven("https://oss.sonatype.org/content/repositories/snapshots")
910
mavenCentral()
1011
}
1112

1213
group = "space.kscience"
13-
version = "0.3.0-dev-19"
14+
version = "0.3.0-dev-20"
1415
}
1516

1617
subprojects {

buildSrc/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ plugins {
77
java.targetCompatibility = JavaVersion.VERSION_11
88

99
repositories {
10+
mavenLocal()
1011
maven("https://repo.kotlin.link")
1112
mavenCentral()
1213
gradlePluginPortal()
1314
}
1415

1516
val toolsVersion: String by extra
1617
val kotlinVersion = npmlibs.versions.kotlin.asProvider().get()
17-
val benchmarksVersion = "0.4.2"
18+
val benchmarksVersion = npmlibs.versions.kotlinx.benchmark.get()
1819

1920
dependencies {
2021
api("ru.mipt.npm:gradle-tools:$toolsVersion")

buildSrc/gradle.properties

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,5 @@
44
#
55

66
kotlin.code.style=official
7-
kotlin.mpp.stability.nowarn=true
87

9-
kotlin.jupyter.add.scanner=false
10-
11-
org.gradle.configureondemand=true
12-
org.gradle.parallel=true
13-
14-
toolsVersion=0.10.9-kotlin-1.6.10
8+
toolsVersion=0.11.1-kotlin-1.6.10

buildSrc/settings.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
76
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
87
enableFeaturePreview("VERSION_CATALOGS")
98

@@ -12,13 +11,15 @@ dependencyResolutionManagement {
1211
val toolsVersion: String by extra
1312

1413
repositories {
14+
mavenLocal()
1515
maven("https://repo.kotlin.link")
1616
mavenCentral()
17+
gradlePluginPortal()
1718
}
1819

1920
versionCatalogs {
2021
create("npmlibs") {
2122
from("ru.mipt.npm:version-catalog:$toolsVersion")
2223
}
2324
}
24-
}
25+
}

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55

66
kotlin.code.style=official
77
kotlin.mpp.stability.nowarn=true
8+
kotlin.native.ignoreDisabledTargets=true
89

910
kotlin.jupyter.add.scanner=false
1011

1112
org.gradle.configureondemand=true
1213
org.gradle.parallel=true
1314
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
14-
15-
toolsVersion=0.11.1-kotlin-1.6.10

settings.gradle.kts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,6 @@ rootProject.name = "kmath"
33
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
44
enableFeaturePreview("VERSION_CATALOGS")
55

6-
dependencyResolutionManagement {
7-
8-
val toolsVersion: String by extra
9-
10-
repositories {
11-
maven("https://repo.kotlin.link")
12-
mavenCentral()
13-
}
14-
15-
versionCatalogs {
16-
create("npmlibs") {
17-
from("ru.mipt.npm:version-catalog:$toolsVersion")
18-
}
19-
}
20-
}
21-
226
include(
237
":kmath-memory",
248
":kmath-complex",

0 commit comments

Comments
 (0)