wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded Gradle plugin

Browse source
This commit is contained in:
Yair Morgenstern 2020-06-01 20:23:11 +03:00
parent d77415de8d
commit e4661db4e3
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -21,7 +21,7 @@ buildscript {
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}")
classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6") 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") classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1")
// This is for wrapping the .jar file into a standalone executable // This is for wrapping the .jar file into a standalone executable

2
core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
View file

@ -154,6 +154,8 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
lines.clear() lines.clear()
for (tech in civInfo.gameInfo.ruleSet.technologies.values) { 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]!! val techButton = techNameToButton[tech.name]!!
for (prerequisite in tech.prerequisites) { for (prerequisite in tech.prerequisites) {
val prerequisiteButton = techNameToButton[prerequisite]!! val prerequisiteButton = techNameToButton[prerequisite]!!

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Apr 25 23:34:18 IDT 2020 #Mon Jun 01 02:27:12 IDT 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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