isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
pull/231/merge
Alinson S. Xavier 8 years ago
parent cb7b569d4e
commit 275125d230
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File

40
app/build.gradle
Unescape View File

@ -55,9 +55,9 @@ android {
dependencies { dependencies {
androidTestApt 'com.google.dagger:dagger-compiler:2.2' androidTestApt 'com.google.dagger:dagger-compiler:2.11-rc2'
androidTestCompile 'com.android.support:support-annotations:25.3.0' androidTestCompile 'com.android.support:support-annotations:25.3.1'
androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.google.auto.factory:auto-factory:1.0-beta3' androidTestCompile 'com.google.auto.factory:auto-factory:1.0-beta3'
@ -66,40 +66,40 @@ dependencies {
androidTestCompile 'org.mockito:mockito-core:1.10.19' androidTestCompile 'org.mockito:mockito-core:1.10.19'
androidTestCompile 'com.google.guava:guava:20.0' androidTestCompile 'com.google.guava:guava:20.0'
apt 'com.google.dagger:dagger-compiler:2.2' apt 'com.google.dagger:dagger-compiler:2.11-rc2'
apt 'com.jakewharton:butterknife-compiler:8.0.1' apt 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.0' compile 'com.android.support:design:25.3.1'
compile 'com.android.support:preference-v14:25.3.0' compile 'com.android.support:preference-v14:25.3.1'
compile 'com.android.support:support-v4:25.3.0' compile 'com.android.support:support-v4:25.3.1'
compile 'com.getpebble:pebblekit:3.0.0' compile 'com.getpebble:pebblekit:3.0.0'
compile 'com.github.paolorotolo:appintro:3.4.0' compile 'com.github.paolorotolo:appintro:3.4.0'
compile 'com.google.auto.factory:auto-factory:1.0-beta3' compile 'com.google.auto.factory:auto-factory:1.0-beta3'
compile 'com.google.dagger:dagger:2.2' compile 'com.google.dagger:dagger:2.11-rc2'
compile 'com.jakewharton:butterknife:8.0.1' compile 'com.jakewharton:butterknife:8.6.1-SNAPSHOT'
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT' compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
compile 'com.opencsv:opencsv:3.7' compile 'com.opencsv:opencsv:3.9'
compile 'org.apmem.tools:layouts:1.10@aar' compile 'org.apmem.tools:layouts:1.10'
compile 'org.jetbrains:annotations-java5:15.0' compile 'org.jetbrains:annotations-java5:15.0'
compile 'com.google.code.gson:gson:2.8.0' compile 'com.google.code.gson:gson:2.7'
compile 'com.google.code.findbugs:jsr305:2.0.1' compile 'com.google.code.findbugs:jsr305:3.0.2'
compile 'com.google.guava:guava:20.0' compile 'com.google.guava:guava:20.0'
provided 'javax.annotation:jsr250-api:1.0' provided 'javax.annotation:jsr250-api:1.0'
compile ('io.socket:socket.io-client:0.7.0') { compile ('io.socket:socket.io-client:+') {
exclude group: 'org.json', module: 'json' exclude group: 'org.json', module: 'json'
} }
testApt 'com.google.dagger:dagger-compiler:2.2' testApt 'com.google.dagger:dagger-compiler:2.11-rc2'
testApt 'com.google.guava:guava:20.0' testApt 'com.google.guava:guava:20.0'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:5.0-SNAPSHOT'
testCompile 'org.hamcrest:hamcrest-library:1.3' testCompile 'org.hamcrest:hamcrest-library:1.4-atlassian-1'
testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.mockito:mockito-core:2.8.9'
testCompile 'org.json:json:20160810' testCompile 'org.json:json:20160810'
testCompile 'org.robolectric:robolectric:3.3.2' testCompile 'org.robolectric:robolectric:3.4-rc2'
} }
retrolambda { retrolambda {

1
app/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
Unescape View File

@ -50,6 +50,7 @@ public class WidgetControllerTest extends BaseUnitTest
today = DateUtils.getStartOfToday(); today = DateUtils.getStartOfToday();
habit = fixtures.createEmptyHabit(); habit = fixtures.createEmptyHabit();
habitList.add(habit);
commandRunner = mock(CommandRunner.class); commandRunner = mock(CommandRunner.class);
notificationTray = mock(NotificationTray.class); notificationTray = mock(NotificationTray.class);
controller = new WidgetController(commandRunner, notificationTray); controller = new WidgetController(commandRunner, notificationTray);

4
build.gradle
Unescape View File

@ -5,9 +5,9 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
classpath 'me.tatarka:gradle-retrolambda:3.2.5' classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
} }

4
run_tests
Unescape View File

@ -36,7 +36,7 @@ info() {
} }
fail() { fail() {
$ADB shell reboot -p $ADB emu kill
exit 1 exit 1
} }
@ -92,7 +92,7 @@ info "Fetching logcat"
$ADB logcat -d > ${OUTPUTS_DIR}/logcat.txt $ADB logcat -d > ${OUTPUTS_DIR}/logcat.txt
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------
info "Building coverage report" info "Running JVM tests"
mkdir -p ${OUTPUTS_DIR}/code-coverage/connected/ mkdir -p ${OUTPUTS_DIR}/code-coverage/connected/
$ADB pull /data/user/0/${PACKAGE_NAME}/files/coverage.ec \ $ADB pull /data/user/0/${PACKAGE_NAME}/files/coverage.ec \
${OUTPUTS_DIR}/code-coverage/connected/ ${OUTPUTS_DIR}/code-coverage/connected/

Write Preview
Loading…
Cancel
Save