Skip to content

Commit 02c95be

Browse files
authored
Merge pull request #52 from Kotlin/v0.1.0
V0.1.0
2 parents cd26d4e + 073511b commit 02c95be

File tree

114 files changed

+15804
-3333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+15804
-3333
lines changed

build.gradle.kts

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,38 @@ buildscript {
1111
}
1212

1313
plugins {
14-
val kotlinVersion: String by System.getProperties()
15-
kotlin("jvm") version kotlinVersion
14+
val kotlin_version: String by System.getProperties()
15+
val nexus_version: String by System.getProperties()
1616

17-
id("io.codearte.nexus-staging") version "0.22.0"
17+
kotlin("jvm") version kotlin_version
18+
id("io.codearte.nexus-staging") version nexus_version
1819
}
1920

20-
val kotlinVersion: String by System.getProperties()
21-
val multikVersion: String by project
22-
val unpublished = listOf("multik", "examples")
21+
val kotlin_version: String by System.getProperties()
22+
val multik_version: String by project
23+
val unpublished = listOf("multik", "multik_jni")
2324

2425
allprojects {
2526
repositories {
2627
mavenCentral()
2728
}
2829

2930
group = "org.jetbrains.kotlinx"
30-
version = multikVersion
31+
version = multik_version
3132

3233
tasks.withType<KotlinCompile> {
3334
kotlinOptions.jvmTarget = "1.8"
3435
}
3536
}
3637

3738
subprojects {
38-
apply(plugin = "kotlin")
39+
if (!this.name.contains("jni")) {
40+
apply(plugin = "kotlin")
3941

40-
dependencies {
41-
testImplementation(kotlin("test"))
42-
testImplementation(kotlin("test-junit"))
42+
dependencies {
43+
testImplementation(kotlin("test"))
44+
testImplementation(kotlin("test-junit"))
45+
}
4346
}
4447
}
4548

gradle.properties

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
kotlin.code.style=official
2-
systemProp.kotlinVersion=1.4.20
3-
multikVersion=0.0.1
2+
3+
multik_version=0.1.0
4+
5+
systemProp.kotlin_version=1.5.31
6+
systemProp.nexus_version=0.22.0
7+
systemProp.dokka_version=1.5.31
8+
9+
openblas_version=0.3.18
10+
common_csv_version=1.9.0

gradle/openblas.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,30 @@
44

55

66
ext {
7-
openblasBranch = 'v0.3.13'
8-
openblasRoot = '0.3.13'
7+
openblasBranch = "v$openblas_version"
8+
openblasRoot = openblas_version
99
}
1010

1111
buildscript {
1212
repositories {
13-
jcenter()
13+
maven {
14+
url "https://plugins.gradle.org/m2/"
15+
}
1416
}
1517

1618
dependencies {
17-
classpath 'de.undercouch:gradle-download-task:3.4.3'
19+
classpath 'de.undercouch:gradle-download-task:4.1.2'
1820
}
1921
}
2022

21-
apply plugin: de.undercouch.gradle.tasks.download.DownloadTaskPlugin
23+
apply plugin: 'de.undercouch.download'
2224

2325
static boolean isWindows() {
2426
return System.getProperty('os.name').toLowerCase().contains('windows')
2527
}
2628

2729

28-
task downloadOpenBlas(type: de.undercouch.gradle.tasks.download.Download) {
30+
task downloadOpenBlas(type: Download) {
2931
if (!isWindows()) {
3032
src "https://github.com/xianyi/OpenBLAS/archive/${openblasBranch}.zip"
3133
} else {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Thu Apr 09 14:05:51 MSK 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

multik-api/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
*/
44

55
plugins {
6-
id("org.jetbrains.dokka") version "1.4.10.2"
6+
val dokka_version: String by System.getProperties()
7+
8+
id("org.jetbrains.dokka") version dokka_version
79
}
810

911
kotlin {
1012
explicitApi()
1113
}
1214

15+
val common_csv_version: String by project
1316
dependencies {
1417
implementation(kotlin("reflect"))
18+
implementation("org.apache.commons:commons-csv:$common_csv_version")
1519
}
1620

1721

0 commit comments

Comments
 (0)