Merge branch 'release-2.0.7' into develop

rsteckler · Dec 1, 2014 · 3d67e3e · 3d67e3e
2 parents 9cf86b8 + 5a4614a
commit 3d67e3e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId 'com.ryansteckler.nlpunbounce'
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 43
-        versionName '2.0.6'
+        versionCode 44
+        versionName '2.0.7'
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/ryansteckler/nlpunbounce/hooks/Wakelocks.java b/app/src/main/java/com/ryansteckler/nlpunbounce/hooks/Wakelocks.java
@@ -34,7 +34,7 @@
 public class Wakelocks implements IXposedHookLoadPackage {
 
     private static final String TAG = "Amplify: ";
-    public static final String VERSION = "2.0.6"; //This needs to be pulled from the manifest or gradle build.
+    public static final String VERSION = "2.0.7"; //This needs to be pulled from the manifest or gradle build.
     public static final String FILE_VERSION = "3"; //This needs to be pulled from the manifest or gradle build.
     private HashMap<String, Long> mLastWakelockAttempts = null; //The last time each wakelock was allowed.
     private HashMap<String, Long> mLastAlarmAttempts = null; //The last time each alarm was allowed.

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -68,7 +68,7 @@
             android:key="about_author"
             android:editable="false"
             android:defaultValue="0"
-            android:summary="Version: 2.0.6"
+            android:summary="Version: 2.0.7"
             />
 
         <Preference