Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
arunkumar9t2 committed Apr 7, 2017
2 parents 7fa4e53 + e85115a commit 70b4fd5
Show file tree
Hide file tree
Showing 265 changed files with 5,603 additions and 1,152 deletions.
18 changes: 10 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ android {
applicationId "arun.com.chromer"
minSdkVersion 16
targetSdkVersion 25
versionCode 32
versionName "1.7.1"
versionCode 33
versionName "1.7.2"

buildConfigField "String", "BASE_64", getBase64()
manifestPlaceholders = [crashlyticsApiKey: getFabricKey()]
Expand Down Expand Up @@ -62,11 +62,11 @@ dependencies {
debugCompile 'com.facebook.stetho:stetho:1.4.2'

// Support
compile 'com.android.support:design:25.2.0'
compile 'com.android.support:customtabs:25.2.0'
compile 'com.android.support:preference-v14:25.2.0'
compile 'com.android.support:cardview-v7:25.2.0'
compile 'com.android.support:palette-v7:25.2.0'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:customtabs:25.3.1'
compile 'com.android.support:preference-v14:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:palette-v7:25.3.1'

// Intro
compile 'com.github.paolorotolo:appintro:4.1.0'
Expand All @@ -86,9 +86,11 @@ dependencies {
// Butterknife, Timber, Cache
compile 'com.jakewharton.timber:timber:4.3.1'
compile 'com.jakewharton:butterknife:8.4.0'
compile 'com.jakewharton:disklrucache:2.0.2'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'

// MVP
compile 'com.hannesdorfmann.mosby3:mvp:3.0.2'

// Image loading
compile 'com.github.bumptech.glide:glide:3.7.0'

Expand Down
18 changes: 18 additions & 0 deletions app/src/main/java/arun/com/chromer/Chromer.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*
* Chromer
* Copyright (C) 2017 Arunkumar
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package arun.com.chromer;

import android.app.Application;
Expand Down
Loading

0 comments on commit 70b4fd5

Please sign in to comment.