From ab419b2d2f89a1ca10e0ad49f7a9377ff814e380 Mon Sep 17 00:00:00 2001
From: Ryan Harg <ryan.harg@mailbox.org>
Date: Mon, 29 Jul 2024 21:49:57 +0200
Subject: [PATCH] Fix packages and mage build

---
 .../main/kotlin/de/rpr/githubreleases/LocalDateAdapter.kt    | 4 ++--
 .../kotlin/de/rpr/githubreleases/LocalDateTimeAdapter.kt     | 5 ++---
 .../de/rpr/githubreleases/repository/ReleaseRepository.kt    | 4 ++--
 magefile.go                                                  | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/de/rpr/githubreleases/LocalDateAdapter.kt b/app/src/main/kotlin/de/rpr/githubreleases/LocalDateAdapter.kt
index 00851e3..4f88a19 100644
--- a/app/src/main/kotlin/de/rpr/githubreleases/LocalDateAdapter.kt
+++ b/app/src/main/kotlin/de/rpr/githubreleases/LocalDateAdapter.kt
@@ -1,4 +1,4 @@
-package de.rpr.terminenbg
+package de.rpr.githubreleases
 
 import com.google.gson.*
 import java.lang.reflect.Type
@@ -15,7 +15,7 @@ class LocalDateAdapter : JsonSerializer<LocalDate?>, JsonDeserializer<LocalDate?
     }
 
     override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): LocalDate? {
-        return LocalDate.parse(json?.asString, formatter)
+        return json?.asString?.let { LocalDate.parse(it, formatter) }
     }
 
 }
diff --git a/app/src/main/kotlin/de/rpr/githubreleases/LocalDateTimeAdapter.kt b/app/src/main/kotlin/de/rpr/githubreleases/LocalDateTimeAdapter.kt
index 57e2306..dff99c0 100644
--- a/app/src/main/kotlin/de/rpr/githubreleases/LocalDateTimeAdapter.kt
+++ b/app/src/main/kotlin/de/rpr/githubreleases/LocalDateTimeAdapter.kt
@@ -1,8 +1,7 @@
-package de.rpr.terminenbg
+package de.rpr.githubreleases
 
 import com.google.gson.*
 import java.lang.reflect.Type
-import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
@@ -18,7 +17,7 @@ class LocalDateTimeAdapter : JsonSerializer<LocalDateTime?>, JsonDeserializer<Lo
     }
 
     override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): LocalDateTime? {
-        return LocalDateTime.parse(json?.asString, formatter)
+        return json?.asString?.let { LocalDateTime.parse(it, formatter) }
     }
 
 }
diff --git a/app/src/main/kotlin/de/rpr/githubreleases/repository/ReleaseRepository.kt b/app/src/main/kotlin/de/rpr/githubreleases/repository/ReleaseRepository.kt
index c6c49fb..53e70fe 100644
--- a/app/src/main/kotlin/de/rpr/githubreleases/repository/ReleaseRepository.kt
+++ b/app/src/main/kotlin/de/rpr/githubreleases/repository/ReleaseRepository.kt
@@ -7,8 +7,8 @@ import de.rpr.githubreleases.model.GithubRepo
 import de.rpr.githubreleases.model.Release
 import de.rpr.githubreleases.model.Releases
 import de.rpr.githubreleases.model.asCollection
-import de.rpr.terminenbg.LocalDateAdapter
-import de.rpr.terminenbg.LocalDateTimeAdapter
+import de.rpr.githubreleases.LocalDateAdapter
+import de.rpr.githubreleases.LocalDateTimeAdapter
 import java.io.File
 import java.nio.file.Files
 import java.time.LocalDate
diff --git a/magefile.go b/magefile.go
index b1cb0f7..e742f73 100644
--- a/magefile.go
+++ b/magefile.go
@@ -11,7 +11,7 @@ const app = "github-release-bot"
 
 // Build builds and exports the application as a docker image tar file.
 func Build() error {
-	return sh.RunV("./gradlew", "build", "jibBuildTar")
+	return sh.RunV("./gradlew", "clean", "build", "jibBuildTar")
 }
 
 // Deploy deploys the application to a specified host via scp.