cocoapods-pod-merge 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a769edfca1f3a0adee44a9521fffead875328dfad8331f7d1a35c81e63fe334
-  data.tar.gz: 05cef67bc01d514012d5aa35a9eb6daac1b8b4bc355a5771584c323378ec9e57
+  metadata.gz: c15e511e82a904dc11616d9ac811f643216f5d1d34646518ad29a6dbde1e0ec2
+  data.tar.gz: 7a94572e547e895e73f48a99989a81b0444a2fba735e2cc3ac777dbf92845f49
 SHA512:
-  metadata.gz: c097564f432c08bc0c8bac3cc892744699defa501b1f69d487bba396172a68afaacf45d5c81b3a5054a9b9f79eb05f9066b69ebfd942afc5f7dfdf27bb3f0767
-  data.tar.gz: 0d7a58b0fc975ecdbb46a06ab17397b9e482d763404eabe68eac23326c69a12fdf5098f51d8883c4c04a92b4e3a692006ffe25c47659aec050eaf003dc03a401
+  metadata.gz: b3d41d5e2c522632f5a42810e6837bb128da441780efb802704cc5af7d5e10076c9c927f096c6a4b3195e058ecfaee4e8de898b74e2673b62f52cad95cca5923
+  data.tar.gz: 3b438bfa2eda55b58bd0740af5aba4401d25e00f813a1d2d29a4071abceaf70f0fa23094e26a5f235328591fd8ab6db523484d28ef4e544cb58a195065b37606

data/lib/cocoapods-pod-merge/Main.rb

@@ -142,7 +142,15 @@ module CocoapodsPodMerge
             if line.strip == 'end'
               parsing_a_group = false
             elsif line.strip.include?('!')
-              merge_groups[group_name]['flags'][line.strip.delete('!')] = true
+              if line.strip.include?('swift_version!')
+                extracted_swift_version = line.strip.delete('swift_version!').delete('\'').delete('\"').strip.to_f
+                if extracted_swift_version == 0
+                  abort("Found an invalid Swift version specified for group \'#{group_name}\' in the MergeFile. Please specify one like: swift_version! '5.0'".red)
+                end
+                merge_groups[group_name]['swift_version'] = extracted_swift_version.to_s
+              else
+                merge_groups[group_name]['flags'][line.strip.delete('!')] = true
+              end
             else
               merge_groups[group_name]['lines'].append(line)
               line = line.split(',').first
@@ -158,7 +166,7 @@ module CocoapodsPodMerge
                 abort("Duplicate Group Name: #{group_name}. Please make sure all groups have different names!".red)
               end
 
-              merge_groups[group_name] = { 'titles' => [], 'lines' => [], 'flags' => {} }
+              merge_groups[group_name] = { 'titles' => [], 'lines' => [], 'flags' => {}, 'swift_version' => '' }
               parsing_a_group = true
             end
           end
@@ -172,6 +180,7 @@ module CocoapodsPodMerge
 
       pods_to_merge = group_contents['titles']
       flags = group_contents['flags']
+      forced_swift_language_version = group_contents['swift_version']
       public_headers_by_pod = {}
       frameworks = []
       prefix_header_contents = []
@@ -200,7 +209,7 @@ module CocoapodsPodMerge
       Pod::UI.puts 'Downloading Pods in the group'.cyan
       FileUtils.mkdir CacheDirectory unless File.directory?(CacheDirectory)
 
-      create_cache_podfile(podfile_info, group_contents['lines'])
+      create_cache_podfile(podfile_info, group_contents['lines'], forced_swift_language_version)
 
       Dir.chdir(CacheDirectory) do
         system('pod install') || raise('Failed to download pods to merge')
@@ -286,18 +295,23 @@ module CocoapodsPodMerge
       end
 
       # Generate Module Map
-      Pod::UI.puts "\tGenerating module map".magenta
       unless mixed_language_group
+        Pod::UI.puts "\tGenerating module map".magenta
         generate_module_map(merged_framework_name, public_headers_by_pod)
       end
 
       # Verify there's a common Swift language version across the group
       if mixed_language_group
-        swift_version = swift_versions.each_value.reduce { |final_swift_version, versions| final_swift_version & versions }
-        unless swift_version&.first
-          abort("Could not find a common compatible Swift version across the pods to be merged for group #{merged_framework_name}: #{swift_versions}".red)
+        if !forced_swift_language_version.empty?
+          swift_version = [forced_swift_language_version]
+        else
+          swift_version = swift_versions.each_value.reduce { |final_swift_version, versions| final_swift_version & versions }
+          unless swift_version&.first
+            Pod::UI.puts "Could not find a common compatible Swift version across the pods to be merged group #{merged_framework_name}: #{swift_versions}".red
+            abort("or specify a swift version in this group using the swift_version! flag, example: swift_version! '5.0'".red)
+          end
         end
-        Pod::UI.puts "\tUsing Swift Version #{swift_version.first} for the group: #{merged_framework_name}".magenta
+        Pod::UI.puts "\tUsing Swift Version #{swift_version.first} for the group: #{merged_framework_name}".yellow
       end
 
       # Create the local podspec
@@ -386,9 +400,26 @@ module CocoapodsPodMerge
       return [object] if object.class == String || object.class == Hash
     end
 
-    def create_cache_podfile(podfile_info, pods)
+    def create_cache_podfile(podfile_info, pods, swift_language_version)
       FileUtils.touch("#{CacheDirectory}/Podfile")
       file = File.new("#{CacheDirectory}/Podfile", 'w')
+
+      uses_swift = !swift_language_version.empty?
+
+      # Create a temporary Xcode project for pods missing Swift_Version in the Podspec
+      if uses_swift
+        project = Xcodeproj::Project.new("#{CacheDirectory}/Dummy.xcodeproj")
+        target = project.new_target(:application, 'Dummy', :ios, '13.1', nil, :swift)
+        swift_file = project.main_group.new_file('./dummy.swift')
+        target.add_file_references([swift_file])
+        project.targets.each do |target|
+          target.build_configurations.each do |config|
+            config.build_settings['SWIFT_VERSION'] ||= swift_language_version
+          end
+        end
+        project.save
+      end
+
       file.puts("require 'json'")
       podfile_info.sources.each do |source|
         file.puts source
@@ -396,7 +427,13 @@ module CocoapodsPodMerge
       podfile_info.platforms.each do |platform|
         file.puts platform
       end
-      file.puts("install! 'cocoapods', :integrate_targets => false, :lock_pod_sources => false")
+
+      if uses_swift
+        file.puts("install! 'cocoapods', :lock_pod_sources => false")
+      else
+        file.puts("install! 'cocoapods', :integrate_targets => false, :lock_pod_sources => false")
+      end
+
       file.puts("target 'Dummy' do")
       pods.each do |line|
         file.puts line.to_s
@@ -413,7 +450,7 @@ module CocoapodsPodMerge
       module_map = File.new("#{InstallationDirectory}/#{merged_framework_name}/Sources/module.modulemap", 'w')
       module_map.puts("framework module #{merged_framework_name} {")
       public_headers.each do |pod, headers|
-        module_map.puts("\n\texplicit module #{pod} {")
+        module_map.puts("\n\texplicit module #{pod.delete('+').delete('_')} {")
         headers.each do |header|
           module_map.puts("\t\theader \"#{header}\"")
         end

data/lib/cocoapods-pod-merge/gem_version.rb

@@ -2,5 +2,5 @@
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 
 module CocoapodsPodMerge
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pod-merge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Siddharth Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: Cocoapods plugin to merge your pods into one framework, to reduce dylib
   loading time on app startup.
 email:
@@ -62,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="