gonative-cli 0.7.16 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978a8e1166a47df0eaada6a7acc92f45e5cb48291dd5bce06ea8ef53dce4dc66
-  data.tar.gz: d48f9d01b36e2ec6ddeffd9e62d5659002aae942e9a565855776557f27971646
+  metadata.gz: 341c48f844c28ac2a8f5139a1d5445c9892565a61ebe2b90773448e6dfd36e11
+  data.tar.gz: 2633635ba0e18942008e5ed0f2a4f0627b06b9db60153d9cdba79f07e6c22dae
 SHA512:
-  metadata.gz: ed4433cc3d8c2b83c146692d3239499fd65745adb1cca6265fd74a97f12ae6f6a79dabd9b6be0a0d09261020e53e35ca223fc7ad0a992989841dff50e66328a7
-  data.tar.gz: 5409e669f065b340df58c18cf6f7a49c9dc93ababa0b70936c19d8f248ff65c965eafe4e4bd63bf136dc23893c9bf406f5f97ab33564f42f97c57539f301a436
+  metadata.gz: d9fa855c120bb8065128479038d33edb26b2a2c3327d1118a32b441652143e4fe7cbd3160bb397f2a957fade4b2f6ad63cbc4b6bad7d2a12a78deb6ab616710e
+  data.tar.gz: 3b7b8213d27e221de23870010637c74c7c2d7b21ad87a85b283e639cfbef81ea36f3da3865abd389c0afde86fbfff29e1b08755363513562a3bc25eac9cb14cf

data/Gemfile.lock

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

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module GoNative
+  module Commands
+    module IOS
+      class EmbedExtensions < Base
+        desc 'Extracts extension targets from a project'
+        
+        def call(**)
+          Plugins::IOS::EmbedExtensions.call
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module GoNative
+  module Commands
+    module IOS
+      class ExtractExtensions < Base
+        desc 'Extracts extension targets from a project'
+        
+        argument :path, required: false, desc: 'Path to the xcodeproj'
+        
+        def call(path:, **)
+          Plugins::IOS::ExtractExtensions.call(path)
+        end
+      end
+    end
+  end
+end

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

@@ -4,15 +4,15 @@ module GoNative
   module Commands
     module IOS
       class Publish < Base
+        autoload :FileUtils, 'fileutils'
         desc 'Verify, build and release a new version'
-        argument :name, required: true, desc: 'Name of the plugin'
         option :skip_build, type: :boolean, default: false
         option :debug, type: :boolean, default: false
         option :archs, default: 'x86_64,arm64'
         
-        def call(name:, skip_build:, debug:, archs:, **)
+        def call(skip_build:, debug:, archs:, **)
           Plugins::IOS::Verify.call
-          Plugins::IOS::BuildFramework.call(name, archs, debug) unless skip_build
+          Plugins::IOS::BuildFramework.call(archs, debug) unless skip_build
           Plugins::IOS::Release.call
         end
       end

data/lib/gonative/commands.rb

@@ -7,6 +7,8 @@ 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 'android create', Android::Create
   end
 end

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

@@ -16,8 +16,11 @@ module GoNative
         
         attr_reader :plugin_name, :archs, :persist_build_dir
 
-        def initialize(plugin_name, archs, persist_build_dir)
-          @plugin_name = plugin_name
+        def initialize(archs, persist_build_dir)
+          podspec_file = Dir["./*.podspec"].first
+          raise Error, "No podspec exists." unless podspec_file
+          
+          @plugin_name = File.basename(podspec_file, '.podspec')
           @archs = archs.gsub(',', ' ')
           @persist_build_dir = persist_build_dir
         end
@@ -49,10 +52,18 @@ module GoNative
                                    deployment_target)
           main_group = proj.new_group(plugin_name, plugin_name)
           classes_group = main_group.new_group('Classes', 'Classes')
