Travis update, using 'android:components' instead of 'install' for base installations

This commit is contained in:
Yair Morgenstern
2018-12-03 10:17:06 +02:00
parent 4f0f163c00
commit 1e17df4b1e
3 changed files with 17 additions and 8 deletions

View File

@ -1,16 +1,24 @@
language: android language: android
android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
# - tools
# - platform-tools
# The BuildTools version used by your project
- build-tools-28.0.3
# The SDK version used to compile your project
- android-28
jdk: jdk:
- oraclejdk8 - oraclejdk8
before_install: before_install:
- chmod +x gradlew - chmod +x gradlew
install:
- echo yes | sdkmanager "tools" &>/dev/null
- echo yes | sdkmanager "platform-tools" &>/dev/null
- echo yes | sdkmanager "build-tools;28.0.3" &>/dev/null
- echo yes | sdkmanager "platforms;android-26" &>/dev/null
before_cache: before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

View File

@ -1,6 +1,6 @@
android { android {
buildToolsVersion "28.0.3" buildToolsVersion "28.0.3"
compileSdkVersion 26 compileSdkVersion 28
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
@ -20,7 +20,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 28
versionCode 172 versionCode 172
versionName "2.10.9" versionName "2.10.9"
} }

View File

@ -32,6 +32,7 @@ class TileInfoTable(private val worldScreen: WorldScreen) : Table() {
fun getStatsTable(tile: TileInfo):Table{ fun getStatsTable(tile: TileInfo):Table{
val table=Table() val table=Table()
table.pad(10f) table.pad(10f)
table.defaults().pad(2f)
for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) { for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) {
table.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right) table.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right)