diff --git a/.bazelrc b/.bazelrc
index 94fec2d4..d6cbf173 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,6 +1,5 @@
 build \
  --spawn_strategy=standalone \
  --strategy=SwiftCompile=worker \
- --incompatible_disallow_load_labels_to_cross_package_boundaries=false \
  --incompatible_new_actions_api=false \
  --experimental_strict_action_env=true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9dd4ea30..e7eeaeb9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Main workflow 
+name: Main workflow
 
 on: [pull_request]
 
@@ -9,7 +9,13 @@ jobs:
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v1
-    - name: Setup dependencies 
-      run: sudo gem install cocoapods 
-    - name: Run Tests
-      run: make ci
+    - name: Setup dependencies
+      run: sudo gem install cocoapods
+    - name: Run Tests (test)
+      run: make test
+    - name: Run Swift Tests
+      run: make run_swift
+    - name: Run Goldmaster Tests
+      run: make goldmaster
+    - name: Run Perf Tests
+      run: make run_perf_ci
diff --git a/Package.swift b/Package.swift
index 40f683d0..66f512cc 100644
--- a/Package.swift
+++ b/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
 
         // Changes reside in the xchammer branch
         .package(url: "https://github.com/pinterest/Tulsi.git",
-            .revision("0e17ac96f76a64c014785f9fdf1a49e8bc8dc006")),
+            .revision("0e16c8fb6a65037c30ebe9b896fc308fa3ea1cbd")),
 
         // Note: XcodeGen now transitively depends on this one, so the versions
         // must match!
diff --git a/WORKSPACE b/WORKSPACE
index cb0e5e59..93ed744b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,23 +1,39 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
+
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -25,9 +41,7 @@ load(
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
-
-
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -42,13 +56,6 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
-
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
 
 ## SPM Dependencies
 
diff --git a/sample/Frankenstein/Makefile b/sample/Frankenstein/Makefile
index 0042096c..7c30388a 100644
--- a/sample/Frankenstein/Makefile
+++ b/sample/Frankenstein/Makefile
@@ -1,2 +1,2 @@
 deps:
-	tools/bazelwrapper run @rules_pods//:update_pods -- --src_root $$PWD
+	tools/bazelwrapper run @rules_pods//:update_pods -- --src_root $$PWD --trace
diff --git a/sample/Frankenstein/WORKSPACE b/sample/Frankenstein/WORKSPACE
index f1336ca8..36c4cee1 100644
--- a/sample/Frankenstein/WORKSPACE
+++ b/sample/Frankenstein/WORKSPACE
@@ -2,31 +2,39 @@ 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"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
 )
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -49,17 +57,12 @@ load(
 )
 
 apple_support_dependencies()
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-fa7a088/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
 # XCHammer resources
diff --git a/sample/Frankenstein/tools/bazelwrapper b/sample/Frankenstein/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/sample/Frankenstein/tools/bazelwrapper
+++ b/sample/Frankenstein/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 
diff --git a/sample/SnapshotMe/WORKSPACE b/sample/SnapshotMe/WORKSPACE
index 34055efb..36c4cee1 100644
--- a/sample/SnapshotMe/WORKSPACE
+++ b/sample/SnapshotMe/WORKSPACE
@@ -1,25 +1,40 @@
 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")
+
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "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",
-    ],
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -27,7 +42,7 @@ load(
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -42,20 +57,14 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-4079ca6/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
-
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
 # resources so they can be loaded
diff --git a/sample/SnapshotMe/tools/bazelwrapper b/sample/SnapshotMe/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/sample/SnapshotMe/tools/bazelwrapper
+++ b/sample/SnapshotMe/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 
diff --git a/sample/Tailor/WORKSPACE b/sample/Tailor/WORKSPACE
index 15fcf3f9..36c4cee1 100644
--- a/sample/Tailor/WORKSPACE
+++ b/sample/Tailor/WORKSPACE
@@ -1,22 +1,40 @@
 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")
+
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -24,7 +42,7 @@ load(
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -40,6 +58,12 @@ load(
 
 apple_support_dependencies()
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_pods",
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
+)
 
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
@@ -48,3 +72,4 @@ local_repository(
     name = "xchammer_resources",
     path = "tools/xchammer.app/Contents/Resources",
 )
+
diff --git a/sample/Tailor/tools/bazelwrapper b/sample/Tailor/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/sample/Tailor/tools/bazelwrapper
+++ b/sample/Tailor/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 
diff --git a/sample/UrlGet/.bazelrc b/sample/UrlGet/.bazelrc
index 06998c7c..693183e1 100644
--- a/sample/UrlGet/.bazelrc
+++ b/sample/UrlGet/.bazelrc
@@ -12,7 +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 \
diff --git a/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD b/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD
index 35051675..9772d006 100644
--- a/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD
+++ b/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD
@@ -1,137 +1,64 @@
 load('@build_bazel_rules_apple//apple:resources.bzl', 'apple_bundle_import')
-load('@build_bazel_rules_apple//apple:apple.bzl', 'apple_static_framework_import')
-load(
-  "//Vendor/rules_pods/BazelExtensions:extensions.bzl",
-  "pch_with_name_hint",
-  "acknowledged_target",
-  "gen_module_map",
-  "gen_includes"
-)
+load('@build_bazel_rules_apple//apple:apple.bzl',
+     'apple_static_framework_import')
+load("//Vendor/rules_pods/BazelExtensions:extensions.bzl",
+     "pch_with_name_hint", "acknowledged_target", "gen_module_map",
+     "gen_includes")
 # Add a config setting release for compilation mode
 # Assume that people are using `opt` for release mode
 # see the bazel user manual for more information
 # https://docs.bazel.build/versions/master/be/general.html#config_setting
-config_setting(
-  name = "release",
-  values = {
-    "compilation_mode": "opt"
-  }
-)
+config_setting(name="release", values={"compilation_mode": "opt"})
 filegroup(
-  name = "GoogleAppIndexing_hdrs",
-  srcs = glob(
-    [
-      "pod_support/Headers/Public/**/*"
+    name="GoogleAppIndexing_hdrs",
+    srcs=glob(["pod_support/Headers/Public/**/*"], exclude_directories=1) +
+    glob(["Changelog/**/*.h", "Changelog/**/*.hpp", "Changelog/**/*.hxx"],
+         exclude_directories=1),
+    visibility=["//visibility:public"])
+gen_includes(name="GoogleAppIndexing_includes",
+             include=["Vendor/GoogleAppIndexing/pod_support/Headers/Public/"])
+gen_module_map("GoogleAppIndexing", "GoogleAppIndexing_module_map",
+               "GoogleAppIndexing", ["GoogleAppIndexing_hdrs"])
+objc_library(
+    name="GoogleAppIndexing",
+    enable_modules=1,
+    hdrs=[
+        ":GoogleAppIndexing_hdrs",
+        ":GoogleAppIndexing_module_map_module_map_file"
     ],
-    exclude_directories = 1
-  ) + glob(
-    [
-      "Changelog/**/*.h",
-      "Changelog/**/*.hpp",
-      "Changelog/**/*.hxx"
+    pch=pch_with_name_hint("GoogleAppIndexing", []),
+    includes=["GoogleAppIndexing_module_map"],
+    sdk_frameworks=["CoreText", "SafariServices"],
+    deps=[
+        ":GoogleAppIndexing_VendoredFrameworks", ":GoogleAppIndexing_includes"
     ],
-    exclude_directories = 1
-  ),
-  visibility = [
-    "//visibility:public"
-  ]
-)
-gen_includes(
-  name = "GoogleAppIndexing_includes",
-  include = [
-    "Vendor/GoogleAppIndexing/pod_support/Headers/Public/"
-  ]
-)
-gen_module_map(
-  "GoogleAppIndexing",
-  "GoogleAppIndexing_module_map",
-  "GoogleAppIndexing",
-  [
-    "GoogleAppIndexing_hdrs"
-  ]
-)
-objc_library(
-  name = "GoogleAppIndexing",
-  enable_modules = 1,
-  hdrs = [
-    ":GoogleAppIndexing_hdrs",
-    ":GoogleAppIndexing_module_map_module_map_file"
-  ],
-  pch = pch_with_name_hint(
-    "GoogleAppIndexing",
-    []
-  ),
-  includes = [
-    "GoogleAppIndexing_module_map"
-  ],
-  sdk_frameworks = [
-    "CoreText",
-    "SafariServices"
-  ],
-  deps = [
-    ":GoogleAppIndexing_Bundle_GoogleAppIndexingResources",
-    ":GoogleAppIndexing_VendoredFrameworks",
-    ":GoogleAppIndexing_includes"
-  ],
-  copts = [
-    "-Wno-everything",
-    "-Wnon-modular-include-in-framework-module",
-    "-g",
-    "-stdlib=libc++",
-    "-DCOCOAPODS=1",
-    "-DOBJC_OLD_DISPATCH_PROTOTYPES=0",
-    "-fdiagnostics-show-note-include-stack",
-    "-fno-common",
-    "-fembed-bitcode-marker",
-    "-fmessage-length=0",
-    "-fpascal-strings",
-    "-fstrict-aliasing",
-    "-Wno-error=nonportable-include-path"
-  ] + select(
-    {
-      "//conditions:default": [
-        "-DPOD_CONFIGURATION_RELEASE=0"
-      ],
-      ":release": [
-        "-DPOD_CONFIGURATION_RELEASE=1",
-        "-DNS_BLOCK_ASSERTIONS=1"
-      ]
-    }
-  ) + [
-    "-IVendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/"
-  ] + [
-    "-fmodule-name=GoogleAppIndexing_pod_module"
-  ],
-  data = [
-    ":GoogleAppIndexing_Bundle_GoogleAppIndexingResources"
-  ],
-  visibility = [
-    "//visibility:public"
-  ]
-)
+    copts=[
+        "-Wno-everything", "-Wnon-modular-include-in-framework-module", "-g",
+        "-stdlib=libc++", "-DCOCOAPODS=1", "-DOBJC_OLD_DISPATCH_PROTOTYPES=0",
+        "-fdiagnostics-show-note-include-stack", "-fno-common",
+        "-fembed-bitcode-marker", "-fmessage-length=0", "-fpascal-strings",
+        "-fstrict-aliasing", "-Wno-error=nonportable-include-path"
+    ] + select({
+        "//conditions:default": ["-DPOD_CONFIGURATION_RELEASE=0"],
+        ":release":
+        ["-DPOD_CONFIGURATION_RELEASE=1", "-DNS_BLOCK_ASSERTIONS=1"]
+    }) + [
+        "-IVendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/"
+    ] + ["-fmodule-name=GoogleAppIndexing_pod_module"],
+    data=[":GoogleAppIndexing_Bundle_GoogleAppIndexingResources"],
+    visibility=["//visibility:public"])
 acknowledged_target(
-  name = "GoogleAppIndexing_acknowledgement",
-  deps = [],
-  value = "//Vendor/GoogleAppIndexing/pod_support_buildable:acknowledgement_fragment"
-)
-apple_bundle_import(
-  name = "GoogleAppIndexing_Bundle_GoogleAppIndexingResources",
-  bundle_imports = glob(
-    [
-      "Resources/GoogleAppIndexingResources.bundle/**"
-    ],
-    exclude_directories = 1
-  )
+    name="GoogleAppIndexing_acknowledgement",
+    deps=[],
+    value=
+    "//Vendor/GoogleAppIndexing/pod_support_buildable:acknowledgement_fragment"
 )
+apple_bundle_import(name="GoogleAppIndexing_Bundle_GoogleAppIndexingResources",
+                    bundle_imports=glob(
+                        ["Resources/GoogleAppIndexingResources.bundle/**"],
+                        exclude_directories=1))
 apple_static_framework_import(
-  name = "GoogleAppIndexing_VendoredFrameworks",
-  framework_imports = glob(
-    [
-      "Frameworks/GoogleAppIndexing.framework/**"
-    ],
-    exclude_directories = 1
-  ),
-  visibility = [
-    "//visibility:public"
-  ]
-)
\ No newline at end of file
+    name="GoogleAppIndexing_VendoredFrameworks",
+    framework_imports=glob(["Frameworks/GoogleAppIndexing.framework/**"],
+                           exclude_directories=1),
+    visibility=["//visibility:public"])
diff --git a/sample/UrlGet/WORKSPACE b/sample/UrlGet/WORKSPACE
index 34055efb..36c4cee1 100644
--- a/sample/UrlGet/WORKSPACE
+++ b/sample/UrlGet/WORKSPACE
@@ -1,25 +1,40 @@
 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")
+
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "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",
-    ],
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -27,7 +42,7 @@ load(
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -42,20 +57,14 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-4079ca6/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
-
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
 # resources so they can be loaded
diff --git a/sample/UrlGet/tools/bazelwrapper b/sample/UrlGet/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/sample/UrlGet/tools/bazelwrapper
+++ b/sample/UrlGet/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 
diff --git a/sample/WorkspaceSource/WORKSPACE b/sample/WorkspaceSource/WORKSPACE
index 8245ee2a..f4bea883 100644
--- a/sample/WorkspaceSource/WORKSPACE
+++ b/sample/WorkspaceSource/WORKSPACE
@@ -1,26 +1,41 @@
 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")
 load(":workspace.bzl", "gen_repo")
 
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
+
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "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",
-    ],
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -28,7 +43,7 @@ load(
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -43,20 +58,14 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-4079ca6/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
-
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
 # resources so they can be loaded
@@ -66,4 +75,3 @@ local_repository(
 )
 
 gen_repo(name = "Some")
-
diff --git a/sample/WorkspaceSource/tools/bazelwrapper b/sample/WorkspaceSource/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/sample/WorkspaceSource/tools/bazelwrapper
+++ b/sample/WorkspaceSource/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 
diff --git a/third_party/repositories.bzl b/third_party/repositories.bzl
index 38962808..32636115 100644
--- a/third_party/repositories.bzl
+++ b/third_party/repositories.bzl
@@ -260,7 +260,7 @@ def xchammer_dependencies():
     namespaced_git_repository(
         name = "Tulsi",
         remote = "https://github.com/pinterest/tulsi.git",
-        commit = "e8636223ea103ccdeaa273f6dcf6ba3d01f08826",
+        commit = "0e16c8fb6a65037c30ebe9b896fc308fa3ea1cbd",
         patch_cmds = [
             """
          sed -i '' 's/\:__subpackages__/visibility\:public/g' src/TulsiGenerator/BUILD
diff --git a/tools/bazelwrapper b/tools/bazelwrapper
index d7bac5a0..6e353a5c 100755
--- a/tools/bazelwrapper
+++ b/tools/bazelwrapper
@@ -20,11 +20,9 @@ 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_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"