fastlane-plugin-create_xcframework 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756ad1bbb3b157ae68ea52d79c6f87ec7cf19b7bdc18c58bf77e9ac1a6323137
-  data.tar.gz: 66f51fa14b1a29986d875a4e2b46ae73430bc394e611101f2a234bd2e932d051
+  metadata.gz: da76ed30e5052b1d6bf5bf741f3aa63aeb94b6ceb87d857431d61433f8b3a641
+  data.tar.gz: 960a159418dea2038953df31995e6c1d0f87ae71f4b1fadf1bc2d9b5e5b851f5
 SHA512:
-  metadata.gz: f89281e8e0e292914480db2c0f1b910477a156bb534816e7864d5326767b24baa6d6eabeb559a2885c796f39cabc4b8ead8b8e2bdd6c9f98db1ec9a8a327839f
-  data.tar.gz: 9df35e6ccf5cbd0d0424ccec7b93a9422e5ffed4ae66b1b935a07291a4347357c183c996f9a3a0a1b53847ee61d9000d5e8853cc5e963568933446523d99fd12
+  metadata.gz: bac7202c5d3ff57a1a91a9f95b45a959355fe8bbfe2e073ab54306b3d564f85aa25a37ab796d70ee9c9a3dda946770755b497ddc895873e14ef95a9d42879d0f
+  data.tar.gz: 36f6de9e8acd0ce848ba15677e7a1408e8062e653bd6bd78b06d155d2fafb155753f14f54ed56373ed20774afc3e95b556ef1bbcc180d16e458bde8c654c9f4a

data/lib/fastlane/plugin/create_xcframework/actions/create_xcframework_action.rb

@@ -21,7 +21,7 @@ module Fastlane
 
           params[:destinations].each_with_index do |destination, framework_index|
             params[:destination] = destination
-            params[:archive_path] = @xchelper.xcarchive_path(framework_index)
+            params[:archive_path] = @xchelper.xcarchive_path_for_destination(framework_index)
             XcarchiveAction.run(params)
           end
 
@@ -31,7 +31,7 @@ module Fastlane
 
           copy_BCSymbolMaps(params)
 
-          clean
+          clean(params)
 
           provide_shared_values
         else
@@ -40,23 +40,23 @@ module Fastlane
       end
 
       def self.provide_shared_values
-          Actions.lane_context[SharedValues::XCFRAMEWORK_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_path)
-          ENV[SharedValues::XCFRAMEWORK_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_path)
-          Actions.lane_context[SharedValues::XCFRAMEWORK_DSYM_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_dSYMs_path)
-          ENV[SharedValues::XCFRAMEWORK_DSYM_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_dSYMs_path)
-          Actions.lane_context[SharedValues::XCFRAMEWORK_BCSYMBOLMAPS_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_BCSymbolMaps_path)
-          ENV[SharedValues::XCFRAMEWORK_BCSYMBOLMAPS_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_BCSymbolMaps_path)
+        Actions.lane_context[SharedValues::XCFRAMEWORK_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_path)
+        ENV[SharedValues::XCFRAMEWORK_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_path)
+        Actions.lane_context[SharedValues::XCFRAMEWORK_DSYM_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_dSYMs_path)
+        ENV[SharedValues::XCFRAMEWORK_DSYM_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_dSYMs_path)
+        Actions.lane_context[SharedValues::XCFRAMEWORK_BCSYMBOLMAPS_OUTPUT_PATH] = File.expand_path(@xchelper.xcframework_BCSymbolMaps_path)
+        ENV[SharedValues::XCFRAMEWORK_BCSYMBOLMAPS_OUTPUT_PATH.to_s] = File.expand_path(@xchelper.xcframework_BCSymbolMaps_path)
       end
 
-      def self.clean
-        @xchelper.xcarchive_frameworks_path.each { |framework| FileUtils.rm_rf(framework.split('/').first) }
+      def self.clean(params)
+        FileUtils.rm_rf(@xchelper.xcarchive_path) if params[:remove_xcarchives]
       end
 
       def self.create_xcframework(params)
         xcframework = @xchelper.xcframework_path
         begin
           FileUtils.rm_rf(xcframework) if File.exist?(xcframework)
-          framework_links = params[:destinations].each_with_index.map do |_, index| 
+          framework_links = params[:destinations].each_with_index.map do |_, index|
             "-framework #{@xchelper.xcarchive_framework_path(index)} #{debug_symbols(index: index, params: params)}"
           end
 
@@ -67,7 +67,7 @@ module Fastlane
       end
 
       def self.debug_symbols(index:, params:)
-        return "" unless Helper.xcode_at_least?('12.0.0')
+        return "" unless Helper.xcode_at_least?('12.0.0') && params[:include_debug_symbols] == true
 
         debug_symbols = []
 
@@ -77,10 +77,11 @@ module Fastlane
         end
 
         # Include BCSymbols in xcframework
-        if params[:include_BCSymbolMaps] != false && params[:include_bitcode] != false
+        if params[:include_BCSymbolMaps] != false && params[:enable_bitcode] != false
           bc_symbols_dir = @xchelper.xcarchive_BCSymbolMaps_path(index)
