[gradle][publish] attempt to fix sample dependencies

This commit is contained in:
Vasily Levchenko
2018-04-25 00:53:40 +03:00
committed by ilmat192
parent 1947f3e64b
commit 89cc1b3abb
2 changed files with 4 additions and 13 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ subprojects {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:${project.property('konan.plugin.version')}"
classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+"
}
}
}
+3 -12
View File
@@ -46,18 +46,9 @@ group = 'org.jetbrains.kotlin'
// Gradle doesn't allow using the KonanVersion class defined in `shared` from this build.
// TODO: Investigate if we can workaround this issue in better way.
def metaVersion = project.findProperty("konanMetaVersion")?.toString()?.toLowerCase() ?: "dev"
switch (metaVersion) {
case "dev":
// Use a full build number (e.g. 0.7-dev-123) for dev builds to distinguish them.
version = project.findProperty("build.number")?.toString() ?: konanVersion
break
case "rel":
// Use the version specified for the project (e.g. 0.7) in case of release builds.
version = konanVersion
break
default:
// Just append the meta-version in other cases, e.g. 0.7-rc1, 0.7-beta
version = "$konanVersion-$metaVersion"
version = "$konanVersion-$metaVersion"
if (project.hasProperty("build.number")) {
version <<= "-${project.findProperty("build.number")?.toString().split('-')[2]}"
}
repositories {