framework-generate 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5481aea25fd26aeef0f1534493de6c7f3e17addd
-  data.tar.gz: 753f2aefef19fbcf91f178ecef0f9224d8eb2028
+  metadata.gz: 929102ecf32c2ae9222afb24a2c3f0ee63ec5463
+  data.tar.gz: e78cee6dc0e240b3fcf247f2c776e63a30c39df8
 SHA512:
-  metadata.gz: 149e097d7ddeda43885fdc1003e25e31477e35ed72a770cd46b7e9a2defb8bc5cc30b5561dd86f582a551cbe36f939a7e347e8d9bd6e8e057ccb000521844058
-  data.tar.gz: d4186b933243497d5cecb425ae355184c0d03f7d177b22f697f2dff8846e184275b6e60c37c935290b8916977303355fae5e33c51affbe458bb5d2d699fd3625
+  metadata.gz: 688daffcc5c5b46321d7a8ef78121cc64a3ed406649a58a6680c8c0d44e59bf3deb6fc0682dbb0ba5dd495edfe1d527a5383688503f5facd95736423e5f96b1f
+  data.tar.gz: d78c2fdfcd8bdea56e943d83a48097955b846c8e957bd150672fa164612370a09e3c14a5ba4177f24a3f780b9790d424a9013dbdc13ce01e87463662f6354228

data/lib/framework-generate/target.rb

@@ -32,7 +32,7 @@ module FrameworkGenerate
       "Target<#{name}, #{info_plist}, #{bundle_id}, #{header}, #{include_files}, #{exclude_files}, #{dependencies}, #{type}, #{test_target}, #{is_safe_for_extensions}, #{enable_code_coverage}>"
     end
 
-    def target_build_settings(settings)
+    def target_build_settings(settings, has_frameworks)
       settings.delete('CODE_SIGN_IDENTITY')
       settings.delete('CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING')
       settings.delete('CLANG_WARN_COMMA')
@@ -49,25 +49,33 @@ module FrameworkGenerate
       macos = FrameworkGenerate::Platform.find_platform(@platforms, :macos)
       unless macos.nil?
         settings['MACOSX_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(macos)
-        settings['FRAMEWORK_SEARCH_PATHS[sdk=macosx*]'] = FrameworkGenerate::Platform.search_paths(macos)
+        if has_frameworks
+          settings['FRAMEWORK_SEARCH_PATHS[sdk=macosx*]'] = FrameworkGenerate::Platform.search_paths(macos)
+        end
       end
 
       ios = FrameworkGenerate::Platform.find_platform(@platforms, :ios)
       unless ios.nil?
         settings['IPHONEOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(ios)
-        settings['FRAMEWORK_SEARCH_PATHS[sdk=iphone*]'] = FrameworkGenerate::Platform.search_paths(ios)
+        if has_frameworks
+          settings['FRAMEWORK_SEARCH_PATHS[sdk=iphone*]'] = FrameworkGenerate::Platform.search_paths(ios)
+        end
       end
 
       watchos = FrameworkGenerate::Platform.find_platform(@platforms, :watchos)
       unless watchos.nil?
         settings['WATCHOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(watchos)
-        settings['FRAMEWORK_SEARCH_PATHS[sdk=watch*]'] = FrameworkGenerate::Platform.search_paths(watchos)
+        if has_frameworks
+          settings['FRAMEWORK_SEARCH_PATHS[sdk=watch*]'] = FrameworkGenerate::Platform.search_paths(watchos)
+        end
       end
 
       tvos = FrameworkGenerate::Platform.find_platform(@platforms, :tvos)
       unless tvos.nil?
         settings['TVOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(tvos)
-        settings['FRAMEWORK_SEARCH_PATHS[sdk=appletv*]'] = FrameworkGenerate::Platform.search_paths(tvos)
+        if has_frameworks
+          settings['FRAMEWORK_SEARCH_PATHS[sdk=appletv*]'] = FrameworkGenerate::Platform.search_paths(tvos)
+        end
       end
 
       settings['SWIFT_VERSION'] = @language.version
@@ -290,6 +298,8 @@ module FrameworkGenerate
       target.product_type = Xcodeproj::Constants::PRODUCT_TYPE_UTI[type]
       target.build_configuration_list = Xcodeproj::Project::ProjectHelper.configuration_list(project, :osx, nil, type, language.type)
 
+      has_frameworks = third_party_frameworks?(project)
+
       # Pre build script
       add_pre_build_scripts(target)
 
@@ -297,7 +307,7 @@ module FrameworkGenerate
       add_source_files(project, target)
 
       target.build_configurations.each do |configuration|
-        target_build_settings(configuration.build_settings)
+        target_build_settings(configuration.build_settings, has_frameworks)
       end
 
       # Product
@@ -319,7 +329,7 @@ module FrameworkGenerate
       add_resource_files(project, target)
 
       # Copy frameworks to test target
-      if target.test_target_type? && third_party_frameworks?(project)
+      if target.test_target_type? && has_frameworks
         build_phase = target.new_shell_script_build_phase('Copy Carthage Frameworks')
         copy_carthage_frameworks(project, build_phase, scripts_directory)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: framework-generate
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Pierre-Marc Airoldi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj