Merge pull request #24 from jtaekema/master

donnfelker · donnfelker · commit 2240626395da · 2013-01-06T18:53:39.000-08:00
Updated dependancies to their latest versions, and other minor changes
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,4 @@ gen-external-apklibs
 .idea
 out
 .DS_Store
-
+classes
diff --git a/app/pom.xml b/app/pom.xml
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.1</version>
+            <version>2.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.rtyley</groupId>
             <artifactId>roboguice-sherlock</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
         <dependency>
             <groupId>org.roboguice</groupId>
@@ -48,26 +48,26 @@
         </dependency>
         <dependency>
             <groupId>com.actionbarsherlock</groupId>
-            <artifactId>library</artifactId>
+            <artifactId>actionbarsherlock</artifactId>
             <version>${abs.version}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
             <artifactId>http-request</artifactId>
-            <version>2.1</version>
+            <version>3.0</version>
         </dependency>
         <dependency>
             <groupId>com.viewpagerindicator</groupId>
             <artifactId>library</artifactId>
-            <version>2.3.1</version>
+            <version>2.4.1</version>
             <type>apklib</type>
         </dependency>
         <dependency>
             <groupId>com.nineoldandroids</groupId>
             <artifactId>library</artifactId>
-            <version>2.2.0</version>
+            <version>2.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
@@ -83,19 +83,19 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3.RC2</version>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/app/res/values/theme.xml b/app/res/values/theme.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <resources>
 
     <style name="Theme.Bootstrap.Dark" parent="@style/Theme.Sherlock">
diff --git a/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java b/app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java
@@ -68,6 +68,5 @@ protected void onException(Exception e) throws RuntimeException {
             super.onException(e);
             Log.e("LOGOUT_SERVICE", "Logout failed.", e.getCause());
         }
-    };
-
+    }
 }

-Original file line number
+Diff line change
 .idea
 out
 .DS_Store
+-
 +classes
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+`
`1`	`3`	`<resources>`
`2`	`4`
`3`	`5`	`<style name="Theme.Bootstrap.Dark" parent="@style/Theme.Sherlock">`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,5 @@ protected void onException(Exception e) throws RuntimeException {`
`68`	`68`	`super.onException(e);`
`69`	`69`	`Log.e("LOGOUT_SERVICE", "Logout failed.", e.getCause());`
`70`	`70`	`}`
`71`		`- };`
`72`		`-`
	`71`	`+ }`
`73`	`72`	`}`