Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove build_tools_version and api_level from workspace the file … #210

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Remove build_tools_version and api_level from workspace the file … #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions android/firebase-cloud-messaging/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Requires ANDROID_HOME set to the path of your Android SDK.
android_sdk_repository(
name = "androidsdk",
api_level = 28,
build_tools_version = "28.0.2",
)
android_sdk_repository(name = "androidsdk")

RULES_JVM_EXTERNAL_TAG = "2.9"

Expand Down
10 changes: 2 additions & 8 deletions tutorial/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@
# Scripts to compile the tutorial on the CI system
# This script expect the following environment variable:
# $BAZEL_INSTALLER set to the path to the bazel installer
# $ANDROID_SDK_PATH, $ANDROID_SDK_API_LEVEL,
# $ANDROID_SDK_BUILD_TOOLS_VERSION are respectively the
# path to the Android SDK, the API Level of the SDK and
# the version of the build tools. If the path isn't defined
# the android build won't be tested. The 2 other one are defaulted
# to, respectively, "22" and "22.0.1".
# $ANDROID_SDK_PATH is the path to the Android SDK. If the path isn't
# defined, then the android build won't be tested.

IOS_SDK_VERSION=$(xcrun --sdk iphonesimulator --show-sdk-version)

Expand All @@ -42,8 +38,6 @@ if [ -n "${ANDROID_SDK_PATH-}" ]; then
android_sdk_repository(
name = "androidsdk",
path = "${ANDROID_SDK_PATH}",
api_level = ${ANDROID_SDK_API_LEVEL:-22},
build_tools_version = "${ANDROID_SDK_BUILD_TOOLS_VERSION:-22.0.1}",
)
EOF
# Revert change to workspace
Expand Down