From 7dfa6c05d5f2632341a2669417ba1d2cd7cefd7e Mon Sep 17 00:00:00 2001 From: Kartik Arora Date: Mon, 18 Jul 2016 23:48:32 +0530 Subject: [PATCH] Update README.md and travis --- .travis.yml | 2 +- README.md | 3 ++- transfer/build.gradle | 16 ++++++++-------- .../src/main/res/drawable/selector_ic_grid.xml | 4 ---- .../main/res/drawable/selector_ic_info_white.xml | 4 ---- .../src/main/res/drawable/selector_ic_list.xml | 4 ---- transfer/src/main/res/menu/menu_transfer.xml | 6 +++--- 7 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 transfer/src/main/res/drawable/selector_ic_grid.xml delete mode 100644 transfer/src/main/res/drawable/selector_ic_info_white.xml delete mode 100644 transfer/src/main/res/drawable/selector_ic_list.xml diff --git a/.travis.yml b/.travis.yml index 96d8eeb..a5b6d28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk8 android: components: - tools - - build-tools-24.0.0 + - build-tools-24.0.1 - android-24 - platform-tools - extra-android-support diff --git a/README.md b/README.md index 6df09c2..ad832bb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Inspired from [transfer.sh](https://transfer.sh/) by [Dutch Coders](http://dutch ### Build Status -|Master | Dev | +|master | dev | |-------|-------| |[![Build Status](https://travis-ci.org/kartikarora/Transfer.sh.svg?branch=master)](https://travis-ci.org/kartikarora/Transfer.sh)|[![Build Status](https://travis-ci.org/kartikarora/Transfer.sh.svg?branch=dev)](https://travis-ci.org/kartikarora/Transfer.sh)| @@ -46,6 +46,7 @@ List of [contributors](CONTRIBUTORS.md) - [Retrofit](http://square.github.io/retrofit/) - [Apache Commons IO](http://www.apache.org/) - [LicensesDialog](http://psdev.de/LicensesDialog) +- [ACRA](https://github.com/acra/acra) - Google Analytics, Google Admob - android-support-v4, android-support-v7-appcompat, android-support-design, android-support-v7-cardview - MimeType images designed by [Freepik](http://www.freepik.com/) diff --git a/transfer/build.gradle b/transfer/build.gradle index 0daf81a..1963dfe 100644 --- a/transfer/build.gradle +++ b/transfer/build.gradle @@ -8,13 +8,13 @@ def getDate() { android { compileSdkVersion 24 - buildToolsVersion "24.0.0" + buildToolsVersion "24.0.1" def versionMajor = 1 - def versionMinor = 0 + def versionMinor = 1 def versionPatch = 0 def versionBuild = getDate().toInteger() - def versionId = versionBuild * versionMajor + versionMinor + versionPatch + def versionId = versionBuild + (versionMajor*1000 + versionMinor*100 + versionPatch*10) defaultConfig { vectorDrawables.useSupportLibrary = true @@ -35,12 +35,12 @@ android { dependencies { compile group: 'commons-io', name: 'commons-io', version: '2.5' - compile 'com.android.support:appcompat-v7:24.0.0' - compile 'com.android.support:cardview-v7:24.0.0' - compile 'com.android.support:design:24.0.0' + compile 'com.android.support:appcompat-v7:24.1.0' + compile 'com.android.support:cardview-v7:24.1.0' + compile 'com.android.support:design:24.1.0' compile 'com.squareup.retrofit:retrofit:1.9.0' - compile 'com.google.android.gms:play-services-analytics:9.2.0' - compile 'com.google.firebase:firebase-ads:9.2.0' + compile 'com.google.android.gms:play-services-analytics:9.2.1' + compile 'com.google.firebase:firebase-ads:9.2.1' compile 'de.psdev.licensesdialog:licensesdialog:1.8.1' compile 'ch.acra:acra:4.8.5' } diff --git a/transfer/src/main/res/drawable/selector_ic_grid.xml b/transfer/src/main/res/drawable/selector_ic_grid.xml deleted file mode 100644 index c9dd0ed..0000000 --- a/transfer/src/main/res/drawable/selector_ic_grid.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/transfer/src/main/res/drawable/selector_ic_info_white.xml b/transfer/src/main/res/drawable/selector_ic_info_white.xml deleted file mode 100644 index 8a62e45..0000000 --- a/transfer/src/main/res/drawable/selector_ic_info_white.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/transfer/src/main/res/drawable/selector_ic_list.xml b/transfer/src/main/res/drawable/selector_ic_list.xml deleted file mode 100644 index 92a3ad8..0000000 --- a/transfer/src/main/res/drawable/selector_ic_list.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/transfer/src/main/res/menu/menu_transfer.xml b/transfer/src/main/res/menu/menu_transfer.xml index 122b9b9..3799c4f 100644 --- a/transfer/src/main/res/menu/menu_transfer.xml +++ b/transfer/src/main/res/menu/menu_transfer.xml @@ -15,17 +15,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file