bazel-xcode · jparise · Dec 10, 2020
diff --git a/sample/UrlGet/Makefile b/sample/UrlGet/Makefile
@@ -2,6 +2,9 @@ IMPORT_INDEX=bazel-out/ios-x86_64-min9.3-applebin_ios-ios_x86_64-dbg/bin/index-s
 EXEC_ROOT=$(shell tools/bazelwrapper info execution_root)
 DERIVEDDATA=$(shell find ~/Library/Developer/Xcode/DerivedData/ -name FocusXcode-*)
 
+deps:
+	tools/bazelwrapper run @rules_pods//:update_pods -- --src_root $$PWD
+
 import:
 	index-import -remap "$(EXEC_ROOT)=$(PWD)" $(IMPORT_INDEX) $(DERIVEDDATA)/Index/DataStore 
 
@@ -13,4 +16,3 @@ disable-indexing:
 
 enable-indexing:
 	defaults write com.apple.dt.XCode IDEIndexDisable 0
-
diff --git a/sample/UrlGet/Pods.WORKSPACE b/sample/UrlGet/Pods.WORKSPACE
@@ -7,7 +7,7 @@ new_pod_repository(
 
 new_pod_repository(
   name = "PINCache",
-  url = "https://github.com/pinterest/PINCache/archive/f9f1e551d6a78d74f5528e43a8575f9d2d329e7d.zip",
+  url = "https://github.com/pinterest/PINCache/archive/3.0.3.zip",
   owner = "@ios-cx",
 )
 

diff --git a/sample/UrlGet/Vendor/GoogleAppIndexing/.pod-version b/sample/UrlGet/Vendor/GoogleAppIndexing/.pod-version
@@ -1 +1 @@
--3247681909583964502-6870052013340196113-8379802094390313607
+-482217743111471736155383679033427625333341535302669453200
diff --git a/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD → ...lGet/Vendor/GoogleAppIndexing/BUILD.bazel b/sample/UrlGet/Vendor/GoogleAppIndexing/BUILD → ...lGet/Vendor/GoogleAppIndexing/BUILD.bazel
@@ -2,10 +2,10 @@ 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"
+  "gen_includes",
+  "headermap"
 )
 # Add a config setting release for compilation mode
 # Assume that people are using `opt` for release mode
@@ -17,59 +17,109 @@ config_setting(
     "compilation_mode": "opt"
   }
 )
+config_setting(
+  name = "osxCase",
+  values = {
+    "apple_platform_type": "macos"
+  }
+)
+config_setting(
+  name = "tvosCase",
+  values = {
+    "apple_platform_type": "tvos"
+  }
+)
+config_setting(
+  name = "watchosCase",
+  values = {
+    "apple_platform_type": "watchos"
+  }
+)
 filegroup(
-  name = "GoogleAppIndexing_hdrs",
+  name = "GoogleAppIndexing_package_hdrs",
+  srcs = [
+    "GoogleAppIndexing_direct_hdrs"
+  ],
+  visibility = [
+    "//visibility:public"
+  ]
+)
+filegroup(
+  name = "GoogleAppIndexing_direct_hdrs",
   srcs = glob(
-    [
-      "pod_support/Headers/Public/**/*"
-    ],
+    glob(
+      [
+        "pod_support/Headers/Public/**/*"
+      ],
+      exclude_directories = 1
+    ) + glob(
+      [
+        "Changelog/**/*.h",
+        "Changelog/**/*.hpp",
+        "Changelog/**/*.hxx"
+      ],
+      exclude_directories = 1
+    ),
     exclude_directories = 1
-  ) + glob(
-    [
-      "Changelog/**/*.h",
-      "Changelog/**/*.hpp",
-      "Changelog/**/*.hxx"
-    ],
+  ),
+  visibility = [
+    "//visibility:public"
+  ]
+)
+filegroup(
+  name = "GoogleAppIndexing_hdrs",
+  srcs = glob(
+    glob(
+      [
+        "pod_support/Headers/Public/**/*"
+      ],
+      exclude_directories = 1
+    ) + glob(
+      [
+        "Changelog/**/*.h",
+        "Changelog/**/*.hpp",
+        "Changelog/**/*.hxx"
+      ],
+      exclude_directories = 1
+    ),
     exclude_directories = 1
   ),
   visibility = [
     "//visibility:public"
   ]
 )
+headermap(
+  name = "GoogleAppIndexing_hmap",
+  namespace = "GoogleAppIndexing",
+  hdrs = [
+    "GoogleAppIndexing_package_hdrs",
+    ":GoogleAppIndexing_hdrs"
+  ],
+  deps = [
+    ":GoogleAppIndexing_VendoredFrameworks"
+  ],
+  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"
+    ":GoogleAppIndexing_hdrs"
   ],
+  pch = "pod_support/Headers/Private/GoogleAppIndexing-prefix.pch",
   sdk_frameworks = [
     "CoreText",
     "SafariServices"
   ],
   deps = [
-    ":GoogleAppIndexing_Bundle_GoogleAppIndexingResources",
     ":GoogleAppIndexing_VendoredFrameworks",
     ":GoogleAppIndexing_includes"
   ],
@@ -100,7 +150,7 @@ objc_library(
   ) + [
     "-IVendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/"
   ] + [
-    "-fmodule-name=GoogleAppIndexing_pod_module"
+    "-fmodule-name=GoogleAppIndexing"
   ],
   data = [
     ":GoogleAppIndexing_Bundle_GoogleAppIndexingResources"
@@ -123,6 +173,11 @@ apple_bundle_import(
     exclude_directories = 1
   )
 )
+acknowledged_target(
+  name = "GoogleAppIndexing_Bundle_GoogleAppIndexingResources_acknowledgement",
+  deps = [],
+  value = "//Vendor/GoogleAppIndexing/pod_support_buildable:acknowledgement_fragment"
+)
 apple_static_framework_import(
   name = "GoogleAppIndexing_VendoredFrameworks",
   framework_imports = glob(
@@ -134,4 +189,9 @@ apple_static_framework_import(
   visibility = [
     "//visibility:public"
   ]
+)
+acknowledged_target(
+  name = "GoogleAppIndexing_VendoredFrameworks_acknowledgement",
+  deps = [],
+  value = "//Vendor/GoogleAppIndexing/pod_support_buildable:acknowledgement_fragment"
 )
diff --git a/.../UrlGet/Vendor/GoogleAppIndexing/pod_support/Headers/Private/GoogleAppIndexing-prefix.pch b/.../UrlGet/Vendor/GoogleAppIndexing/pod_support/Headers/Private/GoogleAppIndexing-prefix.pch
@@ -0,0 +1,11 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif
diff --git a/...et/Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GSDAppIndexing.h b/...et/Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GSDAppIndexing.h
@@ -0,0 +1 @@
+../../../../Frameworks/GoogleAppIndexing.framework/Headers/GSDAppIndexing.h
diff --git a/...rlGet/Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GSDDeepLink.h b/...rlGet/Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GSDDeepLink.h
@@ -0,0 +1 @@
+../../../../Frameworks/GoogleAppIndexing.framework/Headers/GSDDeepLink.h
diff --git a/...Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GoogleAppIndexing.h b/...Vendor/GoogleAppIndexing/pod_support/Headers/Public/GoogleAppIndexing/GoogleAppIndexing.h
@@ -0,0 +1 @@
+../../../../Frameworks/GoogleAppIndexing.framework/Headers/GoogleAppIndexing.h
diff --git a/...leAppIndexing/pod_support_buildable/BUILD → ...ndexing/pod_support_buildable/BUILD.bazel b/...leAppIndexing/pod_support_buildable/BUILD → ...ndexing/pod_support_buildable/BUILD.bazel
diff --git a/sample/UrlGet/Vendor/GoogleAuthUtilities/.pod-version b/sample/UrlGet/Vendor/GoogleAuthUtilities/.pod-version
@@ -1 +1 @@
--3247681909583964502-6870052013340196113-7670020901795115885
+-482217743111471736155383679033427625331143402063872266254
diff --git a/...e/UrlGet/Vendor/GoogleAuthUtilities/BUILD → ...et/Vendor/GoogleAuthUtilities/BUILD.bazel b/...e/UrlGet/Vendor/GoogleAuthUtilities/BUILD → ...et/Vendor/GoogleAuthUtilities/BUILD.bazel
@@ -1,10 +1,10 @@
 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"
+  "gen_includes",
+  "headermap"
 )
 # Add a config setting release for compilation mode
 # Assume that people are using `opt` for release mode
@@ -16,6 +16,45 @@ config_setting(
     "compilation_mode": "opt"
   }
 )
