Merge pull request #56 from R3PI/develop

Version 1.2.0
SoleraEngineering · Feb 18, 2017 · 6e45624 · 6e45624
2 parents a9f7376 + 014b66e
commit 6e45624
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 137 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/shelf
 .DS_Store
 /build
 /captures
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 1.2
+----------------------------
+ * Removed deprecated code.
+ * Added getLayoutId(View).
+
 Version 1.1.4
 ----------------------------
  * Fixed NullPointerException when fetching parameters that are null.

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Defrag is available in the jCenter repository:
 
 ```java
 dependencies {
-  compile 'com.solera.defrag:defrag:1.1.4'
+  compile 'com.solera.defrag:defrag:1.2.0'
 }
 ```
 

diff --git a/defrag/build.gradle b/defrag/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'android-apt'
 
 group = 'com.solera.defrag'
-version = '1.1.4'
+version = '1.2.0'
 
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16

diff --git a/defrag/src/main/java/com/solera/defrag/HandlesBackPresses.java b/defrag/src/main/java/com/solera/defrag/HandlesBackPresses.java
diff --git a/defrag/src/main/java/com/solera/defrag/HasTraversalAnimation.java b/defrag/src/main/java/com/solera/defrag/HasTraversalAnimation.java