Merge branch 'release/1.10.0' into develop

media-net · Mar 22, 2018 · 79ff653 · 79ff653
2 parents 2d3e13e + 55d9c48
commit 79ff653
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/Example/MNAdSdk.xcodeproj/project.pbxproj b/Example/MNAdSdk.xcodeproj/project.pbxproj
@@ -840,12 +840,9 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-MNAdSdk_Example/Pods-MNAdSdk_Example-resources.sh",
-				"${PODS_ROOT}/../../MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Resources/mraid.js",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -867,7 +864,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		D52BEFED19137017DCA7C015 /* [CP] Check Pods Manifest.lock */ = {
@@ -885,7 +882,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		DD77678351CA080044C74E43 /* [CP] Copy Pods Resources */ = {
@@ -912,8 +909,13 @@
 				"${SRCROOT}/Pods/Target Support Files/Pods-MNAdSdk_Example/Pods-MNAdSdk_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworkActivityLogger/AFNetworkActivityLogger.framework",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/Bugsnag/Bugsnag.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
+				"${BUILT_PRODUCTS_DIR}/KSCrash/KSCrash.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
+				"${BUILT_PRODUCTS_DIR}/MNALApplink/MNALApplink.framework",
+				"${BUILT_PRODUCTS_DIR}/MNetAdSdk/MNetAdSdk.framework",
+				"${BUILT_PRODUCTS_DIR}/MNetJSONModeller/MNetJSONModeller.framework",
 				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
 				"${BUILT_PRODUCTS_DIR}/mopub-ios-sdk/MoPub.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
@@ -922,8 +924,13 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworkActivityLogger.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bugsnag.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KSCrash.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MNALApplink.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MNetAdSdk.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MNetJSONModeller.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MoPub.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",

diff --git a/Example/MNAdSdk/MNAdSdk-Info.plist b/Example/MNAdSdk/MNAdSdk-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>1.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -28,7 +28,7 @@ PODS:
   - GoogleToolboxForMac/NSData+zlib (2.1.3):
     - GoogleToolboxForMac/Defines (= 2.1.3)
   - MBProgressHUD (1.1.0)
-  - MNetAdSdk (1.9.0)
+  - MNetAdSdk (1.10.0)
   - mopub-ios-sdk (4.12.0):
     - mopub-ios-sdk/MoPubSDK (= 4.12.0)
   - mopub-ios-sdk/MoPubSDK (4.12.0)
@@ -53,10 +53,10 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   AFNetworkActivityLogger:
-    :branch: 3_0_0
+    :branch: '3_0_0'
     :git: https://github.com/AFNetworking/AFNetworkActivityLogger.git
   MNetAdSdk:
-    :path: ../MNetAdSdk.podspec.json
+    :path: "../MNetAdSdk.podspec.json"
 
 CHECKOUT OPTIONS:
   AFNetworkActivityLogger:
@@ -73,12 +73,12 @@ SPEC CHECKSUMS:
   Google-Mobile-Ads-SDK: 375bbb821b3df2106c37b74f6b0a97576ddc5f6b
   GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
-  MNetAdSdk: 96288d4ab52a3a484fdcf71055025f729128c331
+  MNetAdSdk: b827643b3c051b09d55a950fd01be630663b7aef
   mopub-ios-sdk: f1223e3f54a4ff68394f4fd9e42651801cf09704
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
   Toast: 14a93686d6c8bfe2727afd342414e35660a8a1f3
 
 PODFILE CHECKSUM: e8403fabed79b68131208ec580ed36d4341becba
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.2.0
diff --git a/MNetAdSdk.podspec.json b/MNetAdSdk.podspec.json
@@ -41,8 +41,8 @@
     }, 
     "source": {
         "git": "https://github.com/media-net/mnet-ios-pod.git", 
-        "tag": "v1.9.0"
+        "tag": "v1.10.0"
     }, 
     "summary": "iOS Ad SDK by Media.NET", 
-    "version": "1.9.0"
+    "version": "1.10.0"
 }
diff --git a/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNet.h b/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNet.h
@@ -36,6 +36,11 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)initWithCustomerId:(NSString *)customerId
    appContainsChildDirectedContent:(BOOL)containsChildDirectedContent;
 
+/// Logs all MNet ad related logs.
+/// It is NO by default.
+/// *** Do NOT enable logs in production apps ***
++ (void)enableLogs:(BOOL)enabled;
+
 /// The current instance of MNet
 + (MNet*)getInstance;
 

diff --git a/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk b/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk