mmine 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f2045b61641a12e8589ce89426cd8073c7d4cf53f1a5168cb39819156bbcaa4
-  data.tar.gz: 540a3ddc21c8b271c39cd4cb16313f7a3ef39151011a5d5462026bb425f07226
+  metadata.gz: e954c8320114b22e8062b363ded4f3274ebe323b27a39f24432facebf5a958d0
+  data.tar.gz: e5b4394d26966e6a4d7e739f689f9f1fa4ea2862b0d1f53643958d26a6ec78ac
 SHA512:
-  metadata.gz: aea5dcc25c0e993d5d8da8ff13d3b9654fc657dbcc149bb1b009294a7bcef4920e7b81b1c65fe4d1fabc040cf17b16602770c55811aefad8d05d4d1eeec3bdbc
-  data.tar.gz: 65517bb0840ce538f47ea6df617f6f66b74100257b810ca0355485d513b9e21013cf244a15bdc8d188cfe8f62a1220d599aca74b0966d4322cd487677cc35360
+  metadata.gz: 52eee2c13848eb4023dac1179808622631a9d473af152a7938fabfc620473b0357b20045043cfcec57497bec9be095ca0cba5a907a22e38a14381a901db98d26
+  data.tar.gz: d689da4b712e5c27044eaa51de005986ea03415344b72f0e723b2d6de5d18868c82f42de3ed4fde9a0c8c13340eca992bffa17ce477aace0f05b2c1a1b9529f8

data/bin/mmine

@@ -23,7 +23,7 @@ integrate_parse = OptionParser.new do |opts|
     opts.on("-v", "--verbose", "Make verbose logs visible") do |verbose|
         options[:verbose] = verbose
     end
-    opts.on("--cordova", "--cordova", "Provide Cordova project specific settings.") do |verbose|
+    opts.on("-c", "--cordova", "Provide Cordova project specific settings.") do |verbose|
         options[:cordova] = verbose
     end
     opts.on("--swift-version", "--swift-version SWIFT_VER", "Provide Swift Language version for notification extension (by default 4.2)") do |ver|

data/lib/mmine/notification_extension_integrator.rb

@@ -24,6 +24,7 @@ class NotificationExtensionIntegrator
 		@project_dir = Pathname.new(@project_file_path).parent.to_s
 		@project = Xcodeproj::Project.open(@project_file_path)
 		@ne_target_name = 'MobileMessagingNotificationExtension'
+		@framework_file_name = "MobileMessaging.framework"
 		@extension_source_name_filepath = File.join(Mmine.root, 'resources','NotificationService.swift')
 		@extension_dir_name = 'NotificationExtension'
 		@extension_destination_dir = File.join(@project_dir, @extension_dir_name)
@@ -67,9 +68,7 @@ class NotificationExtensionIntegrator
 		setupMainTargetDependency()
 		setupSwiftVersion()
 		setupProductName()
-		setupBuilNumber()
-
-		# todo : remove MobileMessaging.framework from mains target Embed Frameworks
+		setupBuildNumber()
 		
 		if @cordova
 			setupFrameworkSearchPaths()
@@ -222,7 +221,7 @@ class NotificationExtensionIntegrator
 		setNotificationExtensionBuildSettings('PRODUCT_NAME', @ne_target_name)
 	end
 
-	def setupBuilNumber
+	def setupBuildNumber
 		version_key = "CFBundleShortVersionString"
 		build_key = "CFBundleVersion"
 		main_version = getXMLStringValue(version_key, @main_target_release_plist)
@@ -249,8 +248,8 @@ class NotificationExtensionIntegrator
 	def setupCopyFrameworkScript
 		phase_name = "Copy Frameworks"
 		shell_script = "/usr/local/bin/carthage copy-frameworks"
-		input_path = "$SRCROOT/$PROJECT/Plugins/com-infobip-plugins-mobilemessaging/MobileMessaging.framework"
-		output_path = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/MobileMessaging.framework"
+		input_path = "$SRCROOT/$PROJECT/Plugins/com-infobip-plugins-mobilemessaging/#{@framework_file_name}"
+		output_path = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/#{@framework_file_name}"
 		existing_phase = @main_target.shell_script_build_phases.select { |phase| phase.shell_script.include? shell_script }.first
 
 		unless existing_phase
@@ -266,6 +265,7 @@ class NotificationExtensionIntegrator
 
 			@logger.info("Main target already has #{phase_name} shell script set up")
 		end
+		removeEmbedFrameworkPhase()
 	end
 
 	def setupEntitlements(_build_settings_debug, _build_settings_release, target_name)
@@ -324,8 +324,10 @@ class NotificationExtensionIntegrator
 			}
 		}
 		if exitsting_capabilities == nil
+			@logger.info("\tSetting TargetAttributes #{mobilemessaging_capabilities} for extension")
 			@project.root_object.attributes["TargetAttributes"][@ne_target.uuid] = mobilemessaging_capabilities
 		else
+			@logger.info("\tMerging TargetAttributes #{mobilemessaging_capabilities} for extension")
 			@project.root_object.attributes["TargetAttributes"][@ne_target.uuid] = exitsting_capabilities.merge(mobilemessaging_capabilities)
 		end
 	end
@@ -343,12 +345,29 @@ class NotificationExtensionIntegrator
 			}
 		}
 		if exitsting_capabilities == nil
+			@logger.info("\tSetting TargetAttributes #{mobilemessaging_capabilities} for main target")
 			@project.root_object.attributes["TargetAttributes"][@main_target.uuid] = mobilemessaging_capabilities
 		else
+			@logger.info("\tMerging TargetAttributes #{mobilemessaging_capabilities} for main target")
 			@project.root_object.attributes["TargetAttributes"][@main_target.uuid] = exitsting_capabilities.merge(mobilemessaging_capabilities)
 		end
 	end
 
+
+	def removeEmbedFrameworkPhase
+		emb_fs = @main_target.copy_files_build_phases
+		.select { |phase|
+			phase.dst_subfolder_spec == '10' 
+		}.each { |phase|
+ 			phase.files.select { |file|
+ 				file.display_name == @framework_file_name
+ 			}.each { |file|
+ 				@logger.info("\tRemoving embeddin #{@framework_file_name} from phase #{phase.display_name}")
+				phase.remove_build_file(file)
+ 			}
+		}
+	end
+
 	def resolveXcodePath(path)
 		return path.sub(@project_dir, '$(PROJECT_DIR)')
 	end

data/lib/mmine/version.rb

@@ -1,3 +1,3 @@
 module Mmine
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Andrey Kadochnikov