+config_setting(
+  name = "osxCase",
+  values = {
+    "apple_platform_type": "macos"
+  }
+)
+config_setting(
+  name = "tvosCase",
+  values = {
+    "apple_platform_type": "tvos"
+  }
+)
+config_setting(
+  name = "watchosCase",
+  values = {
+    "apple_platform_type": "watchos"
+  }
+)
+filegroup(
+  name = "GoogleAuthUtilities_package_hdrs",
+  srcs = [
+    "GoogleAuthUtilities_direct_hdrs"
+  ],
+  visibility = [
+    "//visibility:public"
+  ]
+)
+filegroup(
+  name = "GoogleAuthUtilities_direct_hdrs",
+  srcs = glob(
+    [
+      "pod_support/Headers/Public/**/*"
+    ],
+    exclude_directories = 1
+  ),
+  visibility = [
+    "//visibility:public"
+  ]
+)
 filegroup(
   name = "GoogleAuthUtilities_hdrs",
   srcs = glob(
@@ -28,34 +67,35 @@ filegroup(
     "//visibility:public"
   ]
 )
+headermap(
+  name = "GoogleAuthUtilities_hmap",
+  namespace = "GoogleAuthUtilities",
+  hdrs = [
+    "GoogleAuthUtilities_package_hdrs",
+    ":GoogleAuthUtilities_hdrs"
+  ],
+  deps = [
+    "//Vendor/GoogleNetworkingUtilities:GoogleNetworkingUtilities",
+    "//Vendor/GoogleSymbolUtilities:GoogleSymbolUtilities",
+    ":GoogleAuthUtilities_VendoredFrameworks"
+  ],
+  visibility = [
+    "//visibility:public"
+  ]
+)
 gen_includes(
   name = "GoogleAuthUtilities_includes",
   include = [
     "Vendor/GoogleAuthUtilities/pod_support/Headers/Public/"
   ]
 )
-gen_module_map(
-  "GoogleAuthUtilities",
-  "GoogleAuthUtilities_module_map",
-  "GoogleAuthUtilities",
-  [
-    "GoogleAuthUtilities_hdrs"
-  ]
-)
 objc_library(
   name = "GoogleAuthUtilities",
   enable_modules = 1,
   hdrs = [
-    ":GoogleAuthUtilities_hdrs",
-    ":GoogleAuthUtilities_module_map_module_map_file"
-  ],
-  pch = pch_with_name_hint(
-    "GoogleAuthUtilities",
-    []
-  ),
-  includes = [
-    "GoogleAuthUtilities_module_map"
+    ":GoogleAuthUtilities_hdrs"
   ],
+  pch = "pod_support/Headers/Private/GoogleAuthUtilities-prefix.pch",
   sdk_frameworks = [
     "Security",
     "SystemConfiguration"
@@ -93,7 +133,7 @@ objc_library(
   ) + [
     "-IVendor/GoogleAuthUtilities/pod_support/Headers/Public/GoogleAuthUtilities/"
   ] + [
-    "-fmodule-name=GoogleAuthUtilities_pod_module"
+    "-fmodule-name=GoogleAuthUtilities"
   ],
   data = glob(
     [
@@ -124,4 +164,9 @@ apple_static_framework_import(
   visibility = [
     "//visibility:public"
   ]
+)
+acknowledged_target(
+  name = "GoogleAuthUtilities_VendoredFrameworks_acknowledgement",
+  deps = [],
+  value = "//Vendor/GoogleAuthUtilities/pod_support_buildable:acknowledgement_fragment"
 )
diff --git a/...Get/Vendor/GoogleAuthUtilities/pod_support/Headers/Private/GoogleAuthUtilities-prefix.pch b/...Get/Vendor/GoogleAuthUtilities/pod_support/Headers/Private/GoogleAuthUtilities-prefix.pch
@@ -0,0 +1,11 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif
diff --git a/...AuthUtilities/pod_support_buildable/BUILD → ...ilities/pod_support_buildable/BUILD.bazel b/...AuthUtilities/pod_support_buildable/BUILD → ...ilities/pod_support_buildable/BUILD.bazel
diff --git a/sample/UrlGet/Vendor/GoogleNetworkingUtilities/.pod-version b/sample/UrlGet/Vendor/GoogleNetworkingUtilities/.pod-version
@@ -1 +1 @@
--3247681909583964502-6870052013340196113-570112702148592745
+-482217743111471736155383679033427625336885344944788458658