Skip to content

Commit

Permalink
All branches merged
Browse files Browse the repository at this point in the history
  • Loading branch information
RohitSurwase committed Jan 1, 2017
1 parent 4aa272a commit bf55388
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
10 changes: 5 additions & 5 deletions NavigationDrawerInApp/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
targetSdkVersion 25
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -21,9 +21,9 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
// androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
// exclude group: 'com.android.support', module: 'support-annotations'
// })
compile 'com.android.support:appcompat-v7:25.1.0'
testCompile 'junit:junit:4.12'
// testCompile 'junit:junit:4.12'
}
4 changes: 0 additions & 4 deletions NavigationDrawerInApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ buildscript {
}

allprojects {
//You do not need to change buildDir if you have placed your project at root directory
//path of buildDir depends on the machine where you are working
// buildDir = "C:\\AndroidProjectBuild/${rootProject.name}/${project.name}"

repositories {
jcenter()
}
Expand Down
2 changes: 1 addition & 1 deletion PickAndCropImage/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
targetSdkVersion 25
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand Down

0 comments on commit bf55388

Please sign in to comment.