20240917

a-sit-plus · Sep 17, 2024 · 40b3abb · 40b3abb
1 parent 1e8b233
commit 40b3abb
Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# Dual-Version Kotlin 1.9.10 / 2.0.0
+# Dual-Version Kotlin 1.9.10 / 2.0.20
+
+## 20240917
+* Coroutines 1.9.0
+* Kotest plugin 6.0.0-20240905.065253-61
+* Kotest dependencies 5.9.1
+* Print out build date in plugin info
 
 ## 20240905
 * Pin Kotest Snapshot version to 6.0.0-20240905.065253-61

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # A-SIT Plus Gradle Conventions Plugin
 
-[![Version](https://img.shields.io/badge/Kotlin_1.9.10-+20240905-gray.svg?style=flat&logo=kotlin&labelColor=blue&logoColor=white)](CHANGELOG.md)
-[![Version](https://img.shields.io/badge/Kotlin_2.0.20-+20240905-gray.svg?style=flat&logo=kotlin&labelColor=7463ce&logoColor=white)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Kotlin_2.0.20-+20240917-gray.svg?style=flat&logo=kotlin&labelColor=7463ce&logoColor=white)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Kotlin_1.9.10-+20240917-gray.svg?style=flat&logo=kotlin&labelColor=blue&logoColor=white)](CHANGELOG.md)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-brightgreen.svg?style=flat&)](http://www.apache.org/licenses/LICENSE-2.0)
 
 **Note: This plugin is used internally at A-SIT Plus and there are no guarantees whatsoever wrt. stability, reliability, and even making any sense at all.

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-buildDate=20240905
+buildDate=20240917
 groupId=at.asitplus.gradle
diff --git a/k2/build.gradle.kts b/k2/build.gradle.kts
@@ -20,7 +20,7 @@ val buildDate: String by extra
 
 val kotlinVersion = versions["kotlin"] as String
 val ksp = "$kotlinVersion-${versions["ksp"]}"
-val kotest = versions["kotest"]
+val kotest = versions["kotest-plugin"]
 
 version = "$kotlinVersion+$buildDate"
 group = groupId

diff --git a/k2/src/main/resources/k2versions.properties b/k2/src/main/resources/k2versions.properties
@@ -1,4 +1,6 @@
 kotlin=2.0.20
 ksp=1.0.24
-kotest=6.0.0-20240905.065253-61
-serialization=1.7.2
+kotest=5.9.1
+kotest-plugin=6.0.0-20240905.065253-61
+serialization=1.7.2
+coroutines=1.9.0
diff --git a/legacy/build.gradle.kts b/legacy/build.gradle.kts
@@ -16,6 +16,10 @@ private val versions = Properties().apply {
 val groupId: String by extra
 val buildDate: String by extra
 
+project.file("src/main/kotlin/BuildDate.kt").bufferedWriter().use { writer ->
+    writer.write("package at.asitplus.gradle\nval buildDate = \"$buildDate\"")
+}
+
 val kotlinVersion = versions["kotlin"] as String
 val ksp = "$kotlinVersion-${versions["ksp"]}"
 

diff --git a/legacy/src/main/kotlin/at/asitplus/gradle/Plugin.kt b/legacy/src/main/kotlin/at/asitplus/gradle/Plugin.kt
@@ -106,7 +106,7 @@ open class AspLegacyConventions : Plugin<Project> {
                 versionOverrides(it)
             }
         Logger.lifecycle(
-            "\n ASP Conventions ${H}${target.AspVersions.versions["kotlin"]}$R is using the following dependency versions for project ${
+            "\n ASP Conventions ${H}${target.AspVersions.versions["kotlin"]}+$buildDate$R is using the following dependency versions for project ${
                 if (target == target.rootProject) target.name
                 else "${target.rootProject.name}:${target.name}"
             }:"