From 85fbbaaa6ddb9de369889aadc018baf539d2fde7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 15 Nov 2019 09:27:13 +0200 Subject: [PATCH] Checking if we can remove some lines from the Travis file to speed up build time --- .travis.yml | 20 ++++++-------------- build.gradle | 2 +- desktop/build.gradle | 1 + 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b7ebccf43..cdbf25486c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,15 @@ language: android dist: trusty # For oracleJDK fail errors, as per advice from https://travis-ci.community/t/error-installing-oraclejdk8-expected-feature-release-number-in-range-of-9-to-14-but-got-8/3766/6 -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-29.0.2 - - # The SDK version used to compile your project - - android-29 - - jdk: - oraclejdk8 +android: + components: + - build-tools-29.0.2 # The BuildTools version used by the project + - android-29 # The SDK version used to compile the project + + before_install: - chmod +x gradlew diff --git a/build.gradle b/build.gradle index 3b1fb28858..6f57e2c521 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ allprojects { version = '1.0.1' ext { - appName = "unciv-game" + appName = "Unciv" gdxVersion = '1.9.10' roboVMVersion = '2.3.1' box2DLightsVersion = '1.4' diff --git a/desktop/build.gradle b/desktop/build.gradle index d9e7c0c9a4..6149b845a2 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -29,6 +29,7 @@ task dist(type: Jar) { // see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491 from {configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }} from files(project.assetsDir) + archiveFileName = "${appName}.jar" manifest { attributes 'Main-Class': project.mainClassName