pod-builder 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36d9f96e5add40dcfea2b813f2f2e7c7a8bf9dc92f66c18d9a9908b8b08acf9
-  data.tar.gz: 9277379ff44774e76b71ee3daa8763dcdf73733800561baa6c12ce4c98b9f649
+  metadata.gz: 3ceefd6bd5f43a132ff983b2b61dcbccc7eb13f851eabcb202c596e7576a24b6
+  data.tar.gz: 0d79a2b1a7d4e4f6ca294c75cdcea47578f36f5f5d37df8840e4fe500f49fee2
 SHA512:
-  metadata.gz: 49c7bfd632020dfb7d1ce681599652e4d5b7f4f44082a62b9440a6c5f45eccb571db1005f1b8d320aea8cdcc5ba4f9f571fe68c8cd7d824b8c681e22b01f4384
-  data.tar.gz: 97ade0e62f14c2128937b5abd4f734fd123ad82ab506d0992a7dd5ee28318596fb600d4781fd1c1e000743eef41ed30e0e1ff46d2ee528af7fefe60ea8282bc4
+  metadata.gz: 5f5869951d3ce8182802e4979db221df18683cfc03f59fd129eb82d93db84553400c34aa606f5a35416758228c8ece7bd7bec7cea63333a7fdc405dda2b145c7
+  data.tar.gz: a0cb6040873ac85fed54eb09081db9c78bb3133702fff78ad93e7395149a2f2216f2921d6f0559c6066ee200c19017ea17805071ba2c44a2226fa56fbbfbfe4e

data/README.md

