isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/sync

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-05-17 10:58:53 -04:00
parent 5b402478e9 dbf569ff87
commit dd5f37290c
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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'

BIN
app/libs/ActiveAndroid.jar
View File

Binary file not shown.

4
app/src/main/AndroidManifest.xml
View File

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