From 42b113a599f89233148ba1bca658846abcee01c8 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 30 Aug 2023 16:48:52 +0200
Subject: [PATCH] ci: fix build failures with wrong jdk baseimage
---
.gitlab-ci.yml | 2 +-
.../src/main/kotlin/AndroidApplicationConvention.kt | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eeebd2f62..b251e96e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "k8r.eu/justjanne/android-sdk:dfb791e9"
+image: "k8r.eu/justjanne/android-sdk:eef7852b"
cache:
key: "$CI_PROJECT_NAME"
diff --git a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
index f8b6348f7..034284bbc 100644
--- a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
+++ b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
@@ -24,13 +24,14 @@ class AndroidApplicationConvention : Plugin<Project> {
applicationId = "${rootProject.group}.${rootProject.name.lowercase(Locale.ROOT)}"
- val commit = git("rev-parse", "HEAD")!!
- val name = git("describe", "--always", "--tags", "HEAD")!!
+ val commit = git("rev-parse", "HEAD")
+ val name = git("describe", "--always", "--tags", "HEAD")
- versionCode = git("rev-list", "--count", "HEAD")!!.toInt()
- versionName = git("describe", "--always", "--tags", "HEAD")!!
+ versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull()
+ versionName = git("describe", "--always", "--tags", "HEAD")
- val fancyVersionName = "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
+ val fancyVersionName = if (commit == null || name == null) name
+ else "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
buildConfigField("String", "GIT_HEAD", "\"${git("rev-parse", "HEAD") ?: ""}\"")
buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName ?: ""}\"")
--
GitLab