From 194cdf3b5f262b618545dbcee807a25df24dc54f Mon Sep 17 00:00:00 2001 From: J2ghz Date: Sat, 9 Apr 2016 11:38:59 +0200 Subject: [PATCH 1/4] Travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75aac8ad3..ac29f8300 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ android: - tools # The BuildTools version used by your project - - build-tools-23.0.1 + - build-tools-23.0.3 - android-23 - extra-android-m2repository - extra-google-m2repository @@ -15,5 +15,5 @@ android: before_script: - chmod +x gradlew #Build, and run tests -script: "./gradlew build testDebug" +script: "./gradlew clean assembleDebug testDebugUnitTest" sudo: false From 742e8c9f503c09d2e604312993c3b7b4737c7b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Holl=C3=BD?= Date: Sat, 9 Apr 2016 11:45:07 +0200 Subject: [PATCH 2/4] upgrade buildToolsVersion for SubsamplingScaleImageView --- libs/SubsamplingScaleImageView/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/SubsamplingScaleImageView/build.gradle b/libs/SubsamplingScaleImageView/build.gradle index 971dbea64..a7fdc2d17 100644 --- a/libs/SubsamplingScaleImageView/build.gradle +++ b/libs/SubsamplingScaleImageView/build.gradle @@ -13,7 +13,7 @@ dependencies { android { compileSdkVersion 23 - buildToolsVersion "23.0.2" + buildToolsVersion "23.0.3" sourceSets { main { @@ -38,4 +38,4 @@ android { debug.setRoot('build-types/debug') release.setRoot('build-types/release') } -} \ No newline at end of file +} From 16037dd9bd40acedbf1ab4613a6ba83cfcceec25 Mon Sep 17 00:00:00 2001 From: J2ghz Date: Sat, 9 Apr 2016 11:52:36 +0200 Subject: [PATCH 3/4] try https://github.com/travis-ci/travis-ci/issues/4185 --- gradle.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1d3591c8a..c1ac6d22c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true + +org.gradle.daemon=true +org.gradle.jvmargs=-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m \ No newline at end of file From 9c223b48a3c07e7d8446997cb80a1dd2073cd6f9 Mon Sep 17 00:00:00 2001 From: J2ghz Date: Sat, 9 Apr 2016 13:37:11 +0200 Subject: [PATCH 4/4] rearrange badges on README --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 59e4a14a0..5e883dc1a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ -[![stable release](https://img.shields.io/badge/release-v0.1.4-blue.svg)](https://github.com/inorichi/tachiyomi/releases) -[![fdroid release](https://img.shields.io/badge/release-F--Droid-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) -[![latest debug build](https://img.shields.io/badge/debug-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) -[![fdroid release](https://img.shields.io/badge/debug-F--Droid-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-debug-versions) +| Build | Download | Auto Update | +|-------|----------|-------------| +| [![TeamCity (simple build status)](https://img.shields.io/teamcity/https/teamcity.kanade.eu/s/tachiyomi_Build.svg)](https://teamcity.kanade.eu/project.html?projectId=tachiyomi) [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/badge/release-v0.1.4-blue.svg)](https://github.com/inorichi/tachiyomi/releases) [![latest debug build](https://img.shields.io/badge/debug-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) | [![fdroid release](https://img.shields.io/badge/release-F--Droid-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid debug](https://img.shields.io/badge/debug-F--Droid-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-debug-versions) | ## [Report an issue](https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md) @@ -11,7 +10,7 @@ Tachiyomi is a free and open source manga reader for Android. Keep in mind it's still a beta, so expect it to crash sometimes. -## Features +# Features * Online and offline reading * Configurable reader with multiple viewers and settings