@@ -279,6 +279,21 @@ PodBuilder leverages CocoaPods code and [cocoapods-rome plugin](https://github.c
 
 # FAQ
 
+### **I get an _'`Alamofire` does not specify a Swift version and none of the targets (`DummyTarget`)'_ when building**
+
+The podspec of the Pod you're trying to build doesn't specify the swift_version which is required in recent versions of CocoaPods. Either contact the author/mantainer of the Pod asking it to fix the podspec or add a `spec_overrides` in _PodBuilder.json_.
+
+```json
+"spec_overrides": {
+    "Google-Mobile-Ads-SDK": {
+      "module_name": "GoogleMobileAds"
+    },
+    "Swifter": {
+      "swift_version": "5.0"
+    }
+}
+```
+
 ### **After prebuilding my project no longer compiles**
 
 A common problem you may encounter is with Objective-C imports. You should verify that you're properly importing all the headers of your pods with the angle bracket notation `#import <FrameworkName/HeaderFile.h>` instead of directly importing `#import "HeaderFile.h"`.
@@ -293,10 +308,12 @@ How to proceed in these cases?
 
 Relaunch the build command passing `-d`, this won't delete the temporary _/tmp/pod_builder_ folder on failure. Open _/tmp/pod_builder/Pods/Pods.xcproject_, make the Pods-DummyTarget target visible by clicking on _Show_ under _Product->Scheme->Manage shemes..._ and build from within Xcode. This will help you understand what went wrong. Remeber to verify that you're building the _Release_ build configuration.
 
+
 ### **Do I need to commit compiled frameworks?**
 
 No. If the size of compiled frameworks in your repo is a concern (and for whatever reason you can't use [Git-LFS](#git-lfs)) you can choose add the _Rome_ and _dSYM_ folder to .gitignore and run `pod_builder update` to rebuild all frameworks that need to be recompiled.
 
+
 ### **I get an _'attempt to read non existent folder `/private/tmp/pod_builder/Pods/ podname'_ when building**
 
 Please open an issue here. You may also add the name of the pod to the [`skip_pods`](#skip_pods) key in the configuration file and try rebuilding again.

data/lib/pod_builder/command/build.rb

@@ -82,7 +82,7 @@ module PodBuilder
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
-        cleanup_framework_folder(all_buildable_items)
+        clean_frameworks_folder(all_buildable_items)
 
         Licenses::write(licenses, all_buildable_items)
 
@@ -297,7 +297,9 @@ module PodBuilder
         return pods_to_build
       end
 
-      def self.cleanup_framework_folder(buildable_items)
+      def self.clean_frameworks_folder(buildable_items)
+        puts "Cleaning framework folder".yellow
+
         expected_frameworks = buildable_items.map { |x| "#{x.module_name}.framework" }
         expected_frameworks += buildable_items.map { |x| x.vendored_items }.flatten.map { |x| x.split("/").last }
         expected_frameworks.uniq!
@@ -311,6 +313,15 @@ module PodBuilder
             FileUtils.rm_rf(existing_framework)
           end
         end
+
+        existing_dsyms = Dir.glob("#{PodBuilder::basepath("dSYM")}/**/*.dSYM")
+        existing_dsyms.each do |existing_dsym|
+          existing_dsym_name = File.basename(existing_dsym)
+          if !expected_frameworks.include?(existing_dsym_name.gsub(".dSYM", ""))
+            puts "Cleanining up `#{existing_dsym_name}`, no longer found among dependencies".blue
+            FileUtils.rm_rf(existing_dsym)
+          end
+        end
       end
     end
   end

data/lib/pod_builder/install.rb

@@ -141,6 +141,10 @@ module PodBuilder
         # making it impossible to determine the associated Pods when building multiple pods at once
         search_base = "#{Configuration.build_path}/Pods/"
         podfile_items.each do |podfile_item|
+          if podfile_item.vendored_framework_path.nil?
+            next
+          end
+          
           podfile_item.vendored_items.each do |vendored_item|
             unless vendored_item.end_with?(".a")
               next
@@ -156,7 +160,7 @@ module PodBuilder
 
                 destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
                 FileUtils.mkdir_p(File.dirname(destination_path))
-                FileUtils.cp_r(library_path, destination_path)        
+                FileUtils.cp_r(library_path, destination_path, :remove_destination => true)
               end
             end
           end

data/lib/pod_builder/podfile.rb

@@ -158,7 +158,11 @@ module PodBuilder
                 marker = podfile_item.prebuilt_marker()
 
                 podfile_item_dependency_items = all_buildable_items.select { |x| podfile_item.dependency_names.include?(x.name) && x.vendored_framework_path.nil? == false }
-                prebuilt_lines += podfile_item_dependency_items.map { |x| "#{line.detect_indentation}#{x.prebuilt_entry(include_pb_entry = false)}#{marker}\n" }.uniq
+                if podfile_item_dependency_items.count > 0
+                  prebuilt_lines += podfile_item_dependency_items.map { |x| "#{line.detect_indentation}#{x.prebuilt_entry(include_pb_entry = false)}#{marker}\n" }.uniq
+                else
+                  prebuilt_lines.push(line)
+                end
               else 
                 prebuilt_lines.push("#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n")
               end

data/lib/pod_builder/podspec.rb

@@ -11,6 +11,7 @@ module PodBuilder
       attr_accessor :resources
       attr_accessor :exclude_files
       attr_accessor :xcconfig
+      attr_accessor :dependencies
       
       def initialize
         @name = ""
@@ -23,6 +24,7 @@ module PodBuilder
         @resources = []
         @exclude_files = []
         @xcconfig = {}
+        @dependencies = []
       end
       
       def to_s
@@ -68,6 +70,8 @@ module PodBuilder
         vendored_frameworks += item.vendored_items.map { |x| File.basename(x) }.select { |x| File.exist?(PodBuilder::basepath(PodfileItem::vendored_name_framework_path(x))) }.map { |x| "Rome/#{x}" }
         vendored_frameworks.uniq!
         vendored_libraries = Dir.glob(PodBuilder::basepath("Rome/#{item.module_name}/**/*.a")).map { |x| x.to_s.gsub(PodBuilder::basepath, "")[1..-1] }
+
+        non_prebuilt_dependencies = item.dependencies.select { |x| x.vendored_framework_path.nil? }
         
         podspec = "  s.subspec '#{item.name.gsub("/", "_")}' do |p|\n"
 
@@ -92,6 +96,9 @@ module PodBuilder
         if item.xcconfig.keys.count > 0
           podspec += "    p.xcconfig = #{item.xcconfig.to_s}\n"
         end
+        non_prebuilt_dependencies.each do |non_prebuilt_dependency|
+          podspec += "    p.dependency '#{non_prebuilt_dependency.name}'\n"
+        end
 
         podspec += "  end"
         
@@ -160,6 +167,8 @@ module PodBuilder
             podspec_item.xcconfig[k] = v
           end
         end
+
+        podspec_item.dependencies = buildable_items.select { |x| pod.dependency_names.include?(x.name) }
       end
 
       return podspec_items

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Tomas Camin