fix: build script changes for github actions

Author: sureshg

.github/workflows/build.yml

@@ -186,7 +186,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        jdk: [ "openjdk:17-slim-buster", "openjdk:17-alpine" ]
+        jdk: [ "openjdk:18-slim-buster", "openjdk:17-alpine" ]
 
     defaults:
       run:

buildSrc/src/Deps.kt

@@ -194,7 +194,7 @@ object Deps {
 
     object ApiService {
       const val sdmv1 =
-        "com.google.apis:google-api-services-smartdevicemanagement:v1-rev20210604-1.31.0"
+        "com.google.apis:google-api-services-smartdevicemanagement:v1-rev20210604-1.31.5"
     }
 
     const val re2j = "com.google.re2j:re2j:1.5"
@@ -673,7 +673,7 @@ inline val PluginDependenciesSpec.springboot get() = id("org.springframework.boo
 inline val PluginDependenciesSpec.springDepMgmt get() = id("io.spring.dependency-management") version "1.0.9.RELEASE"
 
 // Static Analysis and Linting
-inline val PluginDependenciesSpec.spotless get() = id("com.diffplug.spotless") version "5.13.0"
+inline val PluginDependenciesSpec.spotless get() = id("com.diffplug.spotless") version "5.14.0"
 inline val PluginDependenciesSpec.spotlessChangelog get() = id("com.diffplug.spotless-changelog") version "2.2.0"
 inline val PluginDependenciesSpec.spotbugs get() = id("com.github.spotbugs") version "4.3.0"
 inline val PluginDependenciesSpec.ktlint get() = id("com.eden.orchidPlugin") version "9.3.0"

buildSrc/src/main/kotlin/plugins/common.gradle.kts

@@ -27,7 +27,8 @@ tasks {
       val uberJar = named("shadowJar", Jar::class)
       val jarFile = uberJar.get().archiveFile.get().asFile
 
-      val jdeps = ToolProvider.findFirst("jdeps").orElseGet { error("") }
+      val jdeps =
+        ToolProvider.findFirst("jdeps").orElseGet { error("jdeps tool is missing in the JDK!") }
       val out = StringWriter()
       val pw = PrintWriter(out)
       jdeps.run(pw, pw, "--print-module-deps", "--ignore-missing-deps", jarFile.absolutePath)
@@ -38,33 +39,32 @@ tasks {
     dependsOn("shadowJar")
   }
 
+
   val copyTemplates by registering(Copy::class) {
-    description = "Generate template classes."
+    description = "Generate template classes"
     group = LifecycleBasePlugin.BUILD_TASK_NAME
 
-    val configuredVersion = providers
-      .gradleProperty("version")
-      .forUseAtConfigurationTime()
-      .get()
-
-    val props = project.extra.properties
-    props["projectVersion"] = project.version
-    props["configuredVersion"] = configuredVersion
-    props["kotlinVersion"] = System.getProperty("kotlinVersion")
+    // Github actions workaround
+    val props = project.properties.toMutableMap()
+    props["git_branch"] = project.findProperty("branch_name")
+    props["git_tag"] = project.findProperty("base_tag")
 
-    val debug: String by project
+    val debug: String? by project
     if (debug.toBoolean()) {
       props.forEach { (t, u) ->
         println("%1\$-42s --> %2\$s".format(t, u))
       }
     }
 
     filteringCharset = "UTF-8"
-    inputs.property("buildversions", props.hashCode())
     from(project.projectDir.resolve("src/main/templates"))
     into(project.buildDir.resolve("generated-sources/templates/kotlin/main"))
     exclude { it.name.startsWith("jte") }
     expand(props)
+
+    // val configuredVersion = providers.gradleProperty("version").forUseAtConfigurationTime().get()
+    // expand("configuredVersion" to configuredVersion)
+    // inputs.property("buildversions", props.hashCode())
   }
 
   /**

gradle.properties

@@ -55,7 +55,7 @@ systemProp.jvmArguments=--enable-preview
 
 ## Application properties
 group=dev.suresh
-version=1.1.0
 appMainClass=dev.suresh.Main
 description=OpenJDK latest release playground!
 debug=false
+#version=2.0.0

src/main/java/JavaApp.java

@@ -99,8 +99,9 @@ public static void main(String[] args) throws Exception {
     out.println(stats);
 
     out.printf("%n✧✧✧✧✧ Streams ✧✧✧✧✧%n");
-    Stream.of("java", "kotlin", "scala")
+    Stream.of("java", "kotlin", "scala", " ")
         .map(String::toUpperCase)
+        .filter(s -> !s.isBlank())
         .mapMulti(
             (s, consumer) -> {
               consumer.accept(s);

src/main/kotlin/dev/suresh/jte/RenderJte.kt

@@ -18,7 +18,7 @@ class RenderJte {
       "ktConfig" to KtConfig(
         version = App.KOTLIN_VERSION,
         appVersion = App.VERSION
-      ),
+      )
     )
 
     listOf("hello.jte", "hello-kt.kte").forEach {

src/main/templates/App.kt

@@ -9,41 +9,45 @@
  * [semver]: https://semver.org
  */
 object App {
-    /**
-     * Application version.
-     */
-    const val VERSION = "$projectVersion"
+  /**
+   * Application version.
+   */
+  const val VERSION = "$version"
 
-    /**
-     * Application base version used for calculating the version.
-     */
-    const val BASE_VERSION = "$base_version"
+  /**
+   * Application base version used for calculating the version.
+   */
+  const val BASE_VERSION = "$base_version"
 
-    /**
-     * Java version used for building the app.
-     */
-    const val JAVA_VERSION = "${getProperty('systemProp.javaVersion')}"
+  /**
+   * Java version used for building the app.
+   */
+  const val JAVA_VERSION = "${getProperty('systemProp.javaVersion')}"
 
-    /**
-     * Kotlin library version.
-     */
-    const val KOTLIN_VERSION = "$kotlinVersion"
+  /**
+   * Kotlin library version.
+   */
+  const val KOTLIN_VERSION = "${getProperty('systemProp.kotlinVersion')}"
 
-    /**
-     * Gradle version
-     */
-    const val GRADLE_VERSION = "${getProperty('systemProp.gradleRelease')}"
+  /**
+   * Gradle version
+   */
+  const val GRADLE_VERSION = "${getProperty('systemProp.gradleRelease')}"
 
-    /**
-     * Git [Metadata](https://github.com/jgitver/jgitver/blob/master/src/main/java/fr/brouillard/oss/jgitver/metadata/Metadatas.java).
-     */
-    const val GIT_SHA1_8 = "$git_sha1_8"
+  /**
+   * Git [Metadata](https://github.com/jgitver/jgitver/blob/master/src/main/java/fr/brouillard/oss/jgitver/metadata/Metadatas.java).
+   */
+  const val GIT_SHA1_8 = "$git_sha1_8"
 
-    const val GIT_BRANCH = "$branch_name"
+  const val GIT_SHA1_FULL = "$git_sha1_full"
 
-    const val GIT_COMMIT_TIMESTAMP = "$commit_timestamp"
+  const val GIT_BRANCH = "$git_branch"
 
-    const val GIT_COMMITER_NAME = "$head_committer_name"
+  const val GIT_TAG = "$git_tag"
 
-    const val GIT_COMMITER_EMAIL = "$head_commiter_email"
+  const val GIT_COMMIT_TIMESTAMP = "$commit_timestamp"
+
+  const val GIT_COMMITER_NAME = "$head_committer_name"
+
+  const val GIT_COMMITER_EMAIL = "$head_commiter_email"
 }

src/main/templates/jte/hello-kt.kte

@@ -8,4 +8,18 @@
 App Version  = ${ktConfig.appVersion ?: "1.0.0"}
 ${config.language()} = ${config.version()}
 ${ktConfig.language} = ${ktConfig.version}
+----------Application Properties-----------
+VERSION              : ${App.VERSION}
+BASE_VERSION         : ${App.BASE_VERSION}
+JAVA_VERSION         : ${App.JAVA_VERSION}
+KOTLIN_VERSION       : ${App.KOTLIN_VERSION}
+GRADLE_VERSION       : ${App.GRADLE_VERSION}
+GIT_BRANCH           : ${App.GIT_BRANCH}
+GIT_TAG              : ${App.GIT_TAG}
+GIT_COMMITER_EMAIL   : ${App.GIT_COMMITER_EMAIL}
+GIT_COMMITER_NAME    : ${App.GIT_COMMITER_NAME}
+GIT_COMMIT_TIMESTAMP : ${App.GIT_COMMIT_TIMESTAMP}
+GIT_SHA1_8           : ${App.GIT_SHA1_8}
+GIT_SHA1_FULL        : ${App.GIT_SHA1_FULL}
+-------------------------------------------
 Rendered By Kotlin Jte on ${LocalDateTime.now().toString()}