Update multi-platform native build to 0.6 (#1)

android
ilmat192 6 years ago committed by Nikolay Igotti
parent 05159269f1
commit a081bba8ff
  1. 2
      build.gradle
  2. 4
      gradle.properties
  3. 22
      native/build.gradle

@ -8,7 +8,7 @@ buildscript {
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.moowork.gradle:gradle-node-plugin:$gradle_node_version" classpath "com.moowork.gradle:gradle-node-plugin:$gradle_node_version"
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+" classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$kotlin_native_version"
} }
} }

@ -6,6 +6,4 @@ npm_version = 5.5.1
kotlin.incremental.multiplatform=true kotlin.incremental.multiplatform=true
# Kotlin/Native compiler v0.5 doesn't support mutiplatform projects. kotlin_native_version = 0.6
# So we use a dev version which supports them.
konan.version=0.6-dev-822

@ -1,20 +1,22 @@
apply plugin: 'konan' apply plugin: 'konan'
konanArtifacts { konanArtifacts {
// TODO: commented out due to a failed assertion in the compiler. library('native') {
//library('native') { enableMultiplatform true
// srcDir 'src/main/kotlin' }
// srcDir project(':common').file('src/main/kotlin')
// extraOpts '-Xmulti-platform'
//}
program('native-test') { program('native-test') {
srcDir 'src/main/kotlin'
srcDir 'src/test/kotlin' srcDir 'src/test/kotlin'
srcDir project(':common').file('src/test/kotlin') commonSourceSet 'test'
srcDir project(':common').file('src/main/kotlin') libraries {
extraOpts '-tr', '-Xmulti-platform' artifact 'native'
}
extraOpts '-tr'
} }
} }
dependencies {
expectedBy project(':common')
}
task test(dependsOn: run) task test(dependsOn: run)
Loading…
Cancel
Save