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

Update toolchain

Browse Source
pull/87/merge
Alinson S. Xavier 8 years ago
parent 2dd14dbf04
commit 96f620455f
4 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File

101
app/build.gradle
Unescape View File

@ -1,6 +1,4 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'me.tatarka.retrolambda'
apply plugin: 'jacoco' apply plugin: 'jacoco'
android { android {
@ -55,59 +53,62 @@ android {
dependencies { dependencies {
androidTestApt 'com.google.dagger:dagger-compiler:2.11-rc2' implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.support:design:25.3.1'
androidTestCompile 'com.android.support:support-annotations:25.3.1' implementation 'com.android.support:preference-v14:25.3.1'
androidTestCompile 'com.android.support.test:rules:0.5' implementation 'com.android.support:support-v4:25.3.1'
androidTestCompile 'com.android.support.test:runner:0.5' implementation 'com.getpebble:pebblekit:3.0.0'
androidTestCompile 'com.google.auto.factory:auto-factory:1.0-beta3' implementation 'com.github.paolorotolo:appintro:3.4.0'
androidTestCompile "com.google.dexmaker:dexmaker:1.2" implementation 'com.google.auto.factory:auto-factory:1.0-beta3'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' implementation 'com.google.dagger:dagger:2.11-rc2'
androidTestCompile 'org.mockito:mockito-core:1.10.19' implementation 'com.jakewharton:butterknife:8.6.1-SNAPSHOT'
androidTestCompile 'com.google.guava:guava:20.0' implementation 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
implementation 'org.apmem.tools:layouts:1.10'
apt 'com.google.dagger:dagger-compiler:2.11-rc2' implementation 'org.jetbrains:annotations-java5:15.0'
apt 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT' implementation 'com.google.code.gson:gson:2.7'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
compile 'com.android.support:appcompat-v7:25.3.1' implementation 'com.google.guava:guava:20.0'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:preference-v14:25.3.1' testImplementation 'junit:junit:5.0-SNAPSHOT'
compile 'com.android.support:support-v4:25.3.1' testImplementation 'org.hamcrest:hamcrest-library:1.4-atlassian-1'
compile 'com.getpebble:pebblekit:3.0.0' testImplementation 'org.mockito:mockito-core:2.8.9'
compile 'com.github.paolorotolo:appintro:3.4.0' testImplementation 'org.json:json:20160810'
compile 'com.google.auto.factory:auto-factory:1.0-beta3' testImplementation 'org.robolectric:robolectric:3.4-rc2'
compile 'com.google.dagger:dagger:2.11-rc2'
compile 'com.jakewharton:butterknife:8.6.1-SNAPSHOT' androidTestImplementation 'com.android.support:support-annotations:25.3.1'
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT' androidTestImplementation 'com.android.support.test:rules:0.5'
compile 'com.opencsv:opencsv:3.9' androidTestImplementation 'com.android.support.test:runner:0.5'
compile 'org.apmem.tools:layouts:1.10' androidTestImplementation 'com.google.auto.factory:auto-factory:1.0-beta3'
compile 'org.jetbrains:annotations-java5:15.0' androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
compile 'com.google.code.gson:gson:2.7' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
compile 'com.google.code.findbugs:jsr305:3.0.2' androidTestImplementation 'org.mockito:mockito-core:1.10.19'
compile 'com.google.guava:guava:20.0' androidTestImplementation 'com.google.guava:guava:20.0'
provided 'javax.annotation:jsr250-api:1.0' compileOnly 'javax.annotation:jsr250-api:1.0'
compile ('io.socket:socket.io-client:+') { annotationProcessor 'com.google.dagger:dagger-compiler:2.11-rc2'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
annotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.11-rc2'
testAnnotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
testAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.11-rc2'
androidTestAnnotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
androidTestAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
implementation ('com.opencsv:opencsv:3.9') {
exclude group: 'commons-logging', module: 'commons-logging'
}
implementation ('io.socket:socket.io-client:+') {
exclude group: 'org.json', module: 'json' exclude group: 'org.json', module: 'json'
} }
testApt 'com.google.dagger:dagger-compiler:2.11-rc2'
testApt 'com.google.guava:guava:20.0'
testCompile 'junit:junit:5.0-SNAPSHOT'
testCompile 'org.hamcrest:hamcrest-library:1.4-atlassian-1'
testCompile 'org.mockito:mockito-core:2.8.9'
testCompile 'org.json:json:20160810'
testCompile 'org.robolectric:robolectric:3.4-rc2'
}
retrolambda {
defaultMethods true
} }
jacoco { jacoco {
toolVersion = "0.7.6.201602180812" toolVersion = "0.7.4.201502262128"
} }
task coverageReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { task coverageReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {

6
build.gradle
Unescape View File

@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven { url 'https://maven.google.com' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.android.tools.build:gradle:3.0.0-alpha1'
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.6.4' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
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'
} }
} }
@ -16,6 +15,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven { url 'https://maven.google.com' }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
} }
} }

6
build.sh
Unescape View File

@ -128,14 +128,14 @@ install_apk() {
log_info "Installing APK" log_info "Installing APK"
if [ ! -z $RELEASE ]; then if [ ! -z $RELEASE ]; then
$ADB install -r ${OUTPUTS_DIR}/apk/app-release.apk || fail $ADB install -r ${OUTPUTS_DIR}/apk/release/app-release.apk || fail
else else
$ADB install -r ${OUTPUTS_DIR}/apk/app-debug.apk || fail $ADB install -r ${OUTPUTS_DIR}/apk/debug/app-debug.apk || fail
fi fi
} }
install_test_apk() { install_test_apk() {
$ADB install -r ${OUTPUTS_DIR}/apk/app-debug-androidTest.apk || fail $ADB install -r ${OUTPUTS_DIR}/apk/androidTest/debug/app-debug-androidTest.apk || fail
} }
run_instrumented_tests() { run_instrumented_tests() {

4
gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,6 +1,6 @@
#Fri Mar 17 21:42:38 EDT 2017 #Wed May 24 19:36:48 EDT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-4.0-20170417000025+0000-all.zip

Write Preview
Loading…
Cancel
Save