Merge branch 'master' into StudioProjectCompat, fixing conflicts, need

to re-add previous PR fix on the branch
This commit is contained in:
Joe Bowser
2017-10-18 11:04:44 -07:00
5 changed files with 74 additions and 7 deletions
+3 -3
View File
@@ -41,12 +41,12 @@ allprojects {
}
}
//This replaces project.properties
//This replaces project.properties w.r.t. build settings
project.ext {
defaultBuildToolsVersion="25.0.2" //String
defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4
defaultTargetSdkVersion=25 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=25 //Integer - We ALWAYS compile with the latest by default
defaultTargetSdkVersion=26 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=26 //Integer - We ALWAYS compile with the latest by default
}
}