xcode-archive-cache 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2121ee4ca94b2acfa38e1071a6f30209381464a7da5239e919d4b70cafd1d84
-  data.tar.gz: 9874700c995c65ee3ecaa4772a1aa6deba6868591b96da6d271b9ee1f32588df
+  metadata.gz: 1c30a0e4a847e52d32192c31fe3cdf3c7b0ff61cabc81e413e4fe416edbda1a8
+  data.tar.gz: 31925913e15ec55cf8b94dfd9940604cbc34cc98c0f1b76317cf0d05d8c202a7
 SHA512:
-  metadata.gz: 528092da4900b8232d71a9583ec0752c92ff2ee851bc13db3609c91c1a9aec3db4278abb777a3c574728d35b409b59ede6fc1481c0dafed49b93a396b994b114
-  data.tar.gz: c16c9ff1c2623437b5e29c0fea3cd1bc10cfe631c4df1772197595392b5a05286a8223294c20f9dc306b5ed47089f7c7c85c7eeb4138a940d2a37861c6266bdc
+  metadata.gz: 5a8fcfa4fd8a2da9cfadf202aaa3be88f4c54ddf3979aa4ac1c500e61b0a9d41f07bf43420fb0ec6332fd491b634a4d4f28ff1aebeaf273c79ded3a950a0d763
+  data.tar.gz: c6f6f0351aa9b02165637e93cd65b4938f2888bdb0cb7c599f8de0592a0ae4d85092508b73fb4a2b117c226287a64ccface769afd6e4c81626cd6b8d8e253297

data/lib/build/performer.rb

@@ -6,9 +6,10 @@ module XcodeArchiveCache
 
       # @param [String] derived_data_path
       #
-      def initialize(xcodebuild_executor, derived_data_path)
+      def initialize(xcodebuild_executor, derived_data_path, workspace_path=nil)
         @xcodebuild_executor = xcodebuild_executor
         @derived_data_path = derived_data_path
+        @workspace_path = workspace_path
       end
 
       # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
@@ -23,7 +24,12 @@ module XcodeArchiveCache
                              .join(", ")
           info("going to rebuild:\n#{rebuild_list}")
 
-          build_result = xcodebuild_executor.build(target.project.path, target.name, derived_data_path)
+          if workspace_path
+            build_result = xcodebuild_executor.build_from_workspace(workspace_path, target.name, derived_data_path)
+          else
+            build_result = xcodebuild_executor.build_from_project(target.project.path, target.name, derived_data_path)
+          end
+
           unless build_result
             raise StandardError.new, "Failed to perform rebuild"
           end
@@ -47,6 +53,10 @@ module XcodeArchiveCache
       # @return [XcodeArchiveCache::Xcodebuild::Executor]
       #
       attr_reader :xcodebuild_executor
+
+      # @return [String]
+      #
+      attr_reader :workspace_path
     end
   end
 end

data/lib/build_settings/filter.rb

@@ -93,7 +93,6 @@ module XcodeArchiveCache
         CLONE_HEADERS
         COMBINE_HIDPI_IMAGES
         COMPRESS_PNG_FILES
-        CONFIGURATION
         COPYING_PRESERVES_HFS_DATA
         COPY_HEADERS_RUN_UNIFDEF
         COPY_PHASE_STRIP

data/lib/runner/runner.rb

@@ -133,7 +133,8 @@ module XcodeArchiveCache
     # @param [XcodeArchiveCache::BuildGraph::Graph] graph
     #
     def rebuild_if_needed(xcodebuild_executor, root_target, graph)
-      rebuild_performer = XcodeArchiveCache::Build::Performer.new(xcodebuild_executor, config.settings.derived_data_path)
+      workspace_path = config.is_a?(XcodeArchiveCache::Config::Workspace) ? File.absolute_path(config.file_path) : nil
+      rebuild_performer = XcodeArchiveCache::Build::Performer.new(xcodebuild_executor, config.settings.derived_data_path, workspace_path)
       return unless rebuild_performer.should_rebuild?(graph)
 
       @injector.perform_internal_injection(graph)

data/lib/xcodebuild/executor.rb

@@ -43,8 +43,30 @@ module XcodeArchiveCache
       # @param [String] scheme
       # @param [String] derived_data_path
       #
-      def build(project_path, scheme, derived_data_path)
-        flags = [project_flag(project_path),
+      def build_from_project(project_path, scheme, derived_data_path)
+        build(project_flag(project_path), scheme, derived_data_path)
+      end
+
+      # @param [String] workspace_flag
+      # @param [String] scheme
+      # @param [String] derived_data_path
+      #
+      def build_from_workspace(workspace_path, scheme, derived_data_path)
+        build(workspace_flag(workspace_path), scheme, derived_data_path)
+      end
+
+      def set_up_for_simulator?
+        destination_flag.include?("Simulator")
+      end
+
+      private
+
+      # @param [String] path_flag
+      # @param [String] scheme
+      # @param [String] derived_data_path
+      #
+      def build(path_flag, scheme, derived_data_path)
+        flags = [path_flag,
                  configuration_flag,
                  destination_flag,
                  scheme_flag(scheme),
@@ -55,12 +77,6 @@ module XcodeArchiveCache
         shell_executor.execute(command, true)
       end
 
-      def set_up_for_simulator?
-        destination_flag.include?("Simulator")
-      end
-
-      private
-
       # @return [String]
       #
       attr_reader :configuration
@@ -93,6 +109,14 @@ module XcodeArchiveCache
         "xcodebuild #{flags.join(" ")}"
       end
 
+      # @param [String] workspace_path
+      #
+      # @return [String]
+      #
+      def workspace_flag(workspace_path)
+        "-workspace '#{workspace_path}'"
+      end
+
       # @param [String] project_path
       #
       # @return [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-archive-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ilya Dyakonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Native targets cache for Xcode archive builds.