pod-builder 2.0.0.beta.32 → 2.0.0.beta.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2d2da339c3c50f17484abe18c4f4dd8080d4344bc526b393c95c3d166c9851
-  data.tar.gz: 483067dfc8cd9b914dfa9768afc33cf067f7807a9b09ce3f1b3c86c67b4c08a6
+  metadata.gz: b58e2c327114bf83714658e6dd24e5a54ab583f42f81b41c193e83b1c4b8b0f2
+  data.tar.gz: fc32c5dc1aa63ad240116a0da78bfb10a9acdfb39e192d075b979dbe0828d690
 SHA512:
-  metadata.gz: e87ca666254ff92c0c729412acf61d02e822b55933524d07ed2ec13ea38b33a29f13fac2ec6eef221f373626b50f690ec45235f7874910374123806d0a0d6122
-  data.tar.gz: 945398f22ccc35ac924a16e6fe3a95be6343fd0ee335f8f9f94082004193113566884a49043cefac8bf6efb705db79d774dab304e56ec15fe468acdcf6e687e4
+  metadata.gz: 23eb28db1f01119fed69b0a11039049fffe6e74acef44871a61cf7745972ed52d49435febf4ee35647517d001f6292b13b766fc0c18392ae71d4877d8b95ed1a
+  data.tar.gz: ce587f760d65fcb04778838fb200f6f018fa8cdfb39ae33eee7f67de4d82ad761fae340abc65beaf92a6d03fdd594deba2819771d461c203b25e2c2e7986b470

data/README.md

@@ -25,15 +25,15 @@ You can the initialize your project to use the tool using the `init` command
 
  This will add a _PodBuilder_ folder which will contain all files needed and generated by the PodBuilder.
 
- To prebuild all dependencies run
-
-    $ pod_builder build_all
-
  To prebuild just one or more specific dependencies run
 
     $ pod_builder build Pod1 Pod2
 
-This will generate the pod frameworks which can be committed to your repo for a much faster compilation.
+ To prebuild all dependencies run
+
+    $ pod_builder build_all
+
+This will generate the pod frameworks which can be committed to your repo (using git LFS is highly suggested) for much faster compilation.
 
 Should PodBuilder not work the way you expect you can get rid of it by running
 
@@ -61,7 +61,7 @@ This acts as a sort of lockfile and reflects the current state of what is instal
 
 ## Commands
 
-Podbuilder comes with a set of commands:
+PodBuilder comes with a rich set of commands:
 
 - `init`: initializes a project to use PodBuilder
 - `deintegrate`: deintegrates PodBuilder's initialization
@@ -85,7 +85,7 @@ The following will happen:
 
 - Create a _PodBuilder_ folder in your repo's root.
 - Copy your original Podfile to _PodBuilder/Podfile_ (PodBuilder-Podfile)
-- Add an initially empty _PodBuilder.json_ configuration file
+- Add a _PodBuilder.json_ configuration file
 - Modify the original Podfile (Application-Podfile) with some minor customizations
 - Create/Update your Gemfile adding the `gem 'pod-builder'` entry
 
@@ -120,7 +120,7 @@ Will recompile all pods to the versions defined in the Restore-Podfile. You woul
 
 #### `install_sources` command
 
-When using PodBuilder you loose ability to directly access to the source code of a pod. To overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
+Once you prebuild a pod you can no longer debug its origianl code, to overcome this limitation you can use this command which downloads the pod's source code to _PodBuilder/Sources_ and with some [tricks](https://medium.com/@t.camin/debugging-prebuilt-frameworks-c9f52d42600b) restores the ability to use the debugger and step into the code of your prebuilt dependencies. This can be very helpful to catch the exact location of a crash when it occurs (showing something more useful than assembly code). It is however advisable to switch to the original pod when doing any advanced debugging during development of code that involves a pod.
 
 #### `generate_lldbinit` command
 
