Merge pull request #17 from andrzejchm/master

Master

Author: andrzejchm

CHANGELOG.md

@@ -1,6 +1,9 @@
-## 0.0.4 (27 April 2016)
-**Features**
+## 0.0.5 (5th May 2016)
+**Bugfixes**
 
+* Removed unnecesary <application> tag from AndroidManifest.xml to no longer cause Manifest merge conflicts with espresso-intents dependency
+
+## 0.0.4 (27th April 2016)
 * **Request verification**
 It is possible to verify which requests were called and how many times thanks to `RequestVerifier`.
 
@@ -18,7 +21,7 @@ It is possible to verify which requests were called and how many times thanks to
 * renamed method `RESTMockServer.removeAllMatchableCalls()` to `RESTMockServer.reset()` (#5)
 * generified `when*` methods in `RESTMockServer` to make it possible to use meta-matchers like `allOf` and `anyOf` (#5).
 
-## 0.0.3 (23 April 2016)
+## 0.0.3 (23th April 2016)
 * Sample android app
 * Added logging capabilities to `RESTMockServer`. `RESTMockTestRunner` has enabled logging by default, if you use a custom TestRunner, use:
 
@@ -28,5 +31,5 @@ Or you can enable/disable it anytime with `RESTMockServer.enableLogging(RESTMock
 
 * bugfixes
 
-## 0.0.2 (22 April 2016)
+## 0.0.2 (22th April 2016)
 Initial release

README.md

@@ -24,7 +24,7 @@ RESTMockServer.whenGET(pathContains("users/defunkt"))
 - [License](#license)
 
 ## Setup
-Here are the basic rules to set up RESTMock for various platforms
+Here are the basic rules to set up RESTMock for Android
 
 ####Step 1: Repository
 Add it in your root build.gradle at the end of repositories:
@@ -42,7 +42,7 @@ Add the dependency
 
 ```groovy  
 dependencies {
-	androidTestCompile 'com.github.andrzejchm.RESTMock:android:0.0.4'
+	androidTestCompile 'com.github.andrzejchm.RESTMock:android:0.0.5'
 }
 ```
 

androidsample/build.gradle

@@ -72,6 +72,8 @@ dependencies {
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    //this dependency tends to break things for most users. Im adding it to check whether the app compiles correctly
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
     androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2') {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
@@ -83,9 +85,6 @@ dependencies {
 
     //the most important, RESTMock! :)
     androidTestCompile project(':android')
-    androidTestCompile(project(':core')) {
-        exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
-    }
 
     testCompile 'junit:junit:4.12'
 }

build.gradle

@@ -33,7 +33,7 @@ allprojects {
     repositories {
         jcenter()
     }
-    version = "0.0.4"
+    version = "0.0.5"
 }
 
 ext.preDexLibraries = project.hasProperty('preDexLibraries')

circle.yml

@@ -1,11 +1,3 @@
-general:
-  branches:
-    only:
-      - master
-      - develop
-      - /feature\/.*/
-      - /bugfix\/.*/
-      - /release\/.*/
 ## Customize the test machine
 machine:
   ## Add some environment variables
@@ -21,5 +13,5 @@ dependencies:
 ## Customize test commands
 test:
   override:
-    - case $CIRCLE_NODE_INDEX in 0) ./gradlew check -PpreDexLibraries=false ;; 1) ;; esac:
+    - case $CIRCLE_NODE_INDEX in 0) ./gradlew check -PpreDexLibraries=false ;; 1) ./gradlew :androidsample:assembleDebug :androidsample:assembleAndroidTest  -PpreDexLibraries=false ;; esac:
         parallel: true