Merge branch 'release/1.2.1'

Author: Bartosz Lipinski

.gitignore

@@ -1,28 +1,25 @@
-# Built application files
-*.apk
-*.ap_
+.classpath
+.project
+.settings
+eclipsebin
 
-# Files for the Dalvik VM
-*.dex
+bin
+gen
+build
+out
+lib
 
-# Java class files
-*.class
+.idea
+*.iml
+classes
 
-# Generated files
-bin/
-gen/
+obj
 
-# Gradle files
-.gradle/
-build/
+.DS_Store
 
-# Local configuration file (sdk path, etc)
+# Gradle
+.gradle
+jniLibs
+build
 local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-.idea
+reports

CHANGELOG.md

@@ -1,3 +1,8 @@
+Version 1.2.1 *(2015-12-10)*
+----------------------------
+
+Margin bug fixes.
+
 Version 1.2.0 *(2015-10-30)*
 ----------------------------
 

README.md

@@ -39,7 +39,7 @@ You can grab the library via Maven Central. Just add a proper dependency inside
 
 ```xml
 dependencies {
-    compile 'com.bartoszlipinski:viewpropertyobjectanimator:1.2.0'
+    compile 'com.bartoszlipinski:viewpropertyobjectanimator:1.2.1'
 }
 ```
 

ViewPropertyObjectAnimator.iml

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build.gradle

@@ -1,5 +1,5 @@
-VERSION_NAME=1.2.0
-VERSION_CODE=3
+VERSION_NAME=1.2.1
+VERSION_CODE=4
 GROUP=com.bartoszlipinski
 
 POM_DESCRIPTION=Wrapper of the ObjectAnimator that can be used similarly to ViewPropertyAnimator

gradle.properties

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.2.0"
+        versionCode 4
+        versionName "1.2.1"
     }
     buildTypes {
         release {
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:support-v4:23.1.1'
 }
 
 apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'

library/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "com.bartoszlipinski.viewpropertyobjectanimator.sample"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.2.0"
+        versionCode 4
+        versionName "1.2.1"
     }
     buildTypes {
         release {
@@ -22,5 +22,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
-    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
 }