Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Fixed the unit tests and made sure they worked in Android Studio
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Petrescu committed Sep 3, 2015
1 parent 0ce9a3d commit 3c12f8f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 20 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'org.robolectric:robolectric-gradle-plugin:0.14.+'
classpath 'com.android.tools.build:gradle:1.3.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Feb 13 17:44:35 PST 2015
#Thu Sep 03 08:11:07 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
26 changes: 10 additions & 16 deletions yearclass/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'robolectric'

repositories {
jcenter()
Expand All @@ -15,25 +14,20 @@ android {
versionCode 1
versionName "1.0"
}

sourceSets {
androidTest.setRoot('src/androidTest')
}
}

robolectric {
include '**/*Test.class'
exclude '**/espresso/**/*.class'
}

dependencies {
androidTestCompile 'junit:junit:4.12'
androidTestCompile('org.robolectric:robolectric:2.4') {
exclude module: 'commons-logging'
exclude module: 'httpclient'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.0.5-beta'
testCompile 'org.robolectric:robolectric:3.0'
testCompile ('org.powermock:powermock-api-mockito:1.6.2') {
exclude module: 'hamcrest-core'
exclude module: 'objenesis'
}
testCompile ('org.powermock:powermock-module-junit4:1.6.2') {
exclude module: 'hamcrest-core'
exclude module: 'objenesis'
}
androidTestCompile 'org.powermock:powermock-api-mockito:1.6.1'
androidTestCompile 'org.powermock:powermock-module-junit4:1.6.1'
}

apply from: rootProject.file('release.gradle')

0 comments on commit 3c12f8f

Please sign in to comment.