Merge branch 'dev' into feature/sync

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.5.1 (May 17, 2016)
+
+* Fix build on F-Droid
+
 ### 1.5.0 (May 15, 2016)
 
 * Add night mode, with AMOLED support

app/build.gradle

@@ -39,13 +39,13 @@ dependencies {
     compile 'com.github.paolorotolo:appintro:3.4.0'
     compile 'org.apmem.tools:layouts:1.10@aar'
     compile 'com.opencsv:opencsv:3.7'
+    compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
 
     compile ('io.socket:socket.io-client:0.7.0') {
         exclude group: 'org.json', module: 'json'
     }
 
     compile project(':libs:drag-sort-listview:library')
-    compile files('libs/ActiveAndroid.jar')
 
     androidTestCompile 'com.android.support:support-annotations:23.3.0'
     androidTestCompile 'com.android.support.test:runner:0.5'

app/src/main/AndroidManifest.xml

@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="16"
+    android:versionCode="17"
-    android:versionName="1.5.0">
+    android:versionName="1.5.1">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

build.gradle

@@ -3,6 +3,7 @@ buildscript {
     repositories {
         jcenter()
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.0'
     }
@@ -11,6 +12,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }