Skip to content

Commit 45f98eb

Browse files
author
Abduqodiri Qurbonzoda
committed
Upgrade kotlin to 1.4.0 and enable HMPP
1 parent 83f094f commit 45f98eb

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
plugins {
1212
id 'maven-publish'
1313
id 'java-gradle-plugin'
14-
id 'org.jetbrains.kotlin.jvm' version "1.3.60"
14+
id 'org.jetbrains.kotlin.jvm' version "1.4.0"
1515
}
1616

1717
// Load `local.properties` file, if it exists. You can put your bintrayUser and bintrayApiKey values there, that file is ignored by git
@@ -60,9 +60,10 @@ dependencies {
6060
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: kotlin_version
6161
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
6262

63-
compile group: 'org.jetbrains.kotlin', name: 'kotlin-native-library-reader', version: kotlin_version, {
64-
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-compiler'
65-
}
63+
// compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-klib-metadata', version: kotlin_version
64+
// compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-klib', version: kotlin_version
65+
// compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-io', version: kotlin_version
66+
6667
compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-compiler', version: kotlin_version
6768
compileOnly group: 'org.jetbrains.kotlin.multiplatform', name: 'org.jetbrains.kotlin.multiplatform.gradle.plugin', version: kotlin_version
6869

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ bintrayRepository=kotlinx
1616
# Put name of your package here.
1717
bintrayPackage=kotlinx.team.infra
1818

19-
kotlin_version=1.3.60
19+
kotlin_version=1.4.0
2020
jmhVersion=1.21
2121

22+
kotlin.mpp.enableGranularSourceSetsMetadata=true
23+
kotlin.mpp.enableCompatibilityMetadataVariant=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

main/src/kotlinx/team/infra/api/DirectoryCompareTask.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ open class DirectoryCompareTask : DefaultTask() {
2020
@Optional
2121
val dummyOutputFile: File? = null
2222

23+
@Input
2324
var subject: String = "Directory comparison"
2425

2526
@TaskAction

0 commit comments

Comments
 (0)