From 2b6e0135812927c8acfbb50f0e73f2aac79a5813 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Thu, 13 Feb 2020 20:48:26 +0100 Subject: [PATCH] Pin Android SDK version to 28.0.2 (#374) * Ping Android SDK version to 28.0.2 Fixes https://github.com/bazelbuild/rules_jvm_external/issues/364 * Also ping SDK version in broken examples projects to 28.0.2 --- WORKSPACE | 6 +++++- examples/android_kotlin_app/WORKSPACE | 7 ++++++- examples/android_local_test/WORKSPACE | 7 ++++++- examples/simple/WORKSPACE | 7 ++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d197894e6..b13e794cc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,6 +1,10 @@ workspace(name = "rules_jvm_external") -android_sdk_repository(name = "androidsdk") +android_sdk_repository( + name = "androidsdk", + api_level = 28, + build_tools_version = "28.0.2", +) load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") load( diff --git a/examples/android_kotlin_app/WORKSPACE b/examples/android_kotlin_app/WORKSPACE index d14b54080..4f0896d42 100644 --- a/examples/android_kotlin_app/WORKSPACE +++ b/examples/android_kotlin_app/WORKSPACE @@ -1,6 +1,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -android_sdk_repository(name = "androidsdk") +android_sdk_repository( + name = "androidsdk", + api_level = 28, + build_tools_version = "28.0.2", +) + # BEGIN io_bazel_rules_kotlin diff --git a/examples/android_local_test/WORKSPACE b/examples/android_local_test/WORKSPACE index 9f96e0f60..4388511d8 100644 --- a/examples/android_local_test/WORKSPACE +++ b/examples/android_local_test/WORKSPACE @@ -1,6 +1,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -android_sdk_repository(name = "androidsdk") +android_sdk_repository( + name = "androidsdk", + api_level = 28, + build_tools_version = "28.0.2", +) + http_archive( name = "robolectric", diff --git a/examples/simple/WORKSPACE b/examples/simple/WORKSPACE index 83ce2fc3a..1b17b5bec 100644 --- a/examples/simple/WORKSPACE +++ b/examples/simple/WORKSPACE @@ -1,4 +1,9 @@ -android_sdk_repository(name = "androidsdk") +android_sdk_repository( + name = "androidsdk", + api_level = 28, + build_tools_version = "28.0.2", +) + local_repository( name = "rules_jvm_external",