Skip to content

Commit 2240626

Browse files
committed
Merge pull request #24 from jtaekema/master
Updated dependancies to their latest versions, and other minor changes
2 parents ca5de3b + fbb6ff9 commit 2240626

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ gen-external-apklibs
1919
.idea
2020
out
2121
.DS_Store
22-
22+
classes

app/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<dependency>
2929
<groupId>com.google.code.gson</groupId>
3030
<artifactId>gson</artifactId>
31-
<version>2.1</version>
31+
<version>2.2.2</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.github.rtyley</groupId>
3535
<artifactId>roboguice-sherlock</artifactId>
36-
<version>1.4</version>
36+
<version>1.5</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.roboguice</groupId>
@@ -48,26 +48,26 @@
4848
</dependency>
4949
<dependency>
5050
<groupId>com.actionbarsherlock</groupId>
51-
<artifactId>library</artifactId>
51+
<artifactId>actionbarsherlock</artifactId>
5252
<version>${abs.version}</version>
5353
<type>jar</type>
5454
<scope>provided</scope>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.github.kevinsawicki</groupId>
5858
<artifactId>http-request</artifactId>
59-
<version>2.1</version>
59+
<version>3.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.viewpagerindicator</groupId>
6363
<artifactId>library</artifactId>
64-
<version>2.3.1</version>
64+
<version>2.4.1</version>
6565
<type>apklib</type>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.nineoldandroids</groupId>
6969
<artifactId>library</artifactId>
70-
<version>2.2.0</version>
70+
<version>2.4.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.github.kevinsawicki</groupId>
@@ -83,19 +83,19 @@
8383
<dependency>
8484
<groupId>junit</groupId>
8585
<artifactId>junit</artifactId>
86-
<version>4.10</version>
86+
<version>4.11</version>
8787
<scope>test</scope>
8888
</dependency>
8989
<dependency>
9090
<groupId>org.hamcrest</groupId>
9191
<artifactId>hamcrest-library</artifactId>
92-
<version>1.3.RC2</version>
92+
<version>1.3</version>
9393
<scope>test</scope>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.mockito</groupId>
9797
<artifactId>mockito-core</artifactId>
98-
<version>1.9.0</version>
98+
<version>1.9.5</version>
9999
<scope>test</scope>
100100
</dependency>
101101
</dependencies>

app/res/values/theme.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
13
<resources>
24

35
<style name="Theme.Bootstrap.Dark" parent="@style/Theme.Sherlock">

app/src/main/java/com/donnfelker/android/bootstrap/authenticator/LogoutService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@ protected void onException(Exception e) throws RuntimeException {
6868
super.onException(e);
6969
Log.e("LOGOUT_SERVICE", "Logout failed.", e.getCause());
7070
}
71-
};
72-
71+
}
7372
}

0 commit comments

Comments
 (0)