diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-12-12 02:30:42 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-12-12 02:30:42 +0100 |
| commit | d33b8f5b369c0f854ad4dd29af9856e218087980 (patch) | |
| tree | e5a29d5fee79f084cc09e527dfa354c4184c0af9 | |
| parent | 06901f30736d56f7fc42083ce8b5eac6f6d8b7b4 (diff) | |
| parent | 8219b4e140ac7c0aac452144fd9b7f3b08285510 (diff) | |
| download | cgeo-d33b8f5b369c0f854ad4dd29af9856e218087980.zip cgeo-d33b8f5b369c0f854ad4dd29af9856e218087980.tar.gz cgeo-d33b8f5b369c0f854ad4dd29af9856e218087980.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | cgeo-calendar/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | cgeo-contacts/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | main/build.gradle | 2 | ||||
| -rw-r--r-- | main/res/values/changelog_release.xml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cgeo-calendar/AndroidManifest.xml b/cgeo-calendar/AndroidManifest.xml index 64968e5..0a406d3 100644 --- a/cgeo-calendar/AndroidManifest.xml +++ b/cgeo-calendar/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cgeo.calendar" - android:versionCode="4" - android:versionName="1.4" > + android:versionCode="5" + android:versionName="1.5" > <uses-sdk android:minSdkVersion="7" diff --git a/cgeo-contacts/AndroidManifest.xml b/cgeo-contacts/AndroidManifest.xml index f441973..b7ef1c5 100644 --- a/cgeo-contacts/AndroidManifest.xml +++ b/cgeo-contacts/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cgeo.contacts" - android:versionCode="3" - android:versionName="1.3" > + android:versionCode="5" + android:versionName="1.5" > <uses-sdk android:minSdkVersion="7" diff --git a/main/build.gradle b/main/build.gradle index 0410b0e..7352585 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -263,7 +263,7 @@ dependencies { unitTestCompile 'com.jakewharton:butterknife:6.0.0' unitTestCompile 'org.apache.commons:commons-collections4:4.0' unitTestCompile 'commons-io:commons-io:2.4' - unitTestCompile 'org.apache.commons:commons-lang3:3.3.2' + unitTestCompile 'org.apache.commons:commons-lang3:$CommonsLang3Version' unitTestCompile 'com.google.code.findbugs:annotations:3.0.0' unitTestCompile 'com.netflix.rxjava:rxjava-core:$RXVersion' unitTestCompile 'com.netflix.rxjava:rxjava-android:$RXVersion' diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 52d4329..5cd157f 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,7 +2,7 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n - <b>Next feature release:</b>\n + <b>2014.12.09:</b>\n · New: Google Play Services used for location (less battery usage)\n · New: Optional low power GPS mode for parts of the app which don\'t require high precision\n · New: Detect offline state and delay login until network is available\n |