Merge pull request #203 from garrettmoon/master

Upgrade to python3 / fix build on 12.3

Author: garrettmoon

.bazelversion

@@ -1 +1 @@
-4.0.0
+5.1.0

BazelExtensions/acknowledgement_merger.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import plistlib
-from sets import Set
 
 if len(sys.argv) < 3:
     print("Usage <merge|finalize> output_file [inputs]")
@@ -12,21 +11,22 @@
 action = sys.argv[1]
 
 merged_fragments = []
-seen_licenses = Set()
+seen_licenses = set()
 for idx, arg in enumerate(sys.argv):
     if idx <= 2:
         continue
-    input_plist = plistlib.readPlist(arg)
-    if not input_plist:
-        continue
-    fragments = input_plist if isinstance(input_plist, list) else [input_plist]
-    for fragment in fragments:
-        # We only want to insert a given software license 1 time
-        title = fragment.get("Title")
-        if title in seen_licenses:
+    with open(arg, 'rb') as f:
+        input_plist = plistlib.load(f, fmt=plistlib.FMT_XML)
+        if not input_plist:
             continue
-        seen_licenses.add(title)
-        merged_fragments.append(fragment)
+        fragments = input_plist if isinstance(input_plist, list) else [input_plist]
+        for fragment in fragments:
+            # We only want to insert a given software license 1 time
+            title = fragment.get("Title")
+            if title in seen_licenses:
+                continue
+            seen_licenses.add(title)
+            merged_fragments.append(fragment)
 
 if action == "--finalize":
     out_plist = {

BazelExtensions/headermap_builder.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import json

BazelExtensions/headermap_tool.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # This file is part of The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
@@ -31,6 +31,8 @@ class HeaderMap(object):
     def frompath(path):
         with open(path, 'rb') as f:
             magic = f.read(4)
+            if isinstance(magic, bytes):
+                magic = magic.decode("utf-8")
             if magic == k_header_magic_LE:
                 endian_code = '<'
             elif magic == k_header_magic_BE:
@@ -84,6 +86,8 @@ def frompath(path):
                 raise SystemExit("error: %s: unable to read zero-sized string table"%(
                         path,))
             strtable = f.read(strtable_size)
+            if isinstance(strtable, bytes):
+                strtable = strtable.decode("utf-8")
 
             if len(strtable) != strtable_size:
                 raise SystemExit("error: %s: unable to read complete string table"%(

Examples/BasiciOS/.bazelversion

@@ -1 +1 @@
-4.0.0
+5.1.0

Examples/BasiciOS/WORKSPACE

@@ -9,8 +9,8 @@ load("@rules_pods//BazelExtensions:workspace.bzl", "new_pod_repository")
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
 )
 
 load(
@@ -34,13 +34,6 @@ load(
 
 swift_rules_dependencies()
 
-load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
-)
-
-protobuf_deps()
-
 new_pod_repository(
     name = "SlackTextViewController",
     url = "https://github.com/slackhq/SlackTextViewController/archive/v1.9.6.zip",

Examples/React/.bazelversion

@@ -1 +1 @@
-4.0.0
+5.1.0

Examples/React/WORKSPACE

@@ -7,8 +7,8 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "a41a75c291c69676b9974458ceee09aea60cee0e1ee282e27cdc90b679dfd30f",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.21.2/rules_apple.0.21.2.tar.gz",
+    sha256 = "77e8bf6fda706f420a55874ae6ee4df0c9d95da6c7838228b26910fc82eea5a2",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.32.0/rules_apple.0.32.0.tar.gz",
 )
 
 load(
@@ -31,10 +31,3 @@ load(
 )
 
 swift_rules_dependencies()
-
-load(
-    "@com_google_protobuf//:protobuf_deps.bzl",
-    "protobuf_deps",
-)
-
-protobuf_deps()

bin/update_pods.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # update_pods.py Installs pods specified in Pods.WORKSPACE to $SRC_ROOT/Vendor/
 
 from subprocess import Popen, PIPE
@@ -129,7 +129,7 @@ def GetTrace(self):
         return self.trace
 
 def HashFile(path):
-    f = open(path, "r")
+    f = open(path, "rb")
     f_hash = str(hash(f.read()))
     f.close()
     return str(f_hash)
@@ -203,7 +203,7 @@ def _needs_update(invocation_info):
     pod_root_dir = repository_ctx.GetPodRootDir()
     _exec(repository_ctx, ["/bin/bash", "-c", "mkdir -p " + pod_root_dir])
     _exec(repository_ctx, ["/bin/bash", "-c", "touch .pod-version"], pod_root_dir)
-    cached_version = _exec(repository_ctx, ["/bin/bash", "-c", "cat .pod-version"], pod_root_dir).split("\n")[0]
+    cached_version = _exec(repository_ctx, ["/bin/bash", "-c", "cat .pod-version"], pod_root_dir).split(b'\n')[0]
     return GetVersion(invocation_info) != cached_version
 
 def _load_repo_if_needed(repository_ctx, repo_tool_bin_path):