gonative-cli 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7995dad23118881e1f16097bc42257ab6592b53ec48eed27edd9ad1393a09273
-  data.tar.gz: 213cf6485bda29cfeeaa561cb316439a9b42fe9def6eb3c2d1f2a9cba441e03d
+  metadata.gz: 209c566d675f24e9d390dc519042c8e0e4ae7d34106cc11554420645dec7059e
+  data.tar.gz: d64745af6c9013723754bf43e3ad5741d157ab108f9f9257cb6d37bc466873e7
 SHA512:
-  metadata.gz: 02d51cad7d56e6d9f233933393c9ee0669e8245ccff392beace11141cfa53c03d2daa86a56c70ae30adf3e581ad0163be523b3da0f8a368331a872a2f6d9edd1
-  data.tar.gz: d605e247903c38c9a0123700ed55632e1df41cc8185b72755da018b989ea0cabca06d82dd4e79e7dfcb7972b97532bdc53de71d2912c4cad38f1c13d84530c5f
+  metadata.gz: c7d09ae152c411ca063d5285d112aa7fd3f62672b0847d24e72c01ef0729402899e82e7e7f98fda7f6909fcfb518676418dc078abbb198d9272c4e12721bfbad
+  data.tar.gz: 2d510fa5fb4f2d1ad93b4a52033870eb3bf52a56a3987567133a7c550c8cc87e3ac9282da0a823e8415fa22b6639191f4b6d24bfe95527c1cb4dfea93cf3bc97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gonative-cli (0.7.17)
+    gonative-cli (0.9.0)
       activesupport (~> 6.0)
       cocoapods (~> 1.10)
       colorize (~> 0.8.0)

data/lib/gonative/commands/ios/embed_extensions.rb

@@ -4,7 +4,7 @@ module GoNative
   module Commands
     module IOS
       class EmbedExtensions < Base
-        desc 'Extracts extension targets from a project'
+        desc 'Embeds all extensions from plugins to the project'
         
         def call(**)
           Plugins::IOS::EmbedExtensions.call

data/lib/gonative/commands/ios/publish.rb

@@ -11,7 +11,6 @@ module GoNative
         option :archs, default: 'x86_64,arm64'
         
         def call(skip_build:, debug:, archs:, **)
-          FileUtils.cd('/Users/hunaidhassan/Projects/gonative/AuthPlugin')
           Plugins::IOS::Verify.call
           Plugins::IOS::BuildFramework.call(archs, debug) unless skip_build
           Plugins::IOS::Release.call

data/lib/gonative/commands/ios/set_bundle_id.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module GoNative
+  module Commands
+    module IOS
+      class SetBundleId < Base
+        desc 'Sets bundle Id '
+        
+        argument :bundle_id, required: true, desc: 'Bundle id for the app'
+        option :with_entitlements, type: :boolean, default: false
+        
+        def call(bundle_id:, with_entitlements:, **)
+          Plugins::IOS::SetBundleId.call(bundle_id, with_entitlements)
+        end
+      end
+    end
+  end
+end

data/lib/gonative/commands.rb

@@ -7,8 +7,9 @@ module GoNative
     register 'version', Version, aliases: %w[--version -v]
     register 'ios create', IOS::Create
     register 'ios publish', IOS::Publish
-    register 'ios extract', IOS::ExtractExtensions
-    register 'ios embed', IOS::EmbedExtensions
+    register 'ios extract-extensions', IOS::ExtractExtensions
+    register 'ios embed-extensions', IOS::EmbedExtensions
+    register 'ios set-bundle-id', IOS::SetBundleId
     register 'android create', Android::Create
   end
 end

data/lib/gonative/plugins/ios/embed_extensions.rb

@@ -13,6 +13,7 @@ module GoNative
         attr_reader :extensions
         
         def call
+          FileUtils.cd('/Users/hunaidhassan/Projects/gonative/gonative-ios')
           prepare_extensions
           embed_in_project
           modify_podfile
