From c992bf7ec97bdfca900af2688f768b08b97deba2 Mon Sep 17 00:00:00 2001
From: Kent Ma <tnek@google.com>
Date: Fri, 15 Oct 2021 13:18:27 -0400
Subject: [PATCH] Update bazel version, add test for teamID

---
 BUILD                              |   2 +-
 README.md                          |   4 ++--
 Tests/MOLCodesignCheckerTest.m     |  16 ++++++++++++++--
 Tests/Resources/signed-with-teamid | Bin 0 -> 68240 bytes
 WORKSPACE                          |   5 ++---
 5 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100755 Tests/Resources/signed-with-teamid

diff --git a/BUILD b/BUILD
index 1f0a472..4b682ff 100644
--- a/BUILD
+++ b/BUILD
@@ -13,12 +13,12 @@ objc_library(
 objc_library(
     name = "MOLCodesignCheckerTestsLib",
     srcs = ["Tests/MOLCodesignCheckerTest.m"],
-    data = glob(["Tests/Resources/*"]),
     deps = [":MOLCodesignChecker"],
 )
 
 macos_unit_test(
     name = "MOLCodesignCheckerTests",
     minimum_os_version = "10.9",
+    resources = glob(["Tests/Resources/*"]),
     deps = [":MOLCodesignCheckerTestsLib"],
 )
diff --git a/README.md b/README.md
index c8c7d76..b340193 100644
--- a/README.md
+++ b/README.md
@@ -50,13 +50,13 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "MOLCertificate",
     remote = "https://github.com/google/macops-molcertificate.git",
-    tag = "v2.0",
+    tag = "v2.1",
 )
 
 git_repository(
     name = "MOLCodesignChecker",
     remote = "https://github.com/google/macops-molcodesignchecker.git",
-    tag = "v2.1",
+    tag = "v2.2",
 )
 ```
 
diff --git a/Tests/MOLCodesignCheckerTest.m b/Tests/MOLCodesignCheckerTest.m
index b1e94ef..d9420c0 100644
--- a/Tests/MOLCodesignCheckerTest.m
+++ b/Tests/MOLCodesignCheckerTest.m
@@ -133,8 +133,7 @@ - (void)testAllArchitectures {
   NSError *error;
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
   NSString *path = [bundle pathForResource:@"cal-yikes-universal" ofType:@""];
-  MOLCodesignChecker *sut =
-      [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
+  MOLCodesignChecker *sut = [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
   XCTAssertNotNil(sut.universalSigningInformation);
   XCTAssertNil(sut.leafCertificate);
   XCTAssertEqual(error.code, errSecCSSignatureInvalid);
@@ -177,4 +176,17 @@ - (void)testAllArchitectures {
   XCTAssertNil(error);
 }
 
+- (void)testTeamID {
+  NSError *error;
+  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+  NSString *path = [bundle pathForResource:@"signed-with-teamid" ofType:@""];
+
+  MOLCodesignChecker *sut = [[MOLCodesignChecker alloc] initWithBinaryPath:path error:&error];
+  XCTAssertNotNil(sut.signingInformation);
+  XCTAssertNil(error);
+
+  NSString *gotTeamID = [sut.signingInformation valueForKey:@"teamid"];
+  XCTAssertEqualObjects(@"EQHXZ8M8AV", gotTeamID);
+}
+
 @end
diff --git a/Tests/Resources/signed-with-teamid b/Tests/Resources/signed-with-teamid
new file mode 100755
index 0000000000000000000000000000000000000000..d3e29dadf2d4dffa41ea07066a9dfda2b8b919e3
GIT binary patch
literal 68240
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
F{t4+gqHO>G

literal 0
HcmV?d00001

diff --git a/WORKSPACE b/WORKSPACE
index b37780e..7e7ebdb 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.13.0",
+    tag = "0.31.3",
 )
 
 load(
@@ -16,6 +16,5 @@ apple_rules_dependencies()
 git_repository(
     name = "MOLCertificate",
     remote = "https://github.com/google/macops-molcertificate.git",
-    tag = "v2.0",
+    tag = "v2.1",
 )
-