cocoapods-bb-xcframework 0.2.6.1 → 0.2.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cocoapods-xcframework/frameworker.rb +1 -2
  3. data/lib/cocoapods-xcframework/gem_version.rb +1 -1
  4. data/lib/cocoapods-xcframework/util/pod_util.rb +14 -1
  5. data/lib/cocoapods-xcframework/xbuilder.rb +5 -20
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '08c6a4feaf42fcaf08cf0850541fd0d64f28e2f35fce462bee195625b3aa02b1'
4
- data.tar.gz: 2d10b0fdf6c83246d5858f21edade1cfa6c731099c3eae9931303144eecafd5b
3
+ metadata.gz: 86de5787fc0f9a46661f7ebfd6c0cc0ef65f22a879cd1dc7c2925d130a58e2a9
4
+ data.tar.gz: 2b0acbb4860569d5b3db5367ac3a4262a707d0197db2d395dc1b7e34beb89d5d
5
5
  SHA512:
6
- metadata.gz: 21f47c1d01df0b98de368bb131f6f2f384f180c429f10bb20d7ff96d18cc19ed74d41747c517f0c1b94e743d6a6d75762e0656aeb9d82a220eecc69af61a8401
7
- data.tar.gz: 19ab879bc014ef08bd422ba70fdd9e6caed3e8f5b0b8b802b7af8f4f5b493fea78fbe3674ca6fd028de95b0de03bdefebfe5e8b1fef0997090b60b32ae7405c3
6
+ metadata.gz: 5317a8a583129ad146fffacd4b8b105a36967ade03d19a565b1029a17c1692b4964b7e09ec1830ef35424ee9f5e8691d7fc0eaba63372c6de6b0407df84ac915
7
+ data.tar.gz: 020f0ccc7d37338714eef9e7d09cdf33bfe0ac5997711b792cc6fe9ff4c9aa85ea1f09916d4721b99281074a810ec0e6a68daee0320cd70b579eb6c0ce12794c
data/lib/cocoapods-xcframework/frameworker.rb CHANGED
@@ -65,8 +65,7 @@ module Pod
65
65
  spec,
66
66
  @configuration,
67
67
  @symbols,
68
- @support_maccatalyst,
69
- @support_dynamic
68
+ @support_maccatalyst
70
69
  )
71
70
  builder.build
72
71
  builder.outputs target_dir
data/lib/cocoapods-xcframework/gem_version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CocoapodsXCFramework
2
- VERSION = "0.2.6.1"
2
+ VERSION = "0.2.6.2"
3
3
  end
data/lib/cocoapods-xcframework/util/pod_util.rb CHANGED
@@ -84,7 +84,15 @@ module Pod
84
84
  key = configuration[0]
85
85
  if key == 'frameworks'
86
86
  val = configuration[1]
87
- other_flags << "-framework #{val} "
87
+ if val.is_a? String
88
+ other_flags << "-framework #{val} "
89
+ elsif val.is_a? Array
90
+ val.uniq.each do |item|
91
+ other_flags << "-framework #{item} "
92
+ end
93
+ else
94
+ UI.puts "configuration:#{configuration} val:#{val}"
95
+ end
88
96
  end
89
97
  end
90
98
  end
@@ -113,6 +121,11 @@ module Pod
113
121
  UI.puts "configuration other_flags: #{other_flags}"
114
122
  configuration.build_settings['OTHER_LDFLAGS'] = "#{other_flags}"
115
123
  end
124
+ if support_dynamic
125
+ configuration.build_settings['MACH_O_TYPE'] = 'mh_dylib'
126
+ else
127
+ configuration.build_settings['MACH_O_TYPE'] = 'staticlib'
128
+ end
116
129
  end
117
130
  end
118
131
  end
data/lib/cocoapods-xcframework/xbuilder.rb CHANGED
@@ -6,7 +6,7 @@ module Pod
6
6
  include XcodeProjHelper
7
7
  include PodUtil
8
8
  include Config::Mixin
9
- def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true, support_dynamic=false)
9
+ def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true)
10
10
  # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
11
11
  # @platform = platform
12
12
  @installer = installer
@@ -21,35 +21,20 @@ module Pod
21
21
  @outputs = Hash.new
22
22
  @symbols = symbols
23
23
  @support_maccatalyst = support_maccatalyst
24
- @support_dynamic = support_dynamic
25
24
  end
26
25
 
27
26
  def build
28
27
  UI.puts("Building framework #{@spec} with configuration #{@configuration}")
29
- UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols} isDynamic:#{@support_dynamic}"
28
+ UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols}"
30
29
  # defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
31
30
  defines = ""
32
31
  if @configuration == 'Debug'
33
- if @support_dynamic
34
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=mh_dylib'
35
- else
36
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=staticlib'
37
- end
32
+ defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
38
33
  else
39
34
  if @symbols
40
- if @support_dynamic
41
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib'
42
- else
43
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=staticlib'
44
- end
45
- # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
35
+ defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
46
36
  else
47
- if @support_dynamic
48
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib'
49
- else
50
- defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
51
- end
52
- # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
37
+ defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
53
38
  end
54
39
  end
55
40
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-bb-xcframework
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6.1
4
+ version: 0.2.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - humin