Merge branch 'release/1.0.3'

Mariovc · Sep 9, 2016 · ad93318 · ad93318
2 parents 04241b0 + 9d56f86
commit ad93318
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,12 @@
 ImagePicker
-==================
+===========
+
+<a href="https://android-arsenal.com/api?level=14">
+  <img alt="Min API" src="https://img.shields.io/badge/API-14%2B-orange.svg?style=flat" />
+</a>
+<a href="https://github.com/Mariovc/ImagePicker/releases/latest">
+  <img alt="Latest release" src="https://img.shields.io/github/release/Mariovc/ImagePicker.svg" />
+</a>
 
 ImagePicker is an Android library to easily pick an image from gallery or camera app. The users can select their prefered gallery/camera app on a unique Intent. 
 Download the APK sample on Google Play:
@@ -55,7 +62,7 @@ Add it in your *root* ``build.gradle`` at the end of repositories:
 ```groovy
 allprojects {
   repositories {
-    ...
+    // Add this line
     maven { url "https://jitpack.io" }
   }
 }
@@ -65,10 +72,12 @@ Add ``ImagePicker`` dependency to your *app* ``build.gradle`` file:
 
 ```groovy
 dependencies{
-    compile 'com.github.Mariovc:ImagePicker:1.0.2'
+    compile 'com.github.Mariovc:ImagePicker:x.x.x'
 }
 ```
 
+where `x.x.x` corresponds to latest release version published in [ ![release](https://img.shields.io/github/release/Mariovc/ImagePicker.svg) ](https://github.com/Mariovc/ImagePicker/releases/latest)
+
 
 Contributing
 --------------------------

diff --git a/build.gradle b/build.gradle
@@ -19,16 +19,17 @@
 ext {
     configuration = [
             app_name            : "ImagePicker",
+            packageName         : "com.mvc.imagepicker",
             compileVersion      : 24,
             buildToolsVersion   : "23.0.3",
-            minSdk              : 15,
+            minSdk              : 14,
             targetSdk           : 24,
-            version_code        : 4,
-            version_name        : "1.0.2"
+            version_code        : 5,
+            version_name        : "1.0.3"
     ]
 
     libraries = [
-            supportVersion      : "24.1.1"
+            supportVersion      : "24.2.0"
     ]
 }
 
@@ -37,7 +38,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,22 +1,6 @@
-#
-# Copyright 2016 Mario Velasco Casquero
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Sep 08 12:02:41 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -29,7 +29,7 @@ android {
     buildToolsVersion config.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.mvc.imagepicker"
+        applicationId config.packageName
         minSdkVersion config.minSdk
         targetSdkVersion config.targetSdk
         versionCode config.version_code
@@ -44,7 +44,7 @@ android {
                 variant.outputs.each { output ->
                     def date = new Date().format("yyyy-MM-dd___(HH.mm.ss)")
                     def newName = output.outputFile.name
-                    newName = newName.replace("sample", config.app_name)
+                    newName = newName.replace(project.getName(), config.app_name)
                     newName = newName.replace("release", String.format("v%d(%s)___%s",
                             defaultConfig.versionCode, defaultConfig.versionName, date))
 

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mvc.imagepicker.sample">
+          package="com.mvc.imagepicker.sample">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
@@ -25,11 +25,13 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>