mmine 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d490fc5cefe008e8fe59cd2e69bbb048c088106ce034b3d22a59cbb3c909dcf4
-  data.tar.gz: 27c17fe2fc5fd5e885b2368d317a0de63feea805d8af3b2172599123de1aea8c
+  metadata.gz: 6f35cd02c0cba4408c3fd8747bdb3e791e91120ebe4bcd1d26033cb70d6b59f2
+  data.tar.gz: 0ee9567a25d45a1c366faa4c25b17149860233fdb704fb97c7c31a3edf977cb5
 SHA512:
-  metadata.gz: 6c523b146a39987351240e79ec55f6eeff2cb428156c5aef7614296f7675411624e1ada2d1434ab11afe244f9b9e929d5d29afa520d19f5c4c3bf6c1b2228888
-  data.tar.gz: 41d04924b9700394cd5d67a32eabd7a5d444a74f489f7102f158ee003a9dc00da737dc279a7f9b6bc45f590e5e938d10c4470c98263fcefba237c345770512cf
+  metadata.gz: cc6648442c1c45b85f9279066c3b5aa7e01c065752af509775902dca81317b94ce0a44477a1afd08db78e42df8b0bceccff43dff8de1e108faaa78dedaffc4aa
+  data.tar.gz: fa5fdbac1811500e5bd859b70e77e5f215cea8073e4e36a7b40ae72dc31214eb5869b4810ad7662b41104ddbaed817f868ca773784985617064763a81b04901e

data/bin/mmine

@@ -46,7 +46,7 @@ when "integrate"
         missing = mandatory.select{ |param| options[param].nil? }
         unless missing.empty?
             raise OptionParser::MissingArgument.new(missing.join(', '))
-        end  
+        end
         integrator = NotificationExtensionIntegrator.new(options[:"application-code"], options[:project], options[:"app-group"], options[:target], options[:cordova] || false, options[:xcframework] || false, options[:"swift-version"] || "5")
         integrator.logger = Logger.new(STDOUT)
         integrator.logger.formatter = proc do |severity, datetime, progname, msg|
@@ -62,7 +62,7 @@ when "integrate"
         puts $!.to_s
         puts integrate_parse
         exit
-    end 
+    end
 else
     if first_arg == nil
         puts "Please specify a command. For example 'mmine integrate'"

data/lib/mmine/notification_extension_integrator.rb

@@ -59,8 +59,8 @@ class NotificationExtensionIntegrator
     setup_user_app_group_value
     setup_background_modes_plist_value
 
-    setup_target_capabilities(@extension_target.uuid)
-    setup_target_capabilities(@main_target.uuid)
+    setup_target_capabilities_for_extension_target
+    setup_target_capabilities_for_main_target
 
     setup_embed_extension_action
     setup_main_target_dependency
@@ -71,12 +71,12 @@ class NotificationExtensionIntegrator
     erease_bridging_header
 
     if @cordova
-      setup_entitlements(resolve_absolute_paths(["$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Debug.plist"]),
-                         resolve_absolute_paths(["$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Release.plist"]),
+      setup_entitlements(nil,
                          nil,
-                         @main_build_settings_debug,
-                         @main_build_settings_release)
-      setup_extension_lib_cordova_link
+                         @extension_target_name,
+                         @extension_build_settings_debug,
+                         @extension_build_settings_release)
+      #setup_extension_lib_cordova_link
       setup_framework_search_paths
       unless @xcframework
         setup_copy_framework_script
@@ -265,8 +265,8 @@ class NotificationExtensionIntegrator
   end
 
   def setup_entitlements(entitlements_debug_file_paths, entitlements_release_file_paths, target_name, _build_settings_debug, _build_settings_release)
-    entitlements_debug_file_paths = entitlements_debug_file_paths.compact
-    entitlements_release_file_paths = entitlements_release_file_paths.compact
+    entitlements_debug_file_paths = entitlements_debug_file_paths ? entitlements_debug_file_paths.compact : nil
+    entitlements_release_file_paths = entitlements_release_file_paths ? entitlements_release_file_paths.compact :  nil
     @logger.debug("setup_entitlements #{entitlements_debug_file_paths} #{entitlements_release_file_paths} #{target_name} #{_build_settings_debug} #{_build_settings_release}")
     code_sign_entitlements_key = 'CODE_SIGN_ENTITLEMENTS'
     aps_env_key = 'aps-environment'
@@ -292,7 +292,11 @@ class NotificationExtensionIntegrator
       @logger.info("\tEntitlements settings are equal for debug and release schemes.")
 
       put_key_array_element("com.apple.security.application-groups", @app_group, entitlements_debug_file_paths)
-      put_string_value_into_xml(aps_env_key, development, entitlements_debug_file_paths)
+
+      #aps env should be set only for main target
+      if (target_name != @extension_target_name)
+        put_string_value_into_xml(aps_env_key, development, entitlements_debug_file_paths)
+      end
     else
       if (entitlements_debug_file_paths == nil or entitlements_debug_file_paths.empty?) and target_name != nil
         @logger.error("\tEntitlements debug settings are not set, creating entitlements file")
@@ -313,8 +317,12 @@ class NotificationExtensionIntegrator
       end
 
       put_key_array_element("com.apple.security.application-groups", @app_group, entitlements_debug_file_paths + entitlements_release_file_paths)
-      put_string_value_into_xml(aps_env_key, development, entitlements_debug_file_paths)
-      put_string_value_into_xml(aps_env_key, production, entitlements_release_file_paths)
+
+      #aps env should be set only for main target
+      if (target_name != @extension_target_name)
+        put_string_value_into_xml(aps_env_key, development, entitlements_debug_file_paths)
+        put_string_value_into_xml(aps_env_key, production, entitlements_release_file_paths)
+      end
     end
   end
 
@@ -410,11 +418,16 @@ class NotificationExtensionIntegrator
     remove_embed_framework_phase
   end
 
-  def setup_target_capabilities(target_uuid)
-    unless @project.root_object.attributes["TargetAttributes"]
-      @project.root_object.attributes["TargetAttributes"] = Hash.new
-    end
-    existing_capabilities = @project.root_object.attributes["TargetAttributes"][target_uuid]
+  def setup_target_capabilities_for_extension_target
+    mobile_messaging_capabilities = {"SystemCapabilities" =>
+                                           {
+                                               "com.apple.ApplicationGroups.iOS" => {"enabled" => 1},
+                                           }
+    }
+    setup_target_capabilities(@extension_target.uuid, mobile_messaging_capabilities)
+  end
+
+  def setup_target_capabilities_for_main_target
     mobile_messaging_capabilities = {"SystemCapabilities" =>
                                          {
                                              "com.apple.ApplicationGroups.iOS" => {"enabled" => 1},
@@ -422,12 +435,20 @@ class NotificationExtensionIntegrator
                                              "com.apple.BackgroundModes" => {"enabled" => 1}
                                          }
     }
+    setup_target_capabilities(@main_target.uuid, mobile_messaging_capabilities)
+  end
+
+  def setup_target_capabilities(target_uuid, capabilities)
+    unless @project.root_object.attributes["TargetAttributes"]
+      @project.root_object.attributes["TargetAttributes"] = Hash.new
+    end
+    existing_capabilities = @project.root_object.attributes["TargetAttributes"][target_uuid]
     if existing_capabilities == nil
-      @logger.info("\tSetting TargetAttributes #{mobile_messaging_capabilities} for target #{target_uuid}")
-      @project.root_object.attributes["TargetAttributes"][target_uuid] = mobile_messaging_capabilities
+      @logger.info("\tSetting TargetAttributes #{capabilities} for target #{target_uuid}")
+      @project.root_object.attributes["TargetAttributes"][target_uuid] = capabilities
     else
-      @logger.info("\tMerging TargetAttributes #{mobile_messaging_capabilities} for target #{target_uuid}")
-      @project.root_object.attributes["TargetAttributes"][target_uuid] = existing_capabilities.merge(mobile_messaging_capabilities)
+      @logger.info("\tMerging TargetAttributes #{capabilities} for target #{target_uuid}")
+      @project.root_object.attributes["TargetAttributes"][target_uuid] = existing_capabilities.merge(capabilities)
     end
   end
 

data/lib/mmine/version.rb

@@ -1,3 +1,3 @@
 module Mmine
-  VERSION = "0.9.7"
-end
+  VERSION = "0.9.8"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Andrey Kadochnikov
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip