Keep Kotlin/Native version in konan/konan.properties file
This commit is contained in:
committed by
Dmitriy Dolovov
parent
64cb79ab7a
commit
b05ddd4b4a
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.KotlinBuildPusher
|
|||||||
import org.jetbrains.kotlin.CollisionDetector
|
import org.jetbrains.kotlin.CollisionDetector
|
||||||
import org.jetbrains.kotlin.CollisionTransformer
|
import org.jetbrains.kotlin.CollisionTransformer
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
apply from: "gradle/kotlinGradlePlugin.gradle"
|
apply from: "gradle/kotlinGradlePlugin.gradle"
|
||||||
@@ -359,8 +360,16 @@ task distCompiler(type: Copy) {
|
|||||||
exclude('**/*.bat')
|
exclude('**/*.bat')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
from(project.file('konan')) {
|
from(project.file('konan')) {
|
||||||
into('konan')
|
into('konan')
|
||||||
|
exclude('**/*.properties')
|
||||||
|
}
|
||||||
|
|
||||||
|
from(project.file('konan')) {
|
||||||
|
into('konan')
|
||||||
|
include('**/*.properties')
|
||||||
|
filter(ReplaceTokens, tokens: [compilerVersion: konanVersionFull.toString()])
|
||||||
}
|
}
|
||||||
if (experimentalEnabled) {
|
if (experimentalEnabled) {
|
||||||
file('konan/experimentalTargetsEnabled').text = ""
|
file('konan/experimentalTargetsEnabled').text = ""
|
||||||
|
|||||||
@@ -686,3 +686,6 @@ clangOptFlags.wasm32 = -O3
|
|||||||
clangDebugFlags.wasm32 = -O0
|
clangDebugFlags.wasm32 = -O0
|
||||||
# TODO: make explicit list of external symbols
|
# TODO: make explicit list of external symbols
|
||||||
lld.wasm32 = --allow-undefined --no-entry --global-base=0 --no-threads --export-dynamic
|
lld.wasm32 = --allow-undefined --no-entry --global-base=0 --no-threads --export-dynamic
|
||||||
|
|
||||||
|
# The version of Kotlin/Native compiler
|
||||||
|
compilerVersion=@compilerVersion@
|
||||||
|
|||||||
Reference in New Issue
Block a user