@@ -25,13 +26,14 @@ module GoNative
             .flatten
             .each { |path| FileUtils.cp_r(path, '.') }
           @extensions = extension_paths
-                          .map { |path| Pathname(path).children.select{ |p| p.extname == '.json'} }
+                          .map { |path| Pathname(path).children.select { |p| p.extname == '.json' } }
                           .flatten
                           .map { |p| JSON.parse(File.read(p)) }
         end
         
         def embed_in_project
           proj = Xcodeproj::Project.open('GoNativeIOS.xcodeproj')
+          app_target = proj.native_targets.first
           extensions.each do |extension|
             target = proj.new_target(:app_extension,
                                      extension['name'],
@@ -39,17 +41,21 @@ module GoNative
                                      '11.0')
             extension_group = proj.new_group(extension['name'], extension['name'])
             
-            extension['headers'].each{ |path| extension_group.new_file(path) }
-            target.add_file_references(extension['source_files'].map{ |path| extension_group.new_file(path) })
-            target.add_resources(extension['resources'].map{ |path| extension_group.new_file(path) })
+            extension['headers'].each { |path| extension_group.new_file(path) }
+            target.add_file_references(extension['source_files'].map { |path| extension_group.new_file(path) })
+            target.add_resources(extension['resources'].map { |path| extension_group.new_file(path) })
             target.add_system_frameworks(extension['system_frameworks'])
-            
-            if extension['entitlements']
-              extension_group.new_file(extension['entitlements'])
-              target.build_configurations.each do |config|
-                config.build_settings['CODE_SIGN_ENTITLEMENTS'] = "#{extension['name']}/#{extension['entitlements']}"
-              end
+            extension_group.new_file(extension['info'])
+            extension_group.new_file(extension['entitlements']) if extension['entitlements']
+            target.build_configurations.each do |config|
+              config.build_settings['PRODUCT_NAME'] = "$(TARGET_NAME)"
+              config.build_settings['INFOPLIST_FILE'] = "#{extension['name']}/#{extension['info']}"
+              config.build_settings['CODE_SIGN_ENTITLEMENTS'] = "#{extension['name']}/#{extension['entitlements']}" if extension['entitlements']
             end
+            app_target.add_dependency(target)
+            extension_file = proj.files.find{|f| f.path == "#{extension['name']}.appex" }
+            embed_phase = app_target.build_phases.find { |phase| phase.class.method_defined?(:name) && phase.name == 'Embed App Extensions' }
+            embed_phase.add_file_reference(extension_file, true)
           end
           
           proj.save
@@ -61,7 +67,7 @@ module GoNative
               f.puts "target '#{extension['name']}' do"
               f.puts "\tuse_frameworks!"
               extension['dependencies'].each do |dep|
-                f.puts "\tpod #{dep['name']}, #{dep['requirement']}"
+                f.puts "\tpod '#{dep['name']}', '#{dep['requirement']}'"
               end
               f.puts "end"
             end

data/lib/gonative/plugins/ios/extract_extensions.rb

@@ -31,6 +31,7 @@ module GoNative
             target_definition[:name] = extension_name
             
             FileUtils.cd(extension_name)
+            target_definition[:info] = `find . -name '*Info.plist'`.split("\n").first
             target_definition[:entitlements] = `find -E . -regex ".*\.(entitlements)"`.split("\n").first
             target_definition[:headers] = `find -E . -regex ".*\.(h)"`.split("\n")
             target_definition[:source_files] = `find -E . -regex ".*\.(m|swift)"`.split("\n")
@@ -56,7 +57,7 @@ module GoNative
               }
             end
             
-            target_definition.slice(:entitlements, :headers, :source_files, :resources).values.compact.flatten.each do |file_path|
+            target_definition.slice(:info, :entitlements, :headers, :source_files, :resources).values.compact.flatten.each do |file_path|
               system('ditto', file_path, "#{original_path}/#{extension_path}/#{file_path}")
             end
  

