Revert "Depend on kotlin-native-shared from a separate repo"

This reverts commit a2370920db.
This commit is contained in:
Ilya Matveev
2019-05-27 16:24:28 +03:00
committed by Ilya Matveev
parent 99561ab92f
commit 5745b31853
79 changed files with 4199 additions and 257 deletions
+1 -1
View File
@@ -18,10 +18,10 @@ buildscript {
ext.rootBuildDirectory = file('../..')
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
apply from: "$rootBuildDirectory/gradle/kotlinNativeShared.gradle"
dependencies {
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
}
}
apply plugin: 'kotlin'
+1 -1
View File
@@ -21,10 +21,10 @@ buildscript {
ext.rootBuildDirectory = file('../..')
apply from: "$rootBuildDirectory/gradle/kotlinGradlePlugin.gradle"
apply from: "$rootBuildDirectory/gradle/kotlinNativeShared.gradle"
dependencies {
classpath "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
}
}
import org.jetbrains.kotlin.konan.target.ClangArgs
+1 -1
View File
@@ -34,7 +34,7 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$buildKotlinVersion"
compile "org.jetbrains.kotlin:kotlin-compiler:$buildKotlinVersion"
compile project(':Interop:Indexer')
compile kotlinNativeSharedModule
compile "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
}
compileKotlin {