From 793f81e287d63344c1daa0a9544bf32937622543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B8=B4=E9=A3=8E?= Date: Fri, 8 Jul 2016 19:49:06 +0800 Subject: [PATCH] update travis --- .nb-gradle-properties | 2 +- .travis.yml | 7 ++++--- HMCL/build.gradle | 11 ++++------- LICENSE | 4 ++-- license-header.txt | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.nb-gradle-properties b/.nb-gradle-properties index aa17ec6af..a27e06991 100755 --- a/.nb-gradle-properties +++ b/.nb-gradle-properties @@ -31,6 +31,6 @@ GNU General Public License - huangyuhui + HMCLSoft diff --git a/.travis.yml b/.travis.yml index 9fce3d616..315f05668 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ before_deploy: - git push -q ${REPO} --tags deploy: provider: releases - api_key: - secure: lfFEwKtij/s9Ao/SKL7oVdsWcfASshZuwT27gllMrTx1ZQqLCG2I5mGJOp5ukx7lb3y4Tu316nFasLjy9NI3eLXSx9f0w4q+wMf0K5Yj9iOwu/TIn7JkLyHDMQ20qRwGxZplS2WUb669gIRg+l6jUHeTBW+dlTxr0mMa6WHIl8UDpHwfFrGC3i6dL4y6WlDwGl2rYktvOoA/iqvtglBcHuXaL2sDfhp5MXRcYULTIw+b9zmiQXP665DQN+Su5I3gwB4y5X8RH72GAacZn13fEIo5i8UUoHM7UQxM8y8DKSO3avyFCfpUle9+9sErQVW7b6JV1c+AoLWuAhNJLMlUTKarZE7UMqfjvoQHxX5hp2B2WHLEON/UJiGf25HJWx6VhJitE0/odujqnG/umesqki2jMTs6gPcxbc9iBjzUg+ZmFztdtC+Emnni7lpqVVl+Y5hsJRn3Z6rIiNgwmaE0r2OQgAm1vRYFc7jvOdRfyFG+uCRZF6nS56BzJ7dLc0WW8dTgSft6YFll4ZYL6hiI9qiIaBAK948y5HV+6VBWuO3xf/G2CUFbE1Y9qUCjToh3ahxNDzZvXB+rXqvlvNQOi5l8n594oQ61n45qIHSKlMBn9Bxhw29oWT5mo1aYIaNXbpzKam2w4mK0T3VrgTszu/3282wRbNr+VAwdGMfwW1s= + api_key: ${DEPLOY_REPO} file: - HMCL/build/libs/HMCL-${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.jar - HMCL/build/libs/HMCL-${HMCL_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.exe @@ -21,7 +20,7 @@ deploy: - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}.exe - HMCSM/build/libs/HMCSM-${HMCSM_VERSION_ROOT}.${TRAVIS_BUILD_NUMBER}-MacOSApp.zip on: - repo: huanghongxun/HMCL + repo: mclauncher/HMCL tags: false skip_cleanup: true install: echo "skip 'gradle assemble' step" @@ -32,3 +31,5 @@ cache: directories: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" +git: + depth: 1 \ No newline at end of file diff --git a/HMCL/build.gradle b/HMCL/build.gradle index d6864df76..06cf6ad91 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -46,7 +46,6 @@ if (!hasProperty('mainClass')) { ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main' } - def readBuildNumber() { def versionPropsFile = file('version.properties') @@ -68,7 +67,7 @@ if (buildnumber == null) buildnumber = System.getenv("BUILD_NUMBER") if (buildnumber == null) buildnumber = readBuildNumber() - + def versionroot = System.getenv("VERSION_ROOT") if (versionroot == null) versionroot = "2.5.0" @@ -157,22 +156,20 @@ jar { from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } manifest { - attributes 'Created-By' : 'Copyright(c) 2013-2016 huangyuhui.', + attributes 'Created-By' : 'Copyright(c) 2013-2016 HMCLSoft.', 'Main-Class' : mainClass } } launch4j { - launch4jCmd = 'D:\\Develop\\Java\\Launch4j\\launch4j.exe' - //launch4jCmd = '/home/huangyuhui/softwares/launch4j/launch4j' - supportUrl = 'http://www.mcbbs.net/thread-142335-1-1.html' + supportUrl = 'http://www.hmclsoft.com' jreMinVersion = '1.6.0' mainClassName = mainClass icon = new File(project.buildDir, '../icon.ico').absolutePath version = mavenVersion downloadUrl = 'http://java.com/download' - copyright = "Copyright(c) 2013-2015 huangyuhui." + copyright = "Copyright(c) 2013-2015 HMCLSoft." jar = new File(project.buildDir, 'libs/' + mavenGroupId + '-' + mavenVersion + '.jar').absolutePath outfile = mavenGroupId + '-' + mavenVersion + '.exe' diff --git a/LICENSE b/LICENSE index 074b814ad..2b4d6a2c3 100755 --- a/LICENSE +++ b/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Hello Minecraft! Launcher, a Minecraft Launcher which is easy to use. - Copyright (C) 2014 huangyuhui + Copyright (C) 2016 HMCLSoft. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Hello Minecraft! Launcher Copyright (C) 2014 huangyuhui + Hello Minecraft! Launcher Copyright (C) 2016 HMCLSoft. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/license-header.txt b/license-header.txt index 15cd12760..3ac193d02 100755 --- a/license-header.txt +++ b/license-header.txt @@ -1,6 +1,6 @@ /* * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui + * Copyright (C) 2016 HMCLSoft. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by