-          references = Dir.glob("../#{plugin_name}/Classes/**").map{ |file| classes_group.new_file("../../#{file}") }
+          references = Dir.glob("../#{plugin_name}/Classes/**/*.{m,swift}").map{ |file| classes_group.new_file("../../#{file}") }
           target.add_file_references(references)
+          references = Dir.glob("../#{plugin_name}/Classes/**/*.h").map{ |file| classes_group.new_file("../../#{file}") }
+          header_files = target.add_file_references(references)
+          header_files << target.headers_build_phase.add_file_reference(main_group.new_file("../#{plugin_name}-umbrella.h"))
+          header_files.each do |header|
+            header.settings = { 'ATTRIBUTES' => ['Public'] }
+          end
           target.build_configurations.each do |config|
             config.build_settings['GENERATE_INFOPLIST_FILE'] = 'YES'
+            config.build_settings['MODULEMAP_FILE'] = "#{plugin_name}.modulemap"
+            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = "org.cocoapods.#{plugin_name}"
           end
           proj.save("#{plugin_name}.xcodeproj")
         end
@@ -60,8 +71,10 @@ module GoNative
         def move_template_files
           plugin_dependencies = spec.dependencies.map{|d| ["pod '#{d.name}'", "'#{d.requirement}'"].compact.join(', ') } * "\n\t"
           FileUtils.cp_r("#{BUILD_TEMPLATE_DIRECTORY_PATH}/.", '.')
+          headers = Dir.glob("../#{plugin_name}/Classes/**/*.h").map{ |f| "#import \"#{File.basename(f)}\"" } * "\n"
           Utils::TemplateInflator.new(plugin_name: plugin_name,
                                       plugin_dependencies: plugin_dependencies,
+                                      plugin_headers: headers,
                                       archs: archs,
                                       deployment_target: deployment_target
           ).call
@@ -83,6 +96,7 @@ module GoNative
         end
         
         def move_framework_file
+          FileUtils.rm_rf('../XCFramework')
           FileUtils.mv("XCFramework", '..', force: true)
         end
         

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'xcodeproj'
+
+module GoNative
+  module Plugins
+    module IOS
+      class EmbedExtensions
+        extend DSL::Serviceable
+        autoload :FileUtils, 'fileutils'
+        
+        attr_reader :extensions
+        
+        def call
+          prepare_extensions
+          embed_in_project
+          modify_podfile
+        end
+        
+        def prepare_extensions
+          extension_paths = `find ./Pods -iname Extensions -not -empty -type d`.split("\n")
+          extension_paths
+            .map { |path| Pathname(path).children.select(&:directory?) }
+            .flatten
+            .each { |path| FileUtils.cp_r(path, '.') }
+          @extensions = extension_paths
+                          .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')
+          extensions.each do |extension|
+            target = proj.new_target(:app_extension,
+                                     extension['name'],
+                                     :ios,
+                                     '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) })
+            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
+            end
+          end
+          
+          proj.save
+        end
+        
+        def modify_podfile
+          extensions.each do |extension|
+            open('Podfile', 'a') do |f|
+              f.puts "target '#{extension['name']}' do"
+              f.puts "\tuse_frameworks!"
+              extension['dependencies'].each do |dep|
+                f.puts "\tpod #{dep['name']}, #{dep['requirement']}"
+              end
+              f.puts "end"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'cocoapods'
+require 'xcodeproj'
+require 'json'
+
+module GoNative
+  module Plugins
+    module IOS
+      class ExtractExtensions
+        extend DSL::Serviceable
+        autoload :FileUtils, 'fileutils'
+        
+        attr_reader :proj_path
+        
+        def initialize(path)
+          @proj_path = path
+        end
+        
+        def call
+          original_path = FileUtils.pwd
+          FileUtils.cd(File.dirname(proj_path))
+          proj = Xcodeproj::Project.open(proj_path)
+          extension_targets = proj.targets.select { |target| target.product_type == Xcodeproj::Constants::PRODUCT_TYPE_UTI[:app_extension] }
+          
+          extension_targets.each do |target|
+            extension_name = target.name
+            extension_path = "Extensions/#{target.name}"
+            
+            target_definition = {}
+            target_definition[:name] = extension_name
+            
+            FileUtils.cd(extension_name)
+            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")
+            target_definition[:resources] = target
+                                              .resources_build_phase
+                                              .files
+                                              .map(&:file_ref)
+                                              .map(&:name)
+                                              .map { |name| `find . -name #{name}`.strip }
+            
+            target_definition[:system_frameworks] = target
+                                                      .frameworks_build_phase
+                                                      .files
+                                                      .map(&:file_ref)
+                                                      .map(&:path)
+                                                      .select{|p| p.start_with? 'System'}
+                                                      .map{ |p| File.basename(p)}
+
+            target_definition[:dependencies] = podfile.target_definitions[extension_name].dependencies.map do |dependency|
+              {
+                name: dependency.name,
+                requirement: dependency.requirement.requirements.map { |r| r.map(&:to_s).join(' ') }.join(', ')
+              }
+            end
+            
+            target_definition.slice(:entitlements, :headers, :source_files, :resources).values.compact.flatten.each do |file_path|
+              system('ditto', file_path, "#{original_path}/#{extension_path}/#{file_path}")
+            end
+ 
+            File.open("#{original_path}/#{extension_path}.json","w") do |f|
+              f.write(JSON.pretty_generate(target_definition))
+            end
+            
+            FileUtils.cd('..')
+          end
+        end
+        
+        def podfile
+          @podfile ||= Pod::Podfile.from_file(Pathname.new(File.dirname(proj_path) + '/Podfile'))
+        end
+      end
+    end
+  end
+end
+
+# //:configuration = Debug
+# CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements
+#
+# //:configuration = Release
+# CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements
+#
+# //:completeSettings = some
+# CODE_SIGN_ENTITLEMENTS

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/version.rb

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

data/templates/build/ios/PLUGIN_NAME-umbrella.h.tpl

@@ -0,0 +1,16 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif
+
+#{plugin_headers}
+
+FOUNDATION_EXPORT double #{plugin_name}VersionNumber;
+FOUNDATION_EXPORT const unsigned char #{plugin_name}VersionString[];

data/templates/build/ios/PLUGIN_NAME.modulemap.tpl

@@ -0,0 +1,6 @@
+framework module #{plugin_name} {
+  umbrella header "#{plugin_name}-umbrella.h"
+
+  export *
+  module * { export * }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gonative-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.8.1
 platform: ruby
 authors:
 - Hunaid Hassan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -190,6 +190,8 @@ files:
 - lib/gonative/commands/android/create.rb
 - lib/gonative/commands/base.rb
 - lib/gonative/commands/ios/create.rb
+- lib/gonative/commands/ios/embed_extensions.rb
+- lib/gonative/commands/ios/extract_extensions.rb
 - lib/gonative/commands/ios/publish.rb
 - lib/gonative/commands/version.rb
 - lib/gonative/dsl/error_catchable.rb
@@ -197,6 +199,8 @@ files:
 - lib/gonative/plugins/android/create.rb
 - lib/gonative/plugins/ios/build_framework.rb
 - lib/gonative/plugins/ios/create.rb
+- lib/gonative/plugins/ios/embed_extensions.rb
+- lib/gonative/plugins/ios/extract_extensions.rb
 - lib/gonative/plugins/ios/release.rb
 - lib/gonative/plugins/ios/verify.rb
 - lib/gonative/utils.rb
@@ -205,6 +209,8 @@ files:
 - lib/gonative/utils/template_inflator.rb
 - lib/gonative/utils/ui.rb
 - lib/gonative/version.rb
+- templates/build/ios/PLUGIN_NAME-umbrella.h.tpl
+- templates/build/ios/PLUGIN_NAME.modulemap.tpl
 - templates/build/ios/Podfile.tpl
 - templates/build/ios/create-framework.sh.tpl
 - templates/plugins/android/build.gradle