@@ -257,7 +257,7 @@ Xcode build settings to use. You can override the default values which are:
 } 
 ```
 
-If your project uses bitcode change "ENABLE_BITCODE" to "YES".
+If your project uses bitcode change "ENABLE_BITCODE" to "YES". Please note that all pods that have dependencies to XCTest need to be add a `"ENABLE_BITCODE": "NO"` to the `build_settings_overrides` below.
 
 #### `build_settings_overrides`
 

data/lib/pod_builder/configuration.rb

@@ -37,6 +37,11 @@ module PodBuilder
         "remove_module_maps": ["glog"]
       }
     }.freeze
+    DEFAULT_BUILD_SETTINGS_OVERRIDES = {
+      "SBTUITestTunnelClient": {
+        "ENABLE_BITCODE": "NO"
+      }
+    }.freeze
     DEFAULT_SKIP_PODS = ["GoogleMaps"]
     DEFAULT_FORCE_PREBUILD_PODS = ["GoogleTagManager"]
     DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
@@ -46,6 +51,7 @@ module PodBuilder
     DEFAULT_BUILD_USING_REPO_PATHS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
+    private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
     private_constant :DEFAULT_BUILD_SYSTEM
     private_constant :DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     
@@ -82,7 +88,7 @@ module PodBuilder
     
     @allow_building_development_pods = false
     @build_settings = DEFAULT_BUILD_SETTINGS
-    @build_settings_overrides = {}
+    @build_settings_overrides = DEFAULT_BUILD_SETTINGS_OVERRIDES
     @build_system = DEFAULT_BUILD_SYSTEM
     @library_evolution_support = DEFAULT_LIBRARY_EVOLUTION_SUPPORT
     @base_path = "PodBuilder" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME

data/lib/pod_builder/install.rb

@@ -177,10 +177,13 @@ module PodBuilder
         return InstallResult.new(licenses, prebuilt_info)
       rescue Exception => e
         if File.directory?("#{Configuration.build_path}/Pods/Pods.xcodeproj")
+          activate_pod_scheme()
+
           if ENV["DEBUGGING"]
             system("xed #{Configuration.build_path}/Pods")  
           elsif !OPTIONS.has_key?(:no_stdin_available)
             confirm = ask("\n\nOh no! Something went wrong during prebuild phase! Do you want to open the prebuild project to debug the error, you will need to add and run the Pods-Dummy scheme? [Y/N] ".red) { |yn| yn.limit = 1, yn.validate = /[yn]/i }
+
             if confirm.downcase == 'y'
               system("xed #{Configuration.build_path}/Pods")  
             end
@@ -335,7 +338,7 @@ module PodBuilder
     end
     
     def self.install
-      puts "Prebuilding items".yellow
+      puts "Preparing build".yellow
       
       CLAide::Command::PluginManager.load_plugins("cocoapods")
       
@@ -495,5 +498,17 @@ module PodBuilder
         return replace_path
       end
     end 
+
+    def self.activate_pod_scheme
+      if scheme_file = Dir.glob("#{Configuration.build_path}/Pods/**/xcschememanagement.plist").first
+        plist = CFPropertyList::List.new(:file => scheme_file)
+        data = CFPropertyList.native_types(plist.value)
+  
+        data["SchemeUserState"]["Pods-DummyTarget.xcscheme"]["isShown"] = true
+
+        plist.value = CFPropertyList.guess(data)
+        plist.save(scheme_file, CFPropertyList::List::FORMAT_BINARY)  
+      end
+    end
   end
 end

data/lib/pod_builder/podfile.rb

@@ -47,6 +47,9 @@ module PodBuilder
         build_settings["CLANG_ENABLE_MODULE_DEBUGGING"] = "NO"
         build_settings["OTHER_SWIFT_FLAGS"] = "$(inherited) -Xfrontend -no-clang-module-breadcrumbs"
 
+        # Ignore deprecation warnings
+        build_settings["GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS"] = "NO"
+
         # Improve compile speed
         build_settings["COMPILER_INDEX_STORE_ENABLE"] = "NO"
         build_settings["SWIFT_INDEX_STORE_ENABLE"] = "NO"

data/lib/pod_builder/rome/post_install.rb

@@ -267,6 +267,8 @@ module PodBuilder
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
+  puts "Building".yellow
+
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
   uses_frameworks = user_options.fetch('uses_frameworks', true)

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.32"
+  VERSION = "2.0.0.beta.33"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.32
+  version: 2.0.0.beta.33
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler