mmine 0.8.6 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5dd59a39d23c3d53c40ceeaf519eec10e74db28ddc4a57fd11750de577b3df1
-  data.tar.gz: 147ea27c12354f50c206ba27bd07bddd431b4b8ce57ca2b2d177d198124a260f
+  metadata.gz: 405a52d98e4702d1036467797ff10e3744660aa817059c7d5c51b0d186af94de
+  data.tar.gz: 0b4bd052c74edfe002c0dac01493df6ca442256f12380f007bba5d7527f918a7
 SHA512:
-  metadata.gz: 0a0237cca59b19fd977e288433271e62c896167b11158dae837f7a7c2c957815512e8803b1d6c36bf5883290f819ecbfeee3400ff3bc12501b1a4e53327e2566
-  data.tar.gz: 06c16f9ff748485fb16c0dbbf237a5038e2deb4e27ad909761b199070b2acb94928fd0b478dc31506203898e8cea3f8724ea2db0d94816689bd810b53706f668
+  metadata.gz: db7f77d620c59e9ea1aa2592b0133622a6583bdeb446c6daf5d5758c5485f7ed8dfd4c86fa201e71c372324a9b0dd0e06681af82626a666bf045e3ac7069e2bf
+  data.tar.gz: 571c5a83fad2c049a6d677fdeca72ce4853fc2e17c54868ce8c08e07dab62c45582203d40fec55f2bb62c8f1790ae7f923e37fdca7532468122383589fe1ad27

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
 
@@ -76,7 +77,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 +192,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 +206,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")
@@ -421,7 +467,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.8.6"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.5
 platform: ruby
 authors:
 - Andrey Kadochnikov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-10-16 00:00:00.000000000 Z
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ licenses:
 - MIT
 metadata:
   source_code_url: https://github.com/infobip/mobile-messaging-mmine
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,8 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip
   (https://www.infobip.com)!!!