Use string templates
This commit is contained in:
parent
083bd022bc
commit
c78cb4eb75
1 changed files with 7 additions and 7 deletions
|
@ -58,11 +58,11 @@ allprojects {
|
||||||
apply(plugin = "com.gorylenko.gradle-git-properties")
|
apply(plugin = "com.gorylenko.gradle-git-properties")
|
||||||
|
|
||||||
// Version
|
// Version
|
||||||
version = property("versionRelease") as String + "-" + property("versionType") as String + property("versionTyperelease") as String
|
version = "${property("versionRelease") as String}-${property("versionType") as String}${property("versionTyperelease") as String}"
|
||||||
if (property("versionFork") != "")
|
if (property("versionFork") != "")
|
||||||
version = version as String + "-" + property("versionFork") as String
|
version = "${version as String}-${property("versionFork") as String}"
|
||||||
if (property("versionCompanion") != "")
|
if (property("versionCompanion") != "")
|
||||||
version = version as String + "+" + property("versionCompanion") as String
|
version = "${version as String}+${property("versionCompanion") as String}"
|
||||||
|
|
||||||
// Repositories
|
// Repositories
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -79,16 +79,16 @@ allprojects {
|
||||||
|
|
||||||
kotlin.sourceSets.main {
|
kotlin.sourceSets.main {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(property("dependencyKotlinReflectIdentifier") as String + ":" + property("dependencyKotlinReflectVersion") as String)
|
implementation("${property("dependencyKotlinReflectIdentifier") as String}:${property("dependencyKotlinReflectVersion") as String}")
|
||||||
implementation(property("dependencyKotlinDateTimeIdentifier") as String + ":" + property("dependencyKotlinDateTimeVersion") as String)
|
implementation("${property("dependencyKotlinDateTimeIdentifier") as String}:${property("dependencyKotlinDateTimeVersion") as String}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Java
|
// Java
|
||||||
java {
|
java {
|
||||||
// Java version
|
// Java version
|
||||||
sourceCompatibility = JavaVersion.valueOf("VERSION_" + property("java") as String)
|
sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
||||||
targetCompatibility = JavaVersion.valueOf("VERSION_" + property("java") as String)
|
targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
||||||
|
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion = JavaLanguageVersion.of(property("java") as String)
|
languageVersion = JavaLanguageVersion.of(property("java") as String)
|
||||||
|
|
Loading…
Reference in a new issue