mmine 0.9.11 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846ed86ca1bf73356fc8537b406e7dcd72cdbde4eee20f2c2a900b7662de81ec
-  data.tar.gz: 6cca4fd1ff6d955392d66155aa2ee6ec5c40d6f38c7e2445264c569dcb31bb95
+  metadata.gz: 9d120f4519d83f2b9d20285ebb9576ee4d2e57bcf4d0e13522d017b48cda3264
+  data.tar.gz: b98a2fa77b4fbdb6aaf8db620b0395abf4fb322fa4821b46fb8f27d93f4403e9
 SHA512:
-  metadata.gz: ff1750a7f8f986ea26c3945b31e836311e54daef8c9936bd60a459ca91f4e0910ce03425ee25bc031b033e90df7a74e6313b95e6fc03e0fdb3ec6947028ea31e
-  data.tar.gz: 93e728c640cf959abe354da9815534acc08a9131d3b0777d329687c319803075a2f82a4f50770f0499079762c2e017a096eaaaedb1557b32100f1878343c8ff1
+  metadata.gz: c2d1965b045b7986ed53f91a34a5b5cee6bcf03d22646ad137c5197223d150b2a34ae0a75ae99645b554546322eae384205653e41d223d275e5e7310a0faf9e7
+  data.tar.gz: 5baaeef187da9f3153b80c00c7c444767f342467cba204aceb5af139c454f24edd688375a9a386a5ebe5b8bd3915388474e7697a21f061c1ba3159d0bef0d14d

data/bin/mmine

@@ -33,7 +33,10 @@ integrate_parse = OptionParser.new do |opts|
         options[:"swift-version"] = ver
     end
     opts.on("-s", "--override-signing", "Override parameters for MobileMessagingNotificationExtension signing using build flags") do |override|
-            options[:"override-signing"] = override
+        options[:"override-signing"] = override
+    end
+    opts.on("-sl", "--static-linkage", "If cocoapods static linkage used for MobileMessaging pods") do |static_linkage|
+        options[:"static-linkage"] = static_linkage
     end
     opts.on("-h", "--help", "Prints this help") do
         puts opts
@@ -50,7 +53,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[:xcframework] || false, options[:"swift-version"] || "5", options[:"override-signing"] || false)
+        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, options[:"static-linkage"] || false)
         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,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, override_signing)
+  def initialize(application_code, project_file_path, app_group, main_target_name, cordova = false, xcframework = false, swift_ver, override_signing, static_linkage)
     @project_file_path = project_file_path
     @app_group = app_group
     @main_target_name = main_target_name
@@ -24,6 +24,7 @@ class NotificationExtensionIntegrator
     @swift_version = swift_ver
     @application_code = application_code
     @override_signing = override_signing
+    @static_linkage = static_linkage
 
     @project_dir = Pathname.new(@project_file_path).parent.to_s
     @project = Xcodeproj::Project.open(@project_file_path)
@@ -35,6 +36,7 @@ class NotificationExtensionIntegrator
     @main_build_configurations_release = @main_target.build_configurations.select { |config| config.type == :release }
     @main_build_settings_debug = @main_build_configurations_debug.map(&:build_settings)
     @main_build_settings_release = @main_build_configurations_release.map(&:build_settings)
+
   end
 
   def logger=(_logger)
@@ -86,23 +88,48 @@ class NotificationExtensionIntegrator
         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') },
+      setup_entitlements(@main_build_configurations_debug.map { |config| config.build_settings['CODE_SIGN_ENTITLEMENTS'] },
+                         @main_build_configurations_release.map { |config| config.build_settings['CODE_SIGN_ENTITLEMENTS'] },
                          @main_target_name,
                          @main_build_settings_debug,
                          @main_build_settings_release)
 
-      setup_entitlements(@extension_build_configurations_debug.map { |config| config.resolve_build_setting('CODE_SIGN_ENTITLEMENTS') },
-                         @extension_build_configurations_release.map { |config| config.resolve_build_setting('CODE_SIGN_ENTITLEMENTS') },
+      setup_entitlements(@extension_build_configurations_debug.map { |config| config.build_settings['CODE_SIGN_ENTITLEMENTS'] },
+                         @extension_build_configurations_release.map { |config| config.build_settings['CODE_SIGN_ENTITLEMENTS'] },
                          @extension_target_name,
                          @extension_build_settings_debug,
                          @extension_build_settings_release)
     end
 
+    if @static_linkage
+        setup_extension_lib_link('libMobileMessaging.a')
+        setup_extension_lib_link('libCocoaLumberjack.a')
+        setup_library_search_paths
+    end
+
     @project.save
     puts "🏁 Integration has been finished successfully!"
   end
 
+  def setup_library_search_paths
+      @logger.debug("Setup library search path")
+      set_notification_extension_build_settings('LIBRARY_SEARCH_PATHS', '"${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/CocoaLumberjack" "${BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MobileMessaging"')
+  end
+
+  def setup_extension_lib_link(lib_name)
+      if @extension_target.frameworks_build_phase.files_references.select { |ref| ref.path == lib_name }.first
+        @logger.info("Notification Extension target already has "+ lib_name + " linked.")
+      else
+        @logger.info("Adding "+ lib_name + " to Notification Extension target...")
+        ref = @project['Frameworks'].new_file(lib_name);
+        if ref
+          @extension_target.frameworks_build_phase.add_file_reference(ref)
+        else
+          @logger.error("Unable to add "+ lib_name + " to Notification Extension target!")
+        end
+     end
+  end
+
   def setup_extension_target_signing(override_signing)
     @logger.info("Overriding extension target signing: #{override_signing}")
 
@@ -204,7 +231,7 @@ class NotificationExtensionIntegrator
   end
 
   def setup_deployment_target
-    set_notification_extension_build_settings('IPHONEOS_DEPLOYMENT_TARGET', "10.0")
+    set_notification_extension_build_settings('IPHONEOS_DEPLOYMENT_TARGET', "12.0")
   end
 
   def setup_notification_extension_info_plist
@@ -212,6 +239,7 @@ class NotificationExtensionIntegrator
       @logger.info("Notification extension info plist already exists on path: #{@extension_info_plist_path}")
     else
       @logger.info("Copying extension plist file to path: #{@extension_info_plist_path}")
+
       FileUtils.cp(@extension_plist_source_filepath, @extension_info_plist_path)
       get_notification_extension_group_reference.new_reference(@extension_info_plist_path) #check if additional plist manipulations needed (target membership?)
     end

data/lib/mmine/version.rb

@@ -1,3 +1,3 @@
 module Mmine
-  VERSION = "0.9.11"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors:
 - Andrey Kadochnikov
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.13.4
 description: Use this tool to automatically integrate your Xcode project with Infobips
   (https://www.infobip.com) Notification Service Extension
 email: andrey.kadochnikov@infobip.com