framework-generate 1.3.1 → 1.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/framework-generate/target.rb +17 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 929102ecf32c2ae9222afb24a2c3f0ee63ec5463
|
4
|
+
data.tar.gz: e78cee6dc0e240b3fcf247f2c776e63a30c39df8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 688daffcc5c5b46321d7a8ef78121cc64a3ed406649a58a6680c8c0d44e59bf3deb6fc0682dbb0ba5dd495edfe1d527a5383688503f5facd95736423e5f96b1f
|
7
|
+
data.tar.gz: d78c2fdfcd8bdea56e943d83a48097955b846c8e957bd150672fa164612370a09e3c14a5ba4177f24a3f780b9790d424a9013dbdc13ce01e87463662f6354228
|
@@ -32,7 +32,7 @@ module FrameworkGenerate
|
|
32
32
|
"Target<#{name}, #{info_plist}, #{bundle_id}, #{header}, #{include_files}, #{exclude_files}, #{dependencies}, #{type}, #{test_target}, #{is_safe_for_extensions}, #{enable_code_coverage}>"
|
33
33
|
end
|
34
34
|
|
35
|
-
def target_build_settings(settings)
|
35
|
+
def target_build_settings(settings, has_frameworks)
|
36
36
|
settings.delete('CODE_SIGN_IDENTITY')
|
37
37
|
settings.delete('CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING')
|
38
38
|
settings.delete('CLANG_WARN_COMMA')
|
@@ -49,25 +49,33 @@ module FrameworkGenerate
|
|
49
49
|
macos = FrameworkGenerate::Platform.find_platform(@platforms, :macos)
|
50
50
|
unless macos.nil?
|
51
51
|
settings['MACOSX_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(macos)
|
52
|
-
|
52
|
+
if has_frameworks
|
53
|
+
settings['FRAMEWORK_SEARCH_PATHS[sdk=macosx*]'] = FrameworkGenerate::Platform.search_paths(macos)
|
54
|
+
end
|
53
55
|
end
|
54
56
|
|
55
57
|
ios = FrameworkGenerate::Platform.find_platform(@platforms, :ios)
|
56
58
|
unless ios.nil?
|
57
59
|
settings['IPHONEOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(ios)
|
58
|
-
|
60
|
+
if has_frameworks
|
61
|
+
settings['FRAMEWORK_SEARCH_PATHS[sdk=iphone*]'] = FrameworkGenerate::Platform.search_paths(ios)
|
62
|
+
end
|
59
63
|
end
|
60
64
|
|
61
65
|
watchos = FrameworkGenerate::Platform.find_platform(@platforms, :watchos)
|
62
66
|
unless watchos.nil?
|
63
67
|
settings['WATCHOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(watchos)
|
64
|
-
|
68
|
+
if has_frameworks
|
69
|
+
settings['FRAMEWORK_SEARCH_PATHS[sdk=watch*]'] = FrameworkGenerate::Platform.search_paths(watchos)
|
70
|
+
end
|
65
71
|
end
|
66
72
|
|
67
73
|
tvos = FrameworkGenerate::Platform.find_platform(@platforms, :tvos)
|
68
74
|
unless tvos.nil?
|
69
75
|
settings['TVOS_DEPLOYMENT_TARGET'] = FrameworkGenerate::Platform.deployment_target(tvos)
|
70
|
-
|
76
|
+
if has_frameworks
|
77
|
+
settings['FRAMEWORK_SEARCH_PATHS[sdk=appletv*]'] = FrameworkGenerate::Platform.search_paths(tvos)
|
78
|
+
end
|
71
79
|
end
|
72
80
|
|
73
81
|
settings['SWIFT_VERSION'] = @language.version
|
@@ -290,6 +298,8 @@ module FrameworkGenerate
|
|
290
298
|
target.product_type = Xcodeproj::Constants::PRODUCT_TYPE_UTI[type]
|
291
299
|
target.build_configuration_list = Xcodeproj::Project::ProjectHelper.configuration_list(project, :osx, nil, type, language.type)
|
292
300
|
|
301
|
+
has_frameworks = third_party_frameworks?(project)
|
302
|
+
|
293
303
|
# Pre build script
|
294
304
|
add_pre_build_scripts(target)
|
295
305
|
|
@@ -297,7 +307,7 @@ module FrameworkGenerate
|
|
297
307
|
add_source_files(project, target)
|
298
308
|
|
299
309
|
target.build_configurations.each do |configuration|
|
300
|
-
target_build_settings(configuration.build_settings)
|
310
|
+
target_build_settings(configuration.build_settings, has_frameworks)
|
301
311
|
end
|
302
312
|
|
303
313
|
# Product
|
@@ -319,7 +329,7 @@ module FrameworkGenerate
|
|
319
329
|
add_resource_files(project, target)
|
320
330
|
|
321
331
|
# Copy frameworks to test target
|
322
|
-
if target.test_target_type? &&
|
332
|
+
if target.test_target_type? && has_frameworks
|
323
333
|
build_phase = target.new_shell_script_build_phase('Copy Carthage Frameworks')
|
324
334
|
copy_carthage_frameworks(project, build_phase, scripts_directory)
|
325
335
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: framework-generate
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pierre-Marc Airoldi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-02-
|
11
|
+
date: 2018-02-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: xcodeproj
|