Skip to content

Commit

Permalink
Merge pull request #34 from ObjectiveTruth/create_booking_flow
Browse files Browse the repository at this point in the history
Refactor booking, joinorleave, viewjoinorleave
  • Loading branch information
ObjectiveTruth authored Sep 2, 2016
2 parents 979afa4 + 787343d commit 93282f8
Show file tree
Hide file tree
Showing 126 changed files with 6,456 additions and 4,878 deletions.
12 changes: 12 additions & 0 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,18 @@ IntelliJ is [free for students](https://www.jetbrains.com/student/). :books:

5. Profit :boom:

### Tests

#### Unit Tests with test Reports

```./gradlew jacocoTestDebugUnitTestReport```

#### Instrumentation Tests

Requires device or emulator running

```./gradlew spoon```

## Code Pipeline

![commit_pipeline](readme_pictures/UoitDCLibraryBookingCommitPipelines.png)
Expand Down
10 changes: 6 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ buildscript {
}
dependencies {
// Main Android gradle plugin allows building of the entire play toolchain
classpath 'com.android.tools.build:gradle:2.2.0-beta1'
classpath 'com.android.tools.build:gradle:2.2.0-beta3'
// Fabric repository for Crashlytics.
classpath 'io.fabric.tools:gradle:1.+'
// Adds tasks to auto publish apks to Google App Store. https://github.com/Triple-T/gradle-play-publisher
classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
// Spoon is a fantastic testing hardness for logging tests easily
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.0'
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
// Prints the dexcount when making new apks, useful for keeping under the 65k limit
// See more info here http://developer.android.com/tools/building/multidex.html
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
Expand Down Expand Up @@ -183,7 +183,7 @@ dependencies {
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.1'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.squareup.spoon:spoon-client:1.6.1'
androidTestCompile 'com.squareup.spoon:spoon-client:1.6.4'
// Excluding these modules fixed Inflation error. Reference http://stackoverflow.com/a/30715011/1293521
androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2.1') {
exclude group: 'com.android.support', module: 'appcompat'
Expand Down Expand Up @@ -237,6 +237,8 @@ dependencies {
compile 'com.android.support:appcompat-v7:24.1.1'
// Standard Google Material Design Library
compile 'com.android.support:design:24.1.1'
// Preference Fragments
compile 'com.android.support:preference-v14:24.1.1'
// Standard Google WebServices Library
compile 'com.android.volley:volley:1.0.0'
}
Loading

0 comments on commit 93282f8

Please sign in to comment.