Skip to content

Commit 2c530b8

Browse files
h0tk3yAbduqodiri Qurbonzoda
authored andcommitted
Upgrade kotlin to 1.4.0
1 parent e927eac commit 2c530b8

File tree

11 files changed

+23
-8
lines changed

11 files changed

+23
-8
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buildscript {
22
repositories {
3+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
34
jcenter()
45
gradlePluginPortal()
56
maven { url 'https://dl.bintray.com/kotlin/kotlinx' }

examples/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ version '0.1-SNAPSHOT'
33

44
subprojects {
55
repositories {
6+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
7+
68
maven {
79
name = 'build'
810
url = "$rootProject.buildDir/maven"

examples/kotlin-kts/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
77
plugins {
88
java
99
kotlin("jvm")
10-
kotlin("plugin.allopen") version "1.3.50"
10+
kotlin("plugin.allopen") version "1.4.0"
1111
id("kotlinx.benchmark") version "0.2.0"
1212
}
1313

examples/kotlin-multiplatform/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'org.jetbrains.kotlin.multiplatform'
3-
id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.50"
3+
id 'org.jetbrains.kotlin.plugin.allopen' version "1.4.0"
44
id 'kotlinx.benchmark' version "0.2.0"
55
}
66

@@ -74,6 +74,7 @@ kotlin {
7474
}
7575

7676
nativeMain {
77+
dependsOn commonMain
7778
dependencies {
7879
}
7980
}

examples/kotlin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java'
33
id 'org.jetbrains.kotlin.jvm'
4-
id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.50"
4+
id 'org.jetbrains.kotlin.plugin.allopen' version "1.4.0"
55
id 'kotlinx.benchmark' version '0.2.0'
66
}
77

gradle.properties

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ group = org.jetbrains.kotlinx
33
version = 0.2.0
44

55
kotlin.code.style=official
6-
kotlin_version=1.3.70
6+
kotlin_version=1.4.0
77
jmhVersion=1.21
88
junit_version=4.12
99

@@ -14,3 +14,7 @@ npm_version = 5.7.1
1414

1515
kotlin.incremental.multiplatform=true
1616
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
17+
18+
# Workaround for Bintray treating .sha512 files as artifacts
19+
# https://github.com/gradle/gradle/issues/11412
20+
systemProp.org.gradle.internal.publish.checksums.insecure=true

plugin/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buildscript {
22
repositories {
3+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
34
mavenCentral()
45
jcenter()
56
maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
@@ -34,6 +35,7 @@ infra {
3435
}
3536

3637
repositories {
38+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
3739
mavenCentral()
3840
jcenter()
3941
gradlePluginPortal()
@@ -62,6 +64,7 @@ sourceSets {
6264
}
6365

6466
dependencies {
67+
compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
6568
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version
6669
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: kotlin_version
6770
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
@@ -74,6 +77,7 @@ dependencies {
7477
compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-io', version: kotlin_version
7578

7679
compileOnly group: 'org.jetbrains.kotlin.multiplatform', name: 'org.jetbrains.kotlin.multiplatform.gradle.plugin', version: kotlin_version
80+
compileOnly "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
7781
compileOnly "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" // used in worker
7882

7983
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"

plugin/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ group = org.jetbrains.kotlinx
66

77
# Put link to your OSS repository. Bintray requires this to be filled for free OpenSource tiers.
88
vcs=https://github.com/kotlin/kotlinx-benchmark
9-
10-
kotlin_version=1.3.70
9+
10+
kotlin_version=1.4.0
1111
jmhVersion=1.21
1212
junit_version=4.12
1313
infra_version=0.1.0-dev-53

runtime/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buildscript {
22
repositories {
3+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
34
mavenCentral()
45
jcenter()
56
}
@@ -10,6 +11,7 @@ plugins {
1011
}
1112

1213
repositories {
14+
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
1315
mavenCentral()
1416
}
1517

@@ -79,6 +81,7 @@ kotlin {
7981
}
8082

8183
nativeMain {
84+
dependsOn commonMain
8285
dependencies {
8386
}
8487
}

runtime/commonMain/src/kotlinx/benchmark/IntelliJLog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private fun ByteArray.encodeBase64(): String {
103103
repeat(padSize) { result.add(BASE64_PAD) }
104104
}
105105

106-
return String(result.toCharArray())
106+
return result.toCharArray().concatToString()
107107
}
108108

109109
expect fun String.toByteArrayUtf8(): ByteArray

0 commit comments

Comments
 (0)