From 33354297dbbc5b45118820f1c776bc3d5f77d628 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 06:56:17 -0400 Subject: [PATCH 01/11] Update .travis.yml --- .travis.yml | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52572b957d..5f1da1d6ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,42 @@ -sudo: false - language: android +sudo: required jdk: oraclejdk8 +env: + global: + - ANDROID_API_LEVEL=28 + - ANDROID_BUILD_TOOLS_VERSION=28.0.3 + - ANDROID_ABI=armeabi-v7a + android: components: - - platform-tools - - tools - - build-tools-23.0.3 - - android-23 + - tools + - platform-tools + - tools + - extra-android-m2repository + licenses: + - 'android-sdk-preview-license-52d11cd2' + - 'android-sdk-license-.+' + - 'google-gdk-license-.+' before_install: -- chmod +x gradlew - -script: -- "./gradlew clean build connectedAndroidTest -PdisablePreDex --stacktrace" - -notifications: - email: true + - touch $HOME/.android/repositories.cfg + - yes | sdkmanager "platforms;android-28" + - yes | sdkmanager "build-tools;28.0.3" before_cache: -- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - - "$HOME/.m2" - - "$HOME/.gradle" - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" \ No newline at end of file + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + - $HOME/.android/build-cache + +before_script: + - chmod +x gradlew + +script: + - ./gradlew clean build + - ./gradlew test From 6633e83dbcd013c831b5f2ba09df971b884eefe9 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 07:15:06 -0400 Subject: [PATCH 02/11] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f1da1d6ad..81849aba6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,4 +39,3 @@ before_script: script: - ./gradlew clean build - - ./gradlew test From d239cc60c147c60f78922d55db73a4e02901190c Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 07:30:55 -0400 Subject: [PATCH 03/11] Update TestApp.kt --- app/src/test/java/eu/kanade/tachiyomi/TestApp.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/src/test/java/eu/kanade/tachiyomi/TestApp.kt b/app/src/test/java/eu/kanade/tachiyomi/TestApp.kt index cbac3701fe..8e74f29fbb 100644 --- a/app/src/test/java/eu/kanade/tachiyomi/TestApp.kt +++ b/app/src/test/java/eu/kanade/tachiyomi/TestApp.kt @@ -1,12 +1,4 @@ package eu.kanade.tachiyomi open class TestApp : App() { - - override fun setupAcra() { - // Do nothing - } - - override fun setupJobManager() { - // Do nothing - } } From e248f7ff74d9d9f7b24587aca2ec4eb211d3a296 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 07:57:38 -0400 Subject: [PATCH 04/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 81849aba6a..091b7e6554 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,4 @@ before_script: - chmod +x gradlew script: - - ./gradlew clean build + - ./gradlew clean build -x test From 3caa6e938a2604f43b9172e74b1f81f39a473b6d Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 08:14:40 -0400 Subject: [PATCH 05/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 091b7e6554..26855fd4d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,4 +38,4 @@ before_script: - chmod +x gradlew script: - - ./gradlew clean build -x test + - ./gradlew clean assembleStandardDebug From b40e5c6cae1cebfc47508739688412437362ba0e Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 08:35:28 -0400 Subject: [PATCH 06/11] remove firebase for now --- app/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0991810ca0..9f515e6c21 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -116,8 +116,6 @@ dependencies { implementation 'com.android.support:multidex:1.0.3' - standardImplementation 'com.google.firebase:firebase-core:11.8.0' - // ReactiveX implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.3.6' From 73441f6013e69d3fad3a972746f401e30c3616ae Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 08:46:10 -0400 Subject: [PATCH 07/11] Update build.gradle --- app/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9f515e6c21..9442d53e90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -251,7 +251,3 @@ kotlin { androidExtensions { experimental = true } - -if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) { - apply plugin: 'com.google.gms.google-services' -} From 07b0473036993a1368aeeb73d3515b2f07a3b980 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 08:58:08 -0400 Subject: [PATCH 08/11] add travis build status --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b7ae7676e3..52a066e7ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Unofficial MangaDex [![stable release](https://img.shields.io/github/release/CarlosEsco/MangaDex.svg?maxAge=3600&label=stable)](https://github.com/CarlosEsco/MangaDex/releases) +[![Build Status](https://travis-ci.org/CarlosEsco/MangaDex.svg?branch=master)](https://travis-ci.org/CarlosEsco/MangaDex) A free, open source unofficial manga reader for Mangadex and a fork of [Tachiyomi](https://github.com/inorichi/tachiyomi) From 7f128c747ff12c3aa5a1ee91063b0c2092f92e20 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 09:13:46 -0400 Subject: [PATCH 09/11] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000000..50af5c27ee --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[Feature Request]" +labels: Feature Request +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From ca438dd020fda72dfb5201bd26b517403fee325b Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 09:19:30 -0400 Subject: [PATCH 10/11] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000000..49a0a8e112 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[BUG]" +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Please complete the following information:** + - Device: [e.g. Pixel 3XL] + - Android Version: [e.g. Android 8.0.1] + - Version [e.g. 1.0.0] + +**Additional context** +Add any other context about the problem here. From 5ba7d5e98913492904e6a38b71d433d311f079d7 Mon Sep 17 00:00:00 2001 From: Carlos Date: Tue, 2 Apr 2019 10:00:31 -0400 Subject: [PATCH 11/11] fix apache license --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 52a066e7ab..8666c68b6d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Supports login to MangaDex ## License - Copyright 2019 Carlos Escobedo + Copyright 2015 Javier Tomás Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,6 +24,8 @@ Supports login to MangaDex WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Modifications copyright (C) 2019 Carlos Escobedo ## Disclaimer