[build] joint (step 1)

(cherry picked from commit 7d0775f7e69ab900200bcf1fa78b94d68e6bd4f6)
This commit is contained in:
Vasily Levchenko
2020-11-12 10:25:57 +01:00
parent cc9573a9a0
commit c85c3ac123
59 changed files with 822 additions and 637 deletions
@@ -6,7 +6,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
apply(from = "$rootDir/gradle/kotlinGradlePlugin.gradle")
apply(from = "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle")
}
plugins {
@@ -19,11 +19,7 @@ tasks.named<KotlinCompile>("compileKotlin") {
}
}
// Convert to normal strings since originally these properties contain GStrings.
val kotlinCompilerModule = rootProject.ext["kotlinCompilerModule"].toString()
val kotlinStdLibModule = rootProject.ext["kotlinStdLibModule"].toString()
dependencies {
api(kotlinStdLibModule)
implementation(kotlinCompilerModule)
api(project(":kotlin-stdlib"))
implementation(project(":kotlin-compiler"))
}
@@ -3,17 +3,11 @@
* that can be found in the LICENSE file.
*/
buildscript {
apply from: "$rootDir/gradle/kotlinGradlePlugin.gradle"
apply from: "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle"
}
apply plugin: 'kotlin'
repositories {
maven {
url buildKotlinCompilerRepo
}
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ['-Xskip-metadata-version-check']
@@ -22,9 +16,10 @@ compileKotlin {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation project(':backend.native')
implementation project(':Interop:StubGenerator')
implementation project(':klib')
implementation project(":utilities:basic-utils")
implementation project(":kotlin-stdlib")
implementation project(":kotlin-stdlib-common")
implementation project(':kotlin-native:backend.native')
implementation project(':kotlin-native:Interop:StubGenerator')
implementation project(':kotlin-native:klib')
implementation project(":kotlin-native:utilities:basic-utils")
}