Pull request #15: Manual integration using carthage framework

Merge in MML/infobip-mobile-messaging-react-native-plugin from okoroleva_MM-3869_ManualIntegration to master Squashed commit of the following: commit 4199eecbcfe71142a91ddfb0a51287c53e897f4c Author: Olga Koroleva <[email protected]> Date: Tue Jun 30 09:31:56 2020 +0300 minor update commit 3018d6f93c1f9bc67c53acf376edcf844bc6a5c8 Author: Olga Koroleva <[email protected]> Date: Tue Jun 30 00:14:51 2020 +0300 manual integration
infobip · Jun 30, 2020 · 6bbdc3d · 6bbdc3d
1 parent b729132
commit 6bbdc3d
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 4 deletions.
diff --git a/ios/Cartfile b/ios/Cartfile
@@ -0,0 +1 @@
+github "infobip/mobile-messaging-sdk-ios" "8.0.6"
diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved
@@ -0,0 +1 @@
+github "infobip/mobile-messaging-sdk-ios" "8.0.6"
diff --git a/ios/RNMMChat.swift → ios/MobileMessagingPlugin/RNMMChat.swift b/ios/RNMMChat.swift → ios/MobileMessagingPlugin/RNMMChat.swift
diff --git a/ios/RNMMChatBridge.m → ios/MobileMessagingPlugin/RNMMChatBridge.m b/ios/RNMMChatBridge.m → ios/MobileMessagingPlugin/RNMMChatBridge.m
diff --git a/ios/RNMMChatViewManager.swift → ...MessagingPlugin/RNMMChatViewManager.swift b/ios/RNMMChatViewManager.swift → ...MessagingPlugin/RNMMChatViewManager.swift
diff --git a/ios/RNMMChatViewManagerBridge.m → ...ssagingPlugin/RNMMChatViewManagerBridge.m b/ios/RNMMChatViewManagerBridge.m → ...ssagingPlugin/RNMMChatViewManagerBridge.m
diff --git a/ios/RNMobileMessaging.swift → ...leMessagingPlugin/RNMobileMessaging.swift b/ios/RNMobileMessaging.swift → ...leMessagingPlugin/RNMobileMessaging.swift
diff --git a/ios/RNMobileMessagingBridge.m → ...MessagingPlugin/RNMobileMessagingBridge.m b/ios/RNMobileMessagingBridge.m → ...MessagingPlugin/RNMobileMessagingBridge.m
diff --git a/ios/RNMobileMessagingConfiguration.swift → ...ugin/RNMobileMessagingConfiguration.swift b/ios/RNMobileMessagingConfiguration.swift → ...ugin/RNMobileMessagingConfiguration.swift
diff --git a/ios/RNMobileMessagingErrorExtension.swift → ...gin/RNMobileMessagingErrorExtension.swift b/ios/RNMobileMessagingErrorExtension.swift → ...gin/RNMobileMessagingErrorExtension.swift
diff --git a/ios/RNMobileMessagingEventsManager.swift → ...ugin/RNMobileMessagingEventsManager.swift b/ios/RNMobileMessagingEventsManager.swift → ...ugin/RNMobileMessagingEventsManager.swift
diff --git a/ios/RNMobileMessagingStorageAdapter.swift → ...gin/RNMobileMessagingStorageAdapter.swift b/ios/RNMobileMessagingStorageAdapter.swift → ...gin/RNMobileMessagingStorageAdapter.swift
diff --git a/ios/RNMobileMessagingUtils.swift → ...sagingPlugin/RNMobileMessagingUtils.swift b/ios/RNMobileMessagingUtils.swift → ...sagingPlugin/RNMobileMessagingUtils.swift
diff --git a/ios/ReactNativeMobileMessaging.xcodeproj/project.pbxproj b/ios/ReactNativeMobileMessaging.xcodeproj/project.pbxproj
@@ -73,6 +73,17 @@
 			sourceTree = "<group>";
 		};
 		58B511D21A9E6C8500147676 = {
+			isa = PBXGroup;
+			children = (
+				A036A57D24AA7A2600B426EF /* MobileMessagingPlugin */,
+				134814211AA4EA7D00B7C361 /* Products */,
+				76D6D32B23915E1E00F1E02B /* ReactNativeMobileMessaging-Bridging-Header.h */,
+				BD6CA9645FA601D59D19D588 /* Pods */,
+				A3AAA86EF98E496C322000D8 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		A036A57D24AA7A2600B426EF /* MobileMessagingPlugin */ = {
 			isa = PBXGroup;
 			children = (
 				A01DF5FB24802BDA00A65A31 /* RNMMChatViewManager.swift */,
@@ -86,11 +97,8 @@
 				A006028D23E9AB27007BE88B /* RNMobileMessagingEventsManager.swift */,
 				76D6D32C23915E1E00F1E02B /* RNMobileMessaging.swift */,
 				A006028923E9AACE007BE88B /* RNMobileMessagingConfiguration.swift */,
-				134814211AA4EA7D00B7C361 /* Products */,
-				76D6D32B23915E1E00F1E02B /* ReactNativeMobileMessaging-Bridging-Header.h */,
-				BD6CA9645FA601D59D19D588 /* Pods */,
-				A3AAA86EF98E496C322000D8 /* Frameworks */,
 			);
+			path = MobileMessagingPlugin;
 			sourceTree = "<group>";
 		};
 		A3AAA86EF98E496C322000D8 /* Frameworks */ = {

diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "index.js",
   "scripts": {
+    "mm_build": "./scripts/build_mobile_messaging_framework.sh",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

diff --git a/scripts/build_mobile_messaging_framework.sh b/scripts/build_mobile_messaging_framework.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo "Building MobileMessaging.framework with Carthage started..."
+cd ios || { echo "[MobileMessagingPlugin] can't find ios folder"; exit 1; }
+carthage update --cache-builds
+echo "Building MobileMessaging.framework with Carthage finished."
+cd -
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		github "infobip/mobile-messaging-sdk-ios" "8.0.6"