mmine 0.9.7 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d490fc5cefe008e8fe59cd2e69bbb048c088106ce034b3d22a59cbb3c909dcf4
-  data.tar.gz: 27c17fe2fc5fd5e885b2368d317a0de63feea805d8af3b2172599123de1aea8c
+  metadata.gz: 846ed86ca1bf73356fc8537b406e7dcd72cdbde4eee20f2c2a900b7662de81ec
+  data.tar.gz: 6cca4fd1ff6d955392d66155aa2ee6ec5c40d6f38c7e2445264c569dcb31bb95
 SHA512:
-  metadata.gz: 6c523b146a39987351240e79ec55f6eeff2cb428156c5aef7614296f7675411624e1ada2d1434ab11afe244f9b9e929d5d29afa520d19f5c4c3bf6c1b2228888
-  data.tar.gz: 41d04924b9700394cd5d67a32eabd7a5d444a74f489f7102f158ee003a9dc00da737dc279a7f9b6bc45f590e5e938d10c4470c98263fcefba237c345770512cf
+  metadata.gz: ff1750a7f8f986ea26c3945b31e836311e54daef8c9936bd60a459ca91f4e0910ce03425ee25bc031b033e90df7a74e6313b95e6fc03e0fdb3ec6947028ea31e
+  data.tar.gz: 93e728c640cf959abe354da9815534acc08a9131d3b0777d329687c319803075a2f82a4f50770f0499079762c2e017a096eaaaedb1557b32100f1878343c8ff1

data/bin/mmine

@@ -32,6 +32,9 @@ integrate_parse = OptionParser.new do |opts|
     opts.on("--swift-version", "--swift-version SWIFT_VER", "Provide Swift Language version for notification extension (by default 5)") do |ver|
         options[:"swift-version"] = ver
     end
+    opts.on("-s", "--override-signing", "Override parameters for MobileMessagingNotificationExtension signing using build flags") do |override|
+            options[:"override-signing"] = override
+    end
     opts.on("-h", "--help", "Prints this help") do
         puts opts
         exit
@@ -46,8 +49,8 @@ when "integrate"
         missing = mandatory.select{ |param| options[param].nil? }
         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")
+        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)
         integrator.logger = Logger.new(STDOUT)
         integrator.logger.formatter = proc do |severity, datetime, progname, msg|
             "#{severity}: #{msg}\n"
@@ -62,7 +65,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

@@ -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)
+  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, xcframework = false, swift_ver, override_signing)
     @project_file_path = project_file_path
     @app_group = app_group
     @main_target_name = main_target_name
@@ -23,6 +23,7 @@ class NotificationExtensionIntegrator
     @xcframework = xcframework
     @swift_version = swift_ver
     @application_code = application_code
+    @override_signing = override_signing
 
     @project_dir = Pathname.new(@project_file_path).parent.to_s
     @project = Xcodeproj::Project.open(@project_file_path)
@@ -51,7 +52,10 @@ class NotificationExtensionIntegrator
     create_notification_extension_target
     create_notification_extension_dir
     add_notification_extension_source_code
-    setup_development_team
+    setup_extension_target_signing(@override_signing)
+    if @override_signing == false
+      setup_development_team
+    end
     setup_deployment_target
     setup_notification_extension_info_plist
     setup_notification_extension_bundle_id
@@ -59,8 +63,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 +75,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
@@ -99,6 +103,31 @@ class NotificationExtensionIntegrator
     puts "🏁 Integration has been finished successfully!"
   end
 
+  def setup_extension_target_signing(override_signing)
+    @logger.info("Overriding extension target signing: #{override_signing}")
+
+    signing_settings = {
+        'DEVELOPMENT_TEAM' => '$MM_EXTENSION_DEVELOPMENT_TEAM',
+        'CODE_SIGN_IDENTITY' => '$MM_EXTENSION_CODE_SIGN_IDENTITY',
+    }
+
+    signing_settings.keys.each do |key|
+      value = signing_settings[key]
+      @logger.info("Checking extension signing for key: #{key} value: #{value}")
+      if override_signing
+        set_notification_extension_build_settings(key, value)
+      else
+        # Delete setting if it was previously overridden
+        @extension_target.build_configurations.each do |config|
+          if config.resolve_build_setting(key) == value
+            @logger.info("Deletes extension setting for key: #{key} value: #{value}")
+            config.build_settings[key] = ''
+          end
+        end
+      end
+    end
+  end
+
   def create_notification_extension_target
     @extension_target_name = 'MobileMessagingNotificationExtension'
     @extension_source_name_filepath = File.join(Mmine.root, 'resources', 'NotificationService.swift')
@@ -265,8 +294,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 +321,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 +346,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 +447,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 +464,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.11"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.11
 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.6
 signing_key:
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip