Skip to content

Commit

Permalink
Remove explicit buildToolsVersion
Browse files Browse the repository at this point in the history
Rely on the `buildToolsVersion` that is bundled with the version of Android Gradle Plugin.

Test: ./run_all_tests.sh
  • Loading branch information
ianhanniballake committed Feb 10, 2020
1 parent 3707445 commit 61d7b0c
Show file tree
Hide file tree
Showing 28 changed files with 7 additions and 28 deletions.
1 change: 0 additions & 1 deletion BasicRxJavaSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.example.android.persistence"
Expand Down
1 change: 0 additions & 1 deletion BasicRxJavaSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion BasicRxJavaSampleKotlin/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.example.android.observability"
Expand Down
1 change: 0 additions & 1 deletion BasicRxJavaSampleKotlin/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion BasicSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId 'com.example.android.persistence'
Expand Down
1 change: 0 additions & 1 deletion BasicSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion GithubBrowserSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ allOpen {
}
android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.android.example.github"
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion GithubBrowserSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion LiveDataSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.android.example.livedata"
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion LiveDataSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion NavigationAdvancedSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion NavigationBasicSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion PagingSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "paging.android.example.com.pagingsample"
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion PagingSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion PagingWithNetworkSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.android.example.paging.pagingwithnetwork"
minSdkVersion build_versions.min_sdk
Expand Down
2 changes: 1 addition & 1 deletion PagingWithNetworkSample/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: 'androidx.benchmark'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
multiDexEnabled true
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion PagingWithNetworkSample/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ apply plugin: 'kotlin-kapt'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion PagingWithNetworkSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion PersistenceContentProviderSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.example.android.contentprovidersample"
minSdkVersion build_versions.min_sdk
Expand Down
1 change: 0 additions & 1 deletion PersistenceContentProviderSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion PersistenceMigrationsSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.example.android.persistence.migration"
Expand Down
1 change: 0 additions & 1 deletion PersistenceMigrationsSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion ViewBindingSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
2 changes: 1 addition & 1 deletion WorkManagerSample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
applicationId "com.example.background"
vectorDrawables {
Expand Down
1 change: 0 additions & 1 deletion WorkManagerSample/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ apply plugin: 'androidx.benchmark'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
vectorDrawables {
Expand Down
1 change: 0 additions & 1 deletion WorkManagerSample/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion build_versions.compile_sdk
buildToolsVersion build_versions.build_tools

defaultConfig {
vectorDrawables {
Expand Down
1 change: 0 additions & 1 deletion WorkManagerSample/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down
1 change: 0 additions & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def build_versions = [:]
build_versions.min_sdk = 14
build_versions.compile_sdk = 29
build_versions.target_sdk = 29
build_versions.build_tools = "28.0.3"
ext.build_versions = build_versions

def deps = [:]
Expand Down

0 comments on commit 61d7b0c

Please sign in to comment.