mmine 0.9.3 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4089e62e6369fd58325f1c6d70465a32ab73d007af235fea06df4cf70be0d8
-  data.tar.gz: f34db6ee3d0f5638afbf6e5b87d8a942402d3ddbe9d6fa82f28052fee681c424
+  metadata.gz: d490fc5cefe008e8fe59cd2e69bbb048c088106ce034b3d22a59cbb3c909dcf4
+  data.tar.gz: 27c17fe2fc5fd5e885b2368d317a0de63feea805d8af3b2172599123de1aea8c
 SHA512:
-  metadata.gz: 8a3c483ecc9fd79b5f14ac64b5d9db5c0b4f95393b1ef4f8017c2d422c89472c7fb94533d033284f8b6fa09c8093e3d2fb692206d9e9f6888352678e0b513642
-  data.tar.gz: 5cee1fd68dc92ec19177395938d91dfcce02e22f04bfe0dfe544689a51532ec98b870d4881b0f001ca39cafae645d476f2873d0182fdf0e094002d7c5acd36d4
+  metadata.gz: 6c523b146a39987351240e79ec55f6eeff2cb428156c5aef7614296f7675411624e1ada2d1434ab11afe244f9b9e929d5d29afa520d19f5c4c3bf6c1b2228888
+  data.tar.gz: 41d04924b9700394cd5d67a32eabd7a5d444a74f489f7102f158ee003a9dc00da737dc279a7f9b6bc45f590e5e938d10c4470c98263fcefba237c345770512cf

data/bin/mmine

@@ -23,10 +23,13 @@ integrate_parse = OptionParser.new do |opts|
     opts.on("-v", "--verbose", "Make verbose logs visible") do |verbose|
         options[:verbose] = verbose
     end
-    opts.on("-c", "--cordova", "Provide Cordova project specific settings.") do |verbose|
-        options[:cordova] = verbose
+    opts.on("-c", "--cordova", "Provide Cordova project specific settings.") do |cordova|
+        options[:cordova] = cordova
     end
-    opts.on("--swift-version", "--swift-version SWIFT_VER", "Provide Swift Language version for notification extension (by default 4.2)") do |ver|
+    opts.on("-x", "--xcframework", "Should Cordova project use xcframework or framework.") do |xcframework|
+        options[:xcframework] = xcframework
+    end
+    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("-h", "--help", "Prints this help") do
@@ -44,7 +47,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[:"swift-version"] || "4.2")
+        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|
             "#{severity}: #{msg}\n"

data/lib/mmine/notification_extension_integrator.rb

@@ -14,12 +14,13 @@ module Mmine
 end
 
 class NotificationExtensionIntegrator
-  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, swift_ver)
+  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, xcframework = false, swift_ver)
     @project_file_path = project_file_path
     @app_group = app_group
     @main_target_name = main_target_name
     @logger = nil
     @cordova = cordova
+    @xcframework = xcframework
     @swift_version = swift_ver
     @application_code = application_code
 
@@ -67,6 +68,7 @@ class NotificationExtensionIntegrator
     setup_product_name
     setup_extension_build_number
     setup_run_path_search_paths
+    erease_bridging_header
 
     if @cordova
       setup_entitlements(resolve_absolute_paths(["$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Debug.plist"]),
@@ -76,7 +78,9 @@ class NotificationExtensionIntegrator
                          @main_build_settings_release)
       setup_extension_lib_cordova_link
       setup_framework_search_paths
-      setup_copy_framework_script
+      unless @xcframework
+        setup_copy_framework_script
+      end
     else
       setup_entitlements(@main_build_configurations_debug.map { |config| config.resolve_build_setting('CODE_SIGN_ENTITLEMENTS') },
                          @main_build_configurations_release.map { |config| config.resolve_build_setting('CODE_SIGN_ENTITLEMENTS') },
@@ -189,7 +193,7 @@ class NotificationExtensionIntegrator
     suffix = 'notification-extension'
     key = 'PRODUCT_BUNDLE_IDENTIFIER'
     (@main_build_configurations_release + @main_build_configurations_debug).each do |config|
-      bundleId = config.resolve_build_setting(key)
+      bundleId = resolve_recursive_build_setting(config, key)
       if bundleId == nil
         plist_path = resolve_absolute_paths([config.resolve_build_setting("INFOPLIST_FILE")]).first
         bundleId = get_xml_string_value(key, plist_path)
@@ -203,6 +207,49 @@ class NotificationExtensionIntegrator
     end
   end
 
+  # https://github.com/CocoaPods/Xcodeproj/issues/505#issuecomment-584699008
+  # Augments config.resolve_build_setting from xcproject
+  # to continue expanding build settings and evaluate modifiers
+  def resolve_recursive_build_setting(config, setting)
+    resolution = config.resolve_build_setting(setting)
+
+    # finds values with one of
+    # $VALUE
+    # $(VALLUE)
+    # $(VALUE:modifier)
+    # ${VALUE}
+    # ${VALUE:modifier}
+    resolution.gsub(/\$[\(\{]?.+[\)\}]?/) do |raw_value|
+      # strip $() characters
+      unresolved = raw_value.gsub(/[\$\(\)\{\}]/, '')
+
+      # Get the modifiers after the ':' characters
+      name, *modifiers = unresolved.split(':')
+
+      # Expand variable name
+      subresolution = resolve_recursive_build_setting(config, name)
+
+      # Apply modifiers
+      # NOTE: not all cases accounted for
+      #
+      # See http://codeworkshop.net/posts/xcode-build-setting-transformations
+      # for various modifier options
+      modifiers.each do |modifier|
+        case modifier
+        when 'lower'
+          subresolution.downcase!
+        when 'upper'
+          subresolution.upcase!
+        else
+          # Fastlane message
+          @logger.info("Unknown modifier: `#{modifier}` in `#{raw_value}")
+        end
+      end
+
+      subresolution
+    end
+  end
+
   def create_entitlements_file(_entitlements_name)
     entitlements_destination_filepath = File.join(@project_dir, _entitlements_name)
     entitlements_source_filepath = File.join(Mmine.root, 'resources', "MobileMessagingNotificationExtension.entitlements")
@@ -298,8 +345,12 @@ class NotificationExtensionIntegrator
     end
   end
 
+  def erease_bridging_header
+    set_notification_extension_build_settings('SWIFT_OBJC_BRIDGING_HEADER', '')
+  end
+
   def setup_framework_search_paths
-    set_notification_extension_build_settings('FRAMEWORK_SEARCH_PATHS', '$SRCROOT/$PROJECT/Plugins/com-infobip-plugins-mobilemessaging')
+    set_notification_extension_build_settings('FRAMEWORK_SEARCH_PATHS', '$SRCROOT/$PROJECT/Plugins/com-infobip-plugins-mobilemessaging/**')
   end
 
   def setup_run_path_search_paths
@@ -421,7 +472,7 @@ class NotificationExtensionIntegrator
     return group_reference
   end
 
-  def resolve_absolute_paths(paths) 
+  def resolve_absolute_paths(paths)
     paths.map do |path|
       ret = path
       ["$(PROJECT_DIR)", "$PROJECT_DIR"].each do |proj_dir|

data/lib/mmine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.7
 platform: ruby
 authors:
 - Andrey Kadochnikov
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.20.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.0.9
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip