Update gradle.properties naming scheme

This commit is contained in:
JeremyStar™ 2024-12-19 02:49:32 +01:00
parent b602897ff4
commit 8b15e8a84e
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
4 changed files with 27 additions and 26 deletions

View file

@ -75,10 +75,10 @@ allprojects {
// Dependencies // Dependencies
dependencies { dependencies {
// Kotlin support // Kotlin support
kotlin(property("dependencyKotlinStdIdentifier") as String) kotlin(property("dependencyKotlin_StdIdentifier") as String)
kotlin(property("dependencyKotlinStdJavaIdentifier") as String) kotlin(property("dependencyKotlin_StdLibIdentifier") as String)
implementation("${property("dependencyKotlinReflectIdentifier") as String}:${property("dependencyKotlinReflectVersion") as String}") implementation("${property("dependencyKotlin_ReflectIdentifier") as String}:${property("dependencyKotlinVersion") as String}")
implementation("${property("dependencyKotlinDateTimeIdentifier") as String}:${property("dependencyKotlinDateTimeVersion") as String}") implementation("${property("dependencyKotlin_DateTimeIdentifier") as String}:${property("dependencyKotlin_DateTimeVersion") as String}")
// OSHI // OSHI
implementation("${property("dependencyOshiIdentifier") as String}:${property("dependencyOshiVersion") as String}") implementation("${property("dependencyOshiIdentifier") as String}:${property("dependencyOshiVersion") as String}")
@ -87,9 +87,9 @@ allprojects {
// -> Kotlin // -> Kotlin
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
// -> JUnit // -> JUnit
testImplementation(platform("${property("testDependencyJUnitBOMIdentifier")}:${property("testDependencyJUnitVersion")}")) testImplementation(platform("${property("testDependencyJUnit_BOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
testImplementation("${property("testDependencyJUnitJupiterIdentifier")}") testImplementation("${property("testDependencyJUnit_JupiterIdentifier")}")
testRuntimeOnly("${property("testDependencyJUnitPlatformLauncherIdentifier")}") testRuntimeOnly("${property("testDependencyJUnit_PlatformIdentifier")}")
// -> sos!engine // -> sos!engine
testImplementation(project(":testing")) testImplementation(project(":testing"))
} }
@ -97,12 +97,12 @@ allprojects {
// Java // Java
java { java {
// Java version // Java version
sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}") sourceCompatibility = JavaVersion.valueOf("VERSION_${property("languageJava") as String}")
targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}") targetCompatibility = JavaVersion.valueOf("VERSION_${property("languageJava") as String}")
if (!(hasProperty("java.skipToolchainSpecification") && property("java.skipToolchainSpecification") as String == "true")) if (!(hasProperty("java.skipToolchainSpecification") && property("java.skipToolchainSpecification") as String == "true"))
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(property("java") as String) languageVersion = JavaLanguageVersion.of(property("languageJava") as String)
} }
} }
@ -114,7 +114,7 @@ allprojects {
verbose = true verbose = true
// Set target metadata // Set target metadata
jvmTarget = JvmTarget.valueOf("JVM_${property("java") as String}") jvmTarget = JvmTarget.valueOf("JVM_${property("languageJava") as String}")
} }
// Unit testing // Unit testing
@ -196,7 +196,7 @@ allprojects {
dotGitDirectory = file("${rootProject.rootDir}/.git") dotGitDirectory = file("${rootProject.rootDir}/.git")
failOnNoGitDirectory = false // Allow continuing if .git directory is missing (tarball) failOnNoGitDirectory = false // Allow continuing if .git directory is missing (tarball)
extProperty = "git" extProperty = "git"
dateFormat = "yyyy-MM-dd'T'HH:mmZ" dateFormat = "yyyy-MM-dd'T'HH:mm:ss.S'Z'"
dateFormatTimeZone = "UTC" dateFormatTimeZone = "UTC"
} }
// -> Copy task // -> Copy task

View file

@ -21,7 +21,7 @@
// Dependencies // Dependencies
dependencies { dependencies {
// Kotlin support // Kotlin support
kotlin(property("dependencyKotlinStdIdentifier") as String) kotlin(property("dependencyKotlin_StdIdentifier") as String)
// sos!engine // sos!engine
implementation(project(":base")) implementation(project(":base"))

View file

@ -32,15 +32,16 @@ versionFork=
versionCompanion= versionCompanion=
# Language versions # Language versions
java=21 languageJava=21
languageKotlin=2.1.0
# Dependencies # Dependencies
dependencyKotlinStdIdentifier=stdlib dependencyKotlinVersion=2.1.0
dependencyKotlinStdJavaIdentifier=stdlib-jdk21 dependencyKotlin_StdIdentifier=stdlib
dependencyKotlinReflectIdentifier=org.jetbrains.kotlin:kotlin-reflect dependencyKotlin_StdLibIdentifier=stdlib-jdk21
dependencyKotlinReflectVersion=2.1.0 dependencyKotlin_ReflectIdentifier=org.jetbrains.kotlin:kotlin-reflect
dependencyKotlinDateTimeIdentifier=org.jetbrains.kotlinx:kotlinx-datetime dependencyKotlin_DateTimeIdentifier=org.jetbrains.kotlinx:kotlinx-datetime
dependencyKotlinDateTimeVersion=0.6.1 dependencyKotlin_DateTimeVersion=0.6.1
dependencyOshiIdentifier=com.github.oshi:oshi-core-java11 dependencyOshiIdentifier=com.github.oshi:oshi-core-java11
dependencyOshiVersion=6.6.5 dependencyOshiVersion=6.6.5
dependencyJansiIdentifier=org.fusesource:jansi dependencyJansiIdentifier=org.fusesource:jansi
@ -48,6 +49,6 @@ dependencyJansiVersion=2.4.1
# Test dependencies # Test dependencies
testDependencyJUnitVersion=5.11.3 testDependencyJUnitVersion=5.11.3
testDependencyJUnitBOMIdentifier=org.junit:junit-bom testDependencyJUnit_BOMIdentifier=org.junit:junit-bom
testDependencyJUnitJupiterIdentifier=org.junit.jupiter:junit-jupiter testDependencyJUnit_JupiterIdentifier=org.junit.jupiter:junit-jupiter
testDependencyJUnitPlatformLauncherIdentifier=org.junit.platform:junit-platform-launcher testDependencyJUnit_PlatformIdentifier=org.junit.platform:junit-platform-launcher

View file

@ -21,7 +21,7 @@
// Dependencies // Dependencies
dependencies { dependencies {
// Kotlin support // Kotlin support
kotlin(property("dependencyKotlinStdIdentifier") as String) kotlin(property("dependencyKotlin_StdIdentifier") as String)
// sos!engine // sos!engine
implementation(project(":base")) implementation(project(":base"))
@ -30,6 +30,6 @@ dependencies {
// -> Kotlin // -> Kotlin
implementation(kotlin("test")) implementation(kotlin("test"))
// -> JUnit // -> JUnit
implementation(platform("${property("testDependencyJUnitBOMIdentifier")}:${property("testDependencyJUnitVersion")}")) implementation(platform("${property("testDependencyJUnit_BOMIdentifier")}:${property("testDependencyJUnitVersion")}"))
implementation("${property("testDependencyJUnitJupiterIdentifier")}") implementation("${property("testDependencyJUnit_JupiterIdentifier")}")
} }