mmine 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f132bbc3d5d76e16424df401d6082e6a6804e25df28f11e78340ddd21cf178f5
-  data.tar.gz: e4651cd79878f66d210628b6a5d52d528a346a80aba742126943ab6ecea4c564
+  metadata.gz: e1987eaebb795a789663acee6d8f0baa1809dc20372035081fa732774cc5a988
+  data.tar.gz: af08d7e4c231a75d7bbec89e0e7275f509753169d7ac0db0cdcfe240ad886124
 SHA512:
-  metadata.gz: fd9414de4a3510f9f6761fd1d6a138e7e7a69f52893ec7883421724edcd3f9052adfc5e5aac582c834c7e5349b4424f84909769070526c086b4c3064dc21f4eb
-  data.tar.gz: 8713bc9396e9564a239f21e9f2d7936a8f1f08b7b739bec6651fc44cc432e4a52a62a83d0725aa6eb513073aa841f0f052daf3bd6324f8811cd8d0e1eff1875f
+  metadata.gz: 4384c96a3394dd2ba46447437b81378fe34c5221bc078db8b7d08b81644b01fdbf37e93c15a26d1e43e562135592ed8bea8e53a47fc4924d73bdaef1e97e2083
+  data.tar.gz: 65c086406a02cdd1080912c7ab58bda7d164d574f52133a1b7d3ec5ddbfabf2141d5344f7ab4b00e056f6e0baa35639304ddbee9561d42e58a93e50a8c537979

data/bin/mmine

@@ -39,7 +39,10 @@ integrate_parse = OptionParser.new do |opts|
         options[:"static-linkage"] = static_linkage
     end
     opts.on("-r", "--react-native", "Provide React-Native specific settings") do |react_native|
-            options[:"react-native"] = react_native
+        options[:"react-native"] = react_native
+    end
+    opts.on("--spm", "--spm", "If MobileMessaging is integrated using Swift Package Manager") do |spm|
+            options[:"spm"] = spm
     end
     opts.on("-h", "--help", "Prints this help") do
         puts opts
@@ -56,7 +59,7 @@ when "integrate"
         unless missing.empty?
             raise OptionParser::MissingArgument.new(missing.join(', '))
         end
-        integrator = NotificationExtensionIntegrator.new(options[:"application-code"], options[:project], options[:"app-group"], options[:target], options[:cordova] || false, options[:xcframework] || false, options[:"swift-version"] || "5", options[:"override-signing"] || false, options[:"static-linkage"] || false, options[:"react-native"] || false)
+        integrator = NotificationExtensionIntegrator.new(options[:"application-code"], options[:project], options[:"app-group"], options[:target], options[:cordova] || false, options[:xcframework] || false, options[:"swift-version"] || "5", options[:"override-signing"] || false, options[:"static-linkage"] || false, options[:"react-native"] || false, options[:"spm"] || false)
         integrator.logger = Logger.new(STDOUT)
         integrator.logger.formatter = proc do |severity, datetime, progname, msg|
             "#{severity}: #{msg}\n"

data/lib/mmine/notification_extension_integrator.rb

@@ -14,7 +14,7 @@ module Mmine
 end
 
 class NotificationExtensionIntegrator
-  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, xcframework = false, swift_ver, override_signing, static_linkage, react_native)
+  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, xcframework = false, swift_ver, override_signing, static_linkage, react_native, spm)
     @project_file_path = project_file_path
     @app_group = app_group
     @main_target_name = main_target_name
@@ -26,6 +26,7 @@ class NotificationExtensionIntegrator
     @override_signing = override_signing
     @static_linkage = static_linkage
     @react_native = react_native
+    @spm = spm
 
     @project_dir = Pathname.new(@project_file_path).parent.to_s
     @project = Xcodeproj::Project.open(@project_file_path)
@@ -50,6 +51,7 @@ class NotificationExtensionIntegrator
 
   def setup_notification_extension
     puts "🏎  Integration starting... ver. #{Mmine::VERSION}"
+    @logger.debug("Integration with parameters: \n application_code: #{@application_code} \n project_file_path: #{@project_file_path} \n app_group: #{@app_group} \n main_target_name: #{@main_target_name} \n cordova: #{@cordova} \n xcframework: #{@xcframework} \n swift_ver: #{@swift_ver} \n override_signing: #{@override_signing} \n static_linkage: #{@static_linkage} \n react_native: #{@react_native} \n spm: #{@spm}")
     @logger.debug("\n@main_target_build_configurations_debug #{@main_build_configurations_debug}\n@main_target_build_configurations_release #{@main_build_configurations_release}")
     @logger.debug("\n@main_target_build_configurations_debug #{JSON.pretty_generate(@main_build_settings_debug)}\n@main_target_build_configurations_release #{JSON.pretty_generate(@main_build_settings_release)}")
     create_notification_extension_target
@@ -84,9 +86,8 @@ class NotificationExtensionIntegrator
                          @extension_build_settings_debug,
                          @extension_build_settings_release)
       #setup_extension_lib_cordova_link
-      setup_framework_search_paths
-      unless @xcframework
-        setup_copy_framework_script
+      if @xcframework
+        setup_framework_search_paths
       end
     else
       setup_entitlements(@main_build_configurations_debug.map { |config| config.build_settings['CODE_SIGN_ENTITLEMENTS'] },
@@ -110,6 +111,10 @@ class NotificationExtensionIntegrator
         setup_library_search_paths
     end
 
+    if @spm
+        setup_extension_spm_dependency('MobileMessaging')
+    end
+
     @project.save
     puts "🏁 Integration has been finished successfully!"
   end
@@ -119,6 +124,13 @@ class NotificationExtensionIntegrator
       set_notification_extension_build_settings('LIBRARY_SEARCH_PATHS', '"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/CocoaLumberjack" "${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MobileMessaging"')
   end
 
+  def setup_extension_spm_dependency(name)
+     product_dependency = @main_target.package_product_dependencies.find { |ref| ref.product_name == name }
+     unless product_dependency.nil? || @extension_target.package_product_dependencies.any? {|ref| ref.product_name == name}
+             @extension_target.package_product_dependencies.append(product_dependency)
+     end
+  end
+
   def setup_extension_lib_link(lib_name)
       if @extension_target.frameworks_build_phase.files_references.select { |ref| ref.path == lib_name }.first
         @logger.info("Notification Extension target already has "+ lib_name + " linked.")

data/lib/mmine/version.rb

@@ -1,3 +1,3 @@
 module Mmine
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Andrey Kadochnikov
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip