Merge branch 'release/v1.3.6'

mikepenz · Mar 11, 2016 · 7574eee · 7574eee
2 parents 9529a33 + 6d77872
commit 7574eee
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ It comes with following features:
 The Crossfader Library is pushed to [Maven Central](http://search.maven.org/#search|ga|1|g%3A%22com.mikepenz%22), so you just need to add the following dependency to your `build.gradle`.
 
 ```javascript
-compile('com.mikepenz:crossfader:1.3.5@aar') {
+compile('com.mikepenz:crossfader:1.3.6@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.mikepenz.crossfader.app"
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 135
-        versionName '1.3.5'
+        versionCode 136
+        versionName '1.3.6'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -51,7 +51,7 @@ android {
 dependencies {
     compile project(':library')
 
-    compile('com.mikepenz:materialdrawer:5.1.1@aar') {
+    compile('com.mikepenz:materialdrawer:5.1.2@aar') {
         transitive = true
     }
     compile('com.mikepenz:aboutlibraries:5.5.7@aar') {

diff --git a/build.gradle b/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 
 ext {
     compileSdkVersion = 23
     buildToolsVersion = "23.0.2"
-    supportLibVersion = "23.2.0"
+    supportLibVersion = "23.2.1"
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=1.3.5
-VERSION_CODE=135
+VERSION_NAME=1.3.6
+VERSION_CODE=136
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=Crossfader Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 135
-        versionName '1.3.5'
+        versionCode 136
+        versionName '1.3.6'
     }
     buildTypes {
         release {

diff --git a/library/src/main/res/values/library_crossfader_strings.xml b/library/src/main/res/values/library_crossfader_strings.xml
@@ -10,7 +10,7 @@
         <b>Crossfader</b>
         ]]>
     </string>
-    <string name="library_crossfader_libraryVersion">1.3.5</string>
+    <string name="library_crossfader_libraryVersion">1.3.6</string>
     <string name="library_crossfader_libraryWebsite">https://github.com/mikepenz/Crossfader</string>
     <string name="library_crossfader_licenseId">apache_2_0</string>
     <string name="library_crossfader_isOpenSource">true</string>