diff --git a/build.gradle.kts b/build.gradle.kts index ef56dd759..ddb8f8ffd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,11 +58,11 @@ allprojects { apply(plugin = "com.gorylenko.gradle-git-properties") // 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") != "") - version = version as String + "-" + property("versionFork") as String + version = "${version as String}-${property("versionFork") as String}" if (property("versionCompanion") != "") - version = version as String + "+" + property("versionCompanion") as String + version = "${version as String}+${property("versionCompanion") as String}" // Repositories repositories { @@ -79,16 +79,16 @@ allprojects { kotlin.sourceSets.main { dependencies { - implementation(property("dependencyKotlinReflectIdentifier") as String + ":" + property("dependencyKotlinReflectVersion") as String) - implementation(property("dependencyKotlinDateTimeIdentifier") as String + ":" + property("dependencyKotlinDateTimeVersion") as String) + implementation("${property("dependencyKotlinReflectIdentifier") as String}:${property("dependencyKotlinReflectVersion") as String}") + implementation("${property("dependencyKotlinDateTimeIdentifier") as String}:${property("dependencyKotlinDateTimeVersion") as String}") } } // Java java { // Java version - sourceCompatibility = JavaVersion.valueOf("VERSION_" + property("java") as String) - targetCompatibility = JavaVersion.valueOf("VERSION_" + property("java") as String) + sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}") + targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}") toolchain { languageVersion = JavaLanguageVersion.of(property("java") as String)