diff --git a/CHANGELOG.md b/CHANGELOG.md index b2b072e4a..19d4a036b 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/app/build.gradle b/app/build.gradle index 848e68e00..52ac7ace5 100644 --- a/app/build.gradle +++ b/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' diff --git a/app/libs/ActiveAndroid.jar b/app/libs/ActiveAndroid.jar deleted file mode 100644 index a00594330..000000000 Binary files a/app/libs/ActiveAndroid.jar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a19760a1d..de4fc85b4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,8 @@ + android:versionCode="17" + android:versionName="1.5.1"> diff --git a/build.gradle b/build.gradle index b61fd5157..eb0a985ee 100644 --- a/build.gradle +++ b/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/" } } }