From e4661db4e373f84519e5782b4ed0836db86d37e4 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 1 Jun 2020 20:23:11 +0300 Subject: [PATCH] Upgraded Gradle plugin --- build.gradle.kts | 2 +- core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f2b8e3fc..4f651bb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ buildscript { dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}") classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6") - classpath("com.android.tools.build:gradle:3.6.3") + classpath("com.android.tools.build:gradle:4.0.0") classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1") // This is for wrapping the .jar file into a standalone executable diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index 6146e903..7613c273 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -154,6 +154,8 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec lines.clear() for (tech in civInfo.gameInfo.ruleSet.technologies.values) { + if(!techNameToButton.containsKey(tech.name)) + throw Exception("tech ${tech.name} not found!") val techButton = techNameToButton[tech.name]!! for (prerequisite in tech.prerequisites) { val prerequisiteButton = techNameToButton[prerequisite]!! diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6c9ab59f..1861df4c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 25 23:34:18 IDT 2020 +#Mon Jun 01 02:27:12 IDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip