diff --git a/.travis.yml b/.travis.yml index 91cc7a91ce..f9da20a110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,24 @@ 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: - oraclejdk8 before_install: - 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: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/android/build.gradle b/android/build.gradle index 3a3744a16c..5d285f710b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ android { buildToolsVersion "28.0.3" - compileSdkVersion 26 + compileSdkVersion 28 sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -20,7 +20,7 @@ android { defaultConfig { applicationId "com.unciv.game" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 172 versionName "2.10.9" } diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt index 5ad95b48c8..5972164161 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/TileInfoTable.kt @@ -32,6 +32,7 @@ class TileInfoTable(private val worldScreen: WorldScreen) : Table() { fun getStatsTable(tile: TileInfo):Table{ val table=Table() table.pad(10f) + table.defaults().pad(2f) for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) { table.add(ImageGetter.getStatIcon(entry.key.toString())).size(20f).align(Align.right)