data/lib/gonative/plugins/ios/release.rb

@@ -45,7 +45,7 @@ module GoNative
           end
           
           def push_to_pod_repo!
-            system "pod repo push #{GONATIVE_SOURCE_NAME} #{spec_name} --private"
+            system "pod repo push #{GONATIVE_SOURCE_NAME} #{spec_name} --private --allow-warnings"
           end
           
           def spec_name

data/lib/gonative/plugins/ios/set_bundle_id.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'xcodeproj'
+require 'cfpropertylist'
+
+module GoNative
+  module Plugins
+    module IOS
+      class SetBundleId
+        extend DSL::Serviceable
+        
+        attr_reader :bundle_id
+        
+        def initialize(bundle_id, update_entitlements)
+          @bundle_id = bundle_id
+          @update_entitlements = update_entitlements
+        end
+        
+        def call
+          update_project
+          update_entitlements if update_entitlements?
+        end
+        
+        def update_project
+          proj = Xcodeproj::Project.open('./GoNativeIOS.xcodeproj')
+          proj.targets.each do |target|
+            case target.product_type
+            when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]
+              set_target_bundle_id(target, bundle_id)
+            when Xcodeproj::Constants::PRODUCT_TYPE_UTI[:app_extension]
+              set_target_bundle_id(target, bundle_id + '.' + target.name)
+            else
+              next
+            end
+          end
+          
+          proj.save
+        end
+        
+        def update_entitlements
+          entitlement_files = `find -E . -maxdepth 2 -regex ".*\.(entitlements)"`.split("\n")
+          entitlement_files.each do |entitlement_file|
+            plist = CFPropertyList::List.new(file: entitlement_file)
+            entitlements = CFPropertyList.native_types(plist.value)
+            entitlements['com.apple.security.application-groups'] = ['group.' + bundle_id]
+            plist.value = CFPropertyList.guess(entitlements)
+            plist.save(entitlement_file, CFPropertyList::List::FORMAT_XML)
+          end
+        end
+        
+        private
+          
+        def set_target_bundle_id(target, bundle_id)
+          target.build_configurations.each do |config|
+            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = bundle_id
+          end
+        end
+        
+        def update_entitlements?
+          @update_entitlements
+        end
+      end
+    end
+  end
+end

data/lib/gonative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoNative
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/templates/plugins/ios/common/PLUGIN_NAME.podspec.tpl

@@ -14,7 +14,7 @@ TODO: Add long description of the pod here.
 
   s.ios.deployment_target = '10.0'
   s.swift_versions = '5.0'
-  s.preserve_paths = 'plist/*.{plist}'
+  s.preserve_paths = ['plist/*.{plist}', 'Extensions/**/*']
 
   s.subspec 'Source' do |cs|
     cs.source_files = '#{plugin_name}/Classes/**/*.{h,m,swift}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gonative-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Hunaid Hassan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -193,6 +193,7 @@ files:
 - lib/gonative/commands/ios/embed_extensions.rb
 - lib/gonative/commands/ios/extract_extensions.rb
 - lib/gonative/commands/ios/publish.rb
+- lib/gonative/commands/ios/set_bundle_id.rb
 - lib/gonative/commands/version.rb
 - lib/gonative/dsl/error_catchable.rb
 - lib/gonative/dsl/serviceable.rb
@@ -202,6 +203,7 @@ files:
 - lib/gonative/plugins/ios/embed_extensions.rb
 - lib/gonative/plugins/ios/extract_extensions.rb
 - lib/gonative/plugins/ios/release.rb
+- lib/gonative/plugins/ios/set_bundle_id.rb
 - lib/gonative/plugins/ios/verify.rb
 - lib/gonative/utils.rb
 - lib/gonative/utils/content_evaluator.rb