cocoapods-xcremotecache 0.0.9 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55188d92fcdf04e74187bd4c61dc05759f4b88a4a14709c855fe8f4f6edd285
-  data.tar.gz: f30d155a01be304acd6630a8c976dac97aab670fd4fcab25b3c43294f622a91c
+  metadata.gz: 44c934e165d3bedbc93841e34cc60738b7108e04e89cc6bd15da4aa5b404f7a2
+  data.tar.gz: c29b65d77ac3843d0c8c6caa4253c6168fd1fb19467b9d1cce643e35a111022c
 SHA512:
-  metadata.gz: b1f4d863ffcff4fbb60a547d0ec86e8f1152441d13e046539cc8c773a8d29da7a1beb49324c842c41e4c1d74639d3a6ced669eda3733cb4f989c3ce4b678cebd
-  data.tar.gz: 7abad465202e061fd629b53237dfd2aa6584c57481f2f00a76441f67c99ea495523e886b629cc3170233412893b8a35728660d1971023ebc645cf71397384927
+  metadata.gz: 3bdf484d34a827187b7b6f8fb06153111f2d28ad568579d04737900d96c9cc7f4883e4eb38a9e592642e36900907beb4a7b171f7a5d3455206ac3fa8f8aaf46a
+  data.tar.gz: 2e5b3744bdeecbb01109b308af832b1d38312e73c050f5f46ae78dc6a6b7c3909055b4539980293026612bbca2f79dcecd6d481545aab1fe7c455b7bb1705593

data/README.md

@@ -53,6 +53,7 @@ An object that is passed to the `xcremotecache` can contain all properties suppo
 | `xccc_file` | The path where should be placed the `xccc` binary (in the pod installation phase) | `{podfile_dir}/.rc/xccc` | ⬜️ |
 | `remote_commit_file` | The path of the file with the remote commit sha (in the pod installation phase) | `{podfile_dir}/.rc/arc.rc`| ⬜️ |
 | `prettify_meta_files` | A Boolean value that opts-in pretty JSON formatting for meta files | `false` | ⬜️ |
+| `fake_src_root` | An arbitrary source location shared between producers and consumers. Should be unique for a project. | `/xxxxxxxxxx` | ⬜️ |
 | `disable_certificate_verification` | A Boolean value that opts-in SSL certificate validation is disabled | `false` | ⬜️ |
 
 ## Uninstalling
@@ -62,7 +63,3 @@ To fully uninstall the plugin, call:
 ```bash
 gem uninstall cocoapods-xcremotecache
 ```
-
-## Limitations
-
-* When `generate_multiple_pod_projects` mode is enabled, only first-party targets are cached by XCRemoteCache (all dependencies are compiled locally).

data/lib/cocoapods-xcremotecache/command/hooks.rb

@@ -24,12 +24,12 @@ module CocoapodsXCRemoteCacheModifier
   # Registers for CocoaPods plugin hooks
   module Hooks
     BIN_DIR = '.rc'
-    FAKE_SRCROOT = "/#{'x' * 10 }"
     LLDB_INIT_COMMENT="#RemoteCacheCustomSourceMap"
     LLDB_INIT_PATH = "#{ENV['HOME']}/.lldbinit"
     FAT_ARCHIVE_NAME_INFIX = 'arm64-x86_64'
+    XCRC_COOCAPODS_ROOT_KEY = 'XCRC_COOCAPODS_ROOT'
 
-    # List of plugins' user properties that should be copied to .rcinfo 
+    # List of plugins' user properties that should not be copied to .rcinfo 
     CUSTOM_CONFIGURATION_KEYS = [
       'enabled', 
       'xcrc_location',
@@ -39,8 +39,7 @@ module CocoapodsXCRemoteCacheModifier
       'check_build_configuration', 
       'check_platform', 
       'modify_lldb_init',
-      'prettify_meta_files',
-      'disable_certificate_verification'
+      'fake_src_root',
     ]
 
     class XCRemoteCache
@@ -63,9 +62,15 @@ module CocoapodsXCRemoteCacheModifier
           'remote_commit_file' => "#{BIN_DIR}/arc.rc",
           'exclude_targets' => [],
           'prettify_meta_files' => false,
-          'disable_certificate_verification' => false
+          'fake_src_root' => "/#{'x' * 10 }",
+          'disable_certificate_verification' => false,
+          'custom_rewrite_envs' => []
         }
         @@configuration.merge! default_values.select { |k, v| !@@configuration.key?(k) }
+        # Always include XCRC_COOCAPODS_ROOT_KEY in custom_rewrite_envs
+        unless @@configuration['custom_rewrite_envs'].include?(XCRC_COOCAPODS_ROOT_KEY)
+          @@configuration['custom_rewrite_envs'] << XCRC_COOCAPODS_ROOT_KEY
+        end
       end
 
       def self.validate_configuration()
@@ -106,8 +111,10 @@ module CocoapodsXCRemoteCacheModifier
       # @param mode [String] mode name ('consumer', 'producer', 'producer-fast' etc.)
       # @param exclude_build_configurations [String[]] list of targets that should have disabled remote cache
       # @param final_target [String] name of target that should trigger marking
-      def self.enable_xcremotecache(target, repo_distance, xc_location, xc_cc_path, mode, exclude_build_configurations, final_target)
+      def self.enable_xcremotecache(target, repo_distance, xc_location, xc_cc_path, mode, exclude_build_configurations, final_target, fake_src_root)
         srcroot_relative_xc_location = parent_dir(xc_location, repo_distance)
+        # location of the entrite CocoaPods project, relative to SRCROOT
+        srcroot_relative_project_location = parent_dir('', repo_distance)
 
         target.build_configurations.each do |config|
           # apply only for relevant Configurations
@@ -121,8 +128,9 @@ module CocoapodsXCRemoteCacheModifier
           config.build_settings['LIBTOOL'] = ["$SRCROOT/#{srcroot_relative_xc_location}/xclibtool"]
           config.build_settings['LD'] = ["$SRCROOT/#{srcroot_relative_xc_location}/xcld"]
 
-          config.build_settings['XCREMOTE_CACHE_FAKE_SRCROOT'] = FAKE_SRCROOT
+          config.build_settings['XCREMOTE_CACHE_FAKE_SRCROOT'] = fake_src_root
           config.build_settings['XCRC_PLATFORM_PREFERRED_ARCH'] = ["$(LINK_FILE_LIST_$(CURRENT_VARIANT)_$(PLATFORM_PREFERRED_ARCH):dir:standardizepath:file:default=arm64)"]
+          config.build_settings[XCRC_COOCAPODS_ROOT_KEY] = ["$SRCROOT/#{srcroot_relative_project_location}"]
           debug_prefix_map_replacement = '$(SRCROOT' + ':dir:standardizepath' * repo_distance + ')'
           add_cflags!(config.build_settings, '-fdebug-prefix-map', "#{debug_prefix_map_replacement}=$(XCREMOTE_CACHE_FAKE_SRCROOT)")
           add_swiftflags!(config.build_settings, '-debug-prefix-map', "#{debug_prefix_map_replacement}=$(XCREMOTE_CACHE_FAKE_SRCROOT)")
@@ -203,6 +211,7 @@ module CocoapodsXCRemoteCacheModifier
           # Remove Fake src root for ObjC & Swift
           config.build_settings.delete('XCREMOTE_CACHE_FAKE_SRCROOT')
           config.build_settings.delete('XCRC_PLATFORM_PREFERRED_ARCH')
+          config.build_settings.delete(XCRC_COOCAPODS_ROOT_KEY)
           remove_cflags!(config.build_settings, '-fdebug-prefix-map')
           remove_swiftflags!(config.build_settings, '-debug-prefix-map')
         end
@@ -308,7 +317,7 @@ module CocoapodsXCRemoteCacheModifier
         end
 
         # Remove .lldbinit rewrite
-        save_lldbinit_rewrite(nil) unless !@@configuration['modify_lldb_init']
+        save_lldbinit_rewrite(nil,nil) unless !@@configuration['modify_lldb_init']
       end
 
       # Returns the content (array of lines) of the lldbinit with stripped XCRemoteCache rewrite
@@ -330,17 +339,17 @@ module CocoapodsXCRemoteCacheModifier
       end
 
       # Append source rewrite command to the lldbinit content
-      def self.add_lldbinit_rewrite(lines_content, user_proj_directory)
+      def self.add_lldbinit_rewrite(lines_content, user_proj_directory,fake_src_root)
         all_lines = lines_content.clone
         all_lines << LLDB_INIT_COMMENT
-        all_lines << "settings set target.source-map #{FAKE_SRCROOT} #{user_proj_directory}"    
+        all_lines << "settings set target.source-map #{fake_src_root} #{user_proj_directory}"    
         all_lines << ""
         all_lines
       end
 
-      def self.save_lldbinit_rewrite(user_proj_directory)
+      def self.save_lldbinit_rewrite(user_proj_directory,fake_src_root)
         lldbinit_lines = clean_lldbinit_content(LLDB_INIT_PATH)
-        lldbinit_lines = add_lldbinit_rewrite(lldbinit_lines, user_proj_directory) unless user_proj_directory.nil?
+        lldbinit_lines = add_lldbinit_rewrite(lldbinit_lines, user_proj_directory,fake_src_root) unless user_proj_directory.nil?
         File.write(LLDB_INIT_PATH, lldbinit_lines.join("\n"), mode: "w")
       end
 
@@ -372,6 +381,7 @@ module CocoapodsXCRemoteCacheModifier
           final_target = @@configuration['final_target']
           check_build_configuration = @@configuration['check_build_configuration']
           check_platform = @@configuration['check_platform']
+          fake_src_root = @@configuration['fake_src_root']
 
           xccc_location_absolute = "#{user_proj_directory}/#{xccc_location}"
           xcrc_location_absolute = "#{user_proj_directory}/#{xcrc_location}"
@@ -403,7 +413,7 @@ module CocoapodsXCRemoteCacheModifier
                 next if target.name.start_with?("Pods-")
                 next if target.name.end_with?("Tests")
                 next if exclude_targets.include?(target.name)
-                enable_xcremotecache(target, 1, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target)
+                enable_xcremotecache(target, 1, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target,fake_src_root)
             end
 
             # Create .rcinfo into `Pods` directory as that .xcodeproj reads configuration from .xcodeproj location
@@ -416,7 +426,7 @@ module CocoapodsXCRemoteCacheModifier
                     next if target.source_build_phase.files_references.empty?
                     next if target.name.end_with?("Tests")
                     next if exclude_targets.include?(target.name)
-                    enable_xcremotecache(target, 1, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target)
+                    enable_xcremotecache(target, 1, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target,fake_src_root)
                 end
                 generated_project.save()
             end
@@ -456,15 +466,15 @@ module CocoapodsXCRemoteCacheModifier
           # Attach XCRC to the app targets
           user_project.targets.each do |target|
               next if exclude_targets.include?(target.name)
-              enable_xcremotecache(target, 0, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target)
+              enable_xcremotecache(target, 0, xcrc_location, xccc_location, mode, exclude_build_configurations, final_target,fake_src_root)
           end
 
           # Set Target sourcemap
           if @@configuration['modify_lldb_init']
-            save_lldbinit_rewrite(user_proj_directory)
+            save_lldbinit_rewrite(user_proj_directory,fake_src_root)
           else
             Pod::UI.puts "[XCRC] lldbinit modification is disabled. Debugging may behave weirdly"
-            Pod::UI.puts "[XCRC] put \"settings set target.source-map #{FAKE_SRCROOT} \#{your_project_directory}\" to your \".lldbinit\" "
+            Pod::UI.puts "[XCRC] put \"settings set target.source-map #{fake_src_root} \#{your_project_directory}\" to your \".lldbinit\" "
           end
 
           user_project.save()

data/lib/cocoapods-xcremotecache/gem_version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module CocoapodsXcremotecache
-  VERSION = "0.0.9"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-xcremotecache
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.12
 platform: ruby
 authors:
 - Bartosz Polaczyk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies: []
 description: CocoaPods plugin that enables XCRemoteCache with the project.
 email: