Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
nonproto committed Apr 3, 2019
2 parents 79a5deb + 5ba7d5e commit fa9c957
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 33 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -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.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -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.
47 changes: 29 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,41 @@
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/"
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache

before_script:
- chmod +x gradlew

script:
- ./gradlew clean assembleStandardDebug
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -10,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.
Expand All @@ -23,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

Expand Down
6 changes: 0 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -253,7 +251,3 @@ kotlin {
androidExtensions {
experimental = true
}

if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
apply plugin: 'com.google.gms.google-services'
}
8 changes: 0 additions & 8 deletions app/src/test/java/eu/kanade/tachiyomi/TestApp.kt
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
package eu.kanade.tachiyomi

open class TestApp : App() {

override fun setupAcra() {
// Do nothing
}

override fun setupJobManager() {
// Do nothing
}
}

0 comments on commit fa9c957

Please sign in to comment.