-          if Dir.exist?(bc_symbols_dir) 
-            debug_symbols << Dir.children(bc_symbols_dir).map { |path| "-debug-symbols #{File.expand_path("#{bc_symbols_dir}/#{path}")}" }.join(' ') 
+          if Dir.exist?(bc_symbols_dir)
+            arguments = Dir.children(bc_symbols_dir).map { |path| "-debug-symbols #{File.expand_path("#{bc_symbols_dir}/#{path}")}" }
+            debug_symbols << arguments.join(' ')
           end
         end
 
@@ -88,6 +89,8 @@ module Fastlane
       end
 
       def self.copy_dSYMs(params)
+        return if params[:include_dSYMs] == false
+
         dSYMs_output_dir = @xchelper.xcframework_dSYMs_path
         FileUtils.mkdir_p(dSYMs_output_dir)
 
@@ -103,7 +106,7 @@ module Fastlane
       end
 
       def self.copy_BCSymbolMaps(params)
-        return if params[:include_bitcode] == false
+        return if params[:enable_bitcode] == false || params[:include_BCSymbolMaps] == false
 
         symbols_output_dir = @xchelper.xcframework_BCSymbolMaps_path
         FileUtils.mkdir_p(symbols_output_dir)
@@ -133,7 +136,7 @@ module Fastlane
         end
         xcargs = ['SKIP_INSTALL=NO', 'BUILD_LIBRARY_FOR_DISTRIBUTION=YES']
 
-        if params[:include_bitcode] != false
+        if params[:enable_bitcode] != false
           params[:xcargs].gsub!(/ENABLE_BITCODE(=|\s+)(YES|NO)/, '') if params[:xcargs]
           xcargs << ['OTHER_CFLAGS="-fembed-bitcode"', 'BITCODE_GENERATION_MODE="bitcode"', 'ENABLE_BITCODE=YES']
         end
@@ -196,7 +199,8 @@ module Fastlane
       end
 
       def self.details
-        "Create xcframework plugin generates xcframework for specified destinations. The output of this action consists of the xcframework itself, which contains dSYM and BCSymbolMaps, if bitcode is enabled."
+        'Create xcframework plugin generates xcframework for specified destinations. ' \
+         'The output of this action consists of the xcframework itself, which contains dSYM and BCSymbolMaps, if bitcode is enabled.'
       end
 
       def self.available_options
@@ -207,7 +211,7 @@ module Fastlane
             optional: false
           ),
           FastlaneCore::ConfigItem.new(
-            key: :include_bitcode,
+            key: :enable_bitcode,
             description: "Should the project be built with bitcode enabled?",
             optional: true,
             is_string: false,
@@ -237,10 +241,24 @@ module Fastlane
             optional: true,
             default_value: true
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :include_debug_symbols,
+            description: 'This feature was added in Xcode 12.0.' \
+                          'If this is set to false, the dSYMs and BCSymbolMaps wont be added to XCFramework itself',
+            optional: true,
+            default_value: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :product_name,
             description: "The name of your module. Optional if equals to :scheme. Equivalent to CFBundleName",
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :remove_xcarchives,
+            description: 'This option will auto-remove the xcarchive files once the plugin finishes.' \ 
+                          'Set this to false to preserve the xcarchives',
+            optional: true,
+            default_value: true
           )
         ]
       end

data/lib/fastlane/plugin/create_xcframework/helper/create_xcframework_helper.rb

@@ -6,7 +6,7 @@ module Fastlane
       end
 
       def product_name
-         @params[:product_name] ||= @params[:scheme]
+        @params[:product_name] ||= @params[:scheme]
       end
 
       def xcframework
@@ -17,12 +17,16 @@ module Fastlane
         "#{product_name}.framework"
       end
 
-      def xcarchive_path(framework_index)
-        "#{framework_index}_#{product_name}.xcarchive"
+      def xcarchive_path
+        "#{output_directory}/archives"
+      end
+
+      def xcarchive_path_for_destination(framework_index)
+        "#{xcarchive_path}/#{framework_index}_#{product_name}.xcarchive"
       end
 
       def xcarchive_framework_path(framework_index)
-        framework_path = "#{xcarchive_path(framework_index)}/Products/Library/Frameworks/#{framework}"
+        framework_path = "#{xcarchive_path_for_destination(framework_index)}/Products/Library/Frameworks/#{framework}"
         return framework_path if File.exist?(framework_path)
 
         FastlaneCore::UI.user_error!("▸ PRODUCT_NAME was misdefined: `#{product_name}`. Please, provide :product_name option")
@@ -33,7 +37,7 @@ module Fastlane
       end
 
       def xcarchive_dSYMs_path(framework_index)
-        File.expand_path("#{xcarchive_path(framework_index)}/dSYMS")
+        File.expand_path("#{xcarchive_path_for_destination(framework_index)}/dSYMS")
       end
 
       def xcframework_dSYMs_path
@@ -41,7 +45,7 @@ module Fastlane
       end
 
       def xcarchive_BCSymbolMaps_path(framework_index)
-        File.expand_path("#{xcarchive_path(framework_index)}/BCSymbolMaps")
+        File.expand_path("#{xcarchive_path_for_destination(framework_index)}/BCSymbolMaps")
       end
 
       def xcframework_BCSymbolMaps_path

data/lib/fastlane/plugin/create_xcframework/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module CreateXcframework
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-create_xcframework
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Boris Bielik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fasterer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fastlane plugin that creates xcframework for given list of destinations.