mmine 0.9.2 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b021eac4e4b0627bd53be1c929bacb0ec383ec368c5c07c73385b4768d6bb5
-  data.tar.gz: 70a452830c60e7b5eb07941af189dbdff78664ea17126cfd4c7daa84ea92f7fc
+  metadata.gz: 58f6d1e85921571f00ab881a2c0b2ba38be942f08bc66e335b76c4c711c65f27
+  data.tar.gz: 6ef078a0f9858d9e8b6ff0414c83ad1e38f5d290600535479800b69974f75e74
 SHA512:
-  metadata.gz: 22b070c8ca0ced0eb84bf6882f5af71c123ceee0214f9991249c0be06dea748592f43fa936744052953d485c84cd5eab9e3c2d984b70b75eee061b5ec2559230
-  data.tar.gz: c4c4d370523aafff7b451d663c33d4b65e0226b67c3770422cb3b406619562e7e31c7bdd755ca1be16b527b680abf69b7fff254ed833003e52e49b1dea680afa
+  metadata.gz: 74dce8885cb1281a0e20a512ad2dc23d0bd774e4ba1b07114a3137fa209ead1109002eae27a807d0bf6cde0661abfba825288f92b03c65a5e4904760982970a2
+  data.tar.gz: 869cfcd11e5e8596d10cf290c708d4fa8ba183e34874eb146d3357fc2620a2a2f9eaac4673e08886b0a1c8a71d4afe025ad1310f6e18e4e8d34314fcf79cefc1

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,9 +78,9 @@ class NotificationExtensionIntegrator
                          @main_build_settings_release)
       setup_extension_lib_cordova_link
       setup_framework_search_paths
-      # not needed for xcframeworks per Carthage docs
-      # setup_copy_framework_script
-      remove_embed_framework_phase
+      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') },
@@ -191,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)
@@ -205,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")
@@ -300,6 +345,10 @@ 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')
   end
@@ -357,6 +406,8 @@ class NotificationExtensionIntegrator
       new_phase.input_paths << input_path
       new_phase.output_paths << output_path
     end
+
+    remove_embed_framework_phase
   end
 
   def setup_target_capabilities(target_uuid)
@@ -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.2"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.6
 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