From 984293c2522e70ff56f46b1443fbf7286d9f7ff7 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 20 May 2021 00:46:39 +0300
Subject: [PATCH] 3.14.9-patch1 Apparently Float.min doesn't work on older
 versions of Java. Appears here:
 https://docs.oracle.com/javase/8/docs/api/java/lang/Float.html but not here:
 https://docs.oracle.com/javase/7/docs/api/java/lang/Float.html  Hate you,
 Java. Why do you insist on not being Kotlin.

---
 buildSrc/src/main/kotlin/BuildConfig.kt                | 4 ++--
 core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt | 2 +-
 core/src/com/unciv/ui/pickerscreens/TechButton.kt      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index f299df15e2..21dde15419 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 567
-    const val appVersion = "3.14.9"
+    const val appCodeNumber = 568
+    const val appVersion = "3.14.9-patch1"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
index d7a5f01b2d..46c5e6f18d 100644
--- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
@@ -17,8 +17,8 @@ import com.unciv.models.ruleset.unit.BaseUnit
 import com.unciv.models.stats.Stat
 import com.unciv.models.translations.tr
 import com.unciv.ui.utils.*
-import java.lang.Float.min
 import kotlin.concurrent.thread
+import kotlin.math.min
 import com.unciv.ui.utils.AutoScrollPane as ScrollPane
 
 class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScreen.skin) {
diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
index 77c9fe1b7b..bd45d31835 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Align
 import com.unciv.logic.civilization.TechManager
 import com.unciv.ui.utils.*
-import java.lang.Float.min
+import kotlin.math.min
 
 class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(CameraStageBaseScreen.skin) {
     val text = "".toLabel().apply { setAlignment(Align.center) }