azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve tooling model + add Gradle version checking (#1602)

Browse Source 
* [gradle-plugin] Add tests for IDE model
* [gradle-plugin] Check Gradle version
* [gradle-plugin] Provide language, api and konan version in the model
* [gradle-plugin] Use String instead of KonanTarget in the IDE model
* [gradle-plugin] Rename Produce -> KonanOutput
* [version] Make KonanVersion an interface to allow passing it to IDE
* [gradle-plugin] Replace KonanOutput with CompilerOutputKind
* [gradle-plugin] Don't override usual jar with a fat one
* [gradle-plugin] Fix IDE model tests
* [gradle-plugin] Add library search paths in IDE model
* [gradle-plugin] Use 4.7 as a required version for the plugin
* [gradle-plugin] "Kotlinfy" the version check
This commit is contained in:
ilmat192
2018-05-23 11:58:47 +07:00
committed by GitHub
parent 74e1783e2b
commit bc65c7175d
15 changed files with 441 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+7 -6
View File
@@ -40,7 +40,8 @@ ext {
kotlinReflectModule="org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
kotlinScriptRuntimeModule="org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}"
gradlePluginVersion = KonanVersion.CURRENT.gradlePluginVersion
konanVersionFull = KonanVersion.Companion.CURRENT
gradlePluginVersion = konanVersionFull.toString()
}
allprojects {
@@ -345,7 +346,7 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
dependsOn('crossDistPlatformLibs')
dependsOn('crossDist')
def simpleOsName = HostManager.simpleOsName()
baseName = "kotlin-native-$simpleOsName-${KonanVersion.CURRENT}"
baseName = "kotlin-native-$simpleOsName-$konanVersionFull"
from("$project.rootDir/dist") {
include '**'
exclude 'dependencies'
@@ -403,7 +404,7 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
task uploadBundle {
dependsOn ':bundle'
doLast {
def kind = (KonanVersion.CURRENT.meta == MetaVersion.DEV) ? "dev" : "releases"
def kind = (konanVersionFull.meta == MetaVersion.DEV) ? "dev" : "releases"
def ftpSettings = [
server: project.findProperty("cdnUrl") ?: System.getenv("CDN_URL"),
userid: project.findProperty("cdnUser") ?: System.getenv("CDN_USER"),
@@ -430,9 +431,9 @@ task performance {
task teamcityKonanVersion {
doLast {
println("##teamcity[setParameter name='kotlin.native.version.base' value='$konanVersion']")
println("##teamcity[setParameter name='kotlin.native.version.full' value='$KonanVersion.CURRENT']")
println("##teamcity[setParameter name='kotlin.native.version.meta' value='${KonanVersion.CURRENT.meta.toString().toLowerCase()}']")
println("##teamcity[buildNumber '${KonanVersion.CURRENT.toString(true, true)}']")
println("##teamcity[setParameter name='kotlin.native.version.full' value='$konanVersionFull']")
println("##teamcity[setParameter name='kotlin.native.version.meta' value='${konanVersionFull.meta.toString().toLowerCase()}']")
println("##teamcity[buildNumber '${konanVersionFull.toString(true, true)}']")
}
}