Skip to content

Update dependencies of sample tests so most of them are able to run #290

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

Merged
woshimaliang merged 2 commits into from
Dec 11, 2021
Merged

Update dependencies of sample tests so most of them are able to run #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea9aaa
update dependencies in sample tests so most able to run, including `m…
woshimaliang Dec 10, 2021
6fcda36
add http_file back in Frankenstein/WORKSPACE
woshimaliang Dec 10, 2021
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
25 changes: 8 additions & 17 deletions sample/Frankenstein/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")

# Build with changes to add --standalone to test invocation. Additionally, fix
# several python build issues
http_file(
name = "xctestrunner",
executable = 1,
urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
)

git_repository(
http_archive(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.18.0",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
)

load(
"@build_bazel_rules_apple//apple:repositories.bzl",
"apple_rules_dependencies",
)

git_repository(
apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
commit = "0192f16b82b2998d846c45187545e38548a6671a",
remote = "https://github.com/bazelbuild/rules_swift.git",
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
)

load(
Expand All @@ -34,8 +27,6 @@ load(

swift_rules_dependencies()

apple_rules_dependencies(ignore_version_differences = True)

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
Expand Down
4 changes: 2 additions & 2 deletions sample/Frankenstein/tools/bazelwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trap exit_trap EXIT
# Go to bazel release page
# These are typically posted in groups.google
# https://groups.google.com/forum/#!forum/bazel-discuss
BAZEL_VERSION="0.28.1"
BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
BAZEL_VERSION="3.4.1"
BAZEL_VERSION_SHA="b168b9c4186916cd07922b1155bca14eecc812729669f1fdbab141f3f4eee2a0"

BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"

Expand Down
16 changes: 7 additions & 9 deletions sample/SnapshotMe/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

git_repository(
http_archive(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.18.0",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
)

load(
"@build_bazel_rules_apple//apple:repositories.bzl",
"apple_rules_dependencies",
)

apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
urls = [
"https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz",
],
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
)

load(
Expand All @@ -26,8 +26,6 @@ load(

swift_rules_dependencies()

apple_rules_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
Expand Down
4 changes: 2 additions & 2 deletions sample/SnapshotMe/tools/bazelwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trap exit_trap EXIT
# Go to bazel release page
# These are typically posted in groups.google
# https://groups.google.com/forum/#!forum/bazel-discuss
BAZEL_VERSION="0.28.1"
BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
BAZEL_VERSION="3.4.1"
BAZEL_VERSION_SHA="b168b9c4186916cd07922b1155bca14eecc812729669f1fdbab141f3f4eee2a0"

BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"

Expand Down
18 changes: 9 additions & 9 deletions sample/Tailor/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

git_repository(
http_archive(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.18.0",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
)

load(
"@build_bazel_rules_apple//apple:repositories.bzl",
"apple_rules_dependencies",
)

git_repository(
apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
commit = "0192f16b82b2998d846c45187545e38548a6671a",
remote = "https://github.com/bazelbuild/rules_swift.git",
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
)

load(
Expand All @@ -24,8 +26,6 @@ load(

swift_rules_dependencies()

apple_rules_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
Expand Down
4 changes: 2 additions & 2 deletions sample/Tailor/tools/bazelwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trap exit_trap EXIT
# Go to bazel release page
# These are typically posted in groups.google
# https://groups.google.com/forum/#!forum/bazel-discuss
BAZEL_VERSION="0.28.1"
BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
BAZEL_VERSION="3.4.1"
BAZEL_VERSION_SHA="b168b9c4186916cd07922b1155bca14eecc812729669f1fdbab141f3f4eee2a0"

BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"

Expand Down
2 changes: 0 additions & 2 deletions sample/UrlGet/.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ build \
--apple_generate_dsym=false \
--spawn_strategy=standalone \
--apple_platform_type=ios \
--noincompatible_disallow_load_labels_to_cross_package_boundaries \
--incompatible_new_actions_api=false

build:ios_x86_64 \
--ios_multi_cpus=x86_64
Expand Down
1 change: 0 additions & 1 deletion sample/UrlGet/Vendor/GoogleAppIndexing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ objc_library(
"//visibility:public",
],
deps = [
":GoogleAppIndexing_Bundle_GoogleAppIndexingResources",
":GoogleAppIndexing_VendoredFrameworks",
":GoogleAppIndexing_includes",
],
Expand Down
16 changes: 7 additions & 9 deletions sample/UrlGet/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

git_repository(
http_archive(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.18.0",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
)

load(
"@build_bazel_rules_apple//apple:repositories.bzl",
"apple_rules_dependencies",
)

apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
urls = [
"https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz",
],
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
)

load(
Expand All @@ -26,8 +26,6 @@ load(

swift_rules_dependencies()

apple_rules_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
Expand Down
6 changes: 3 additions & 3 deletions sample/UrlGet/ios-app/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ ios_application(
bundle_id = "Google.UrlGet",
entitlements = "Example.entitlements",
extensions = [
":share-extension",
":siri-extension",
#":share-extension",
#":siri-extension",
],
families = ["iphone"],
infoplists = ["UrlGet/UrlGet-Info.plist"],
Expand Down Expand Up @@ -215,7 +215,7 @@ objc_library(
deps = [
"//Vendor/GoogleAppIndexing",
"//Vendor/GoogleAuthUtilities",
"//Vendor/PINCache",
#"//Vendor/PINCache",
"//Vendor/PINOperation",
"//ios-app/HeaderLib",
],
Expand Down
4 changes: 2 additions & 2 deletions sample/UrlGet/tools/bazelwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trap exit_trap EXIT
# Go to bazel release page
# These are typically posted in groups.google
# https://groups.google.com/forum/#!forum/bazel-discuss
BAZEL_VERSION="0.28.1"
BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
BAZEL_VERSION="3.4.1"
BAZEL_VERSION_SHA="b168b9c4186916cd07922b1155bca14eecc812729669f1fdbab141f3f4eee2a0"

BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"

Expand Down
17 changes: 7 additions & 10 deletions sample/WorkspaceSource/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load(":workspace.bzl", "gen_repo")

git_repository(
http_archive(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.18.0",
sha256 = "55f4dc1c9bf21bb87442665f4618cff1f1343537a2bd89252078b987dcd9c382",
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.20.0/rules_apple.0.20.0.tar.gz",
)

load(
"@build_bazel_rules_apple//apple:repositories.bzl",
"apple_rules_dependencies",
)

apple_rules_dependencies()

http_archive(
name = "build_bazel_rules_swift",
urls = [
"https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz",
],
sha256 = "cea22c0616d797e494d7844a9b604520c87f53c81de49613a7e679ec5b821620",
url = "https://github.com/bazelbuild/rules_swift/releases/download/0.14.0/rules_swift.0.14.0.tar.gz",
)

load(
Expand All @@ -27,8 +26,6 @@ load(

swift_rules_dependencies()

apple_rules_dependencies()

load(
"@com_google_protobuf//:protobuf_deps.bzl",
"protobuf_deps",
Expand Down
4 changes: 2 additions & 2 deletions sample/WorkspaceSource/tools/bazelwrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trap exit_trap EXIT
# Go to bazel release page
# These are typically posted in groups.google
# https://groups.google.com/forum/#!forum/bazel-discuss
BAZEL_VERSION="0.28.1"
BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
BAZEL_VERSION="3.4.1"
BAZEL_VERSION_SHA="b168b9c4186916cd07922b1155bca14eecc812729669f1fdbab141f3f4eee2a0"

BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"

Expand Down