Merge branch 'release/1.12.4'

Example/MNAdSdk.xcodeproj/project.pbxproj

@@ -841,9 +841,12 @@
 			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;
@@ -865,7 +868,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		AE70CE73207B3687007171F9 /* ShellScript */ = {
@@ -896,7 +899,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			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";
 			showEnvVarsInLog = 0;
 		};
 		DD77678351CA080044C74E43 /* [CP] Copy Pods Resources */ = {
@@ -921,30 +924,16 @@
 			);
 			inputPaths = (
 				"${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",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			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",

Example/MNAdSdk/MNAdSdk-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.12.3</string>
+	<string>1.12.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/Podfile.lock

@@ -1,25 +1,25 @@
 PODS:
-  - Firebase/AdMob (4.11.0):
+  - Firebase/AdMob (4.13.0):
     - Firebase/Core
-    - Google-Mobile-Ads-SDK (= 7.29.0)
-  - Firebase/Core (4.11.0):
-    - FirebaseAnalytics (= 4.1.0)
-    - FirebaseCore (= 4.0.18)
-  - FirebaseAnalytics (4.1.0):
+    - Google-Mobile-Ads-SDK (= 7.30.0)
+  - Firebase/Core (4.13.0):
+    - FirebaseAnalytics (= 4.2.0)
+    - FirebaseCore (= 4.0.20)
+  - FirebaseAnalytics (4.2.0):
     - FirebaseCore (~> 4.0)
     - FirebaseInstanceID (~> 2.0)
     - GoogleToolboxForMac/NSData+zlib (~> 2.1)
     - nanopb (~> 0.3)
-  - FirebaseCore (4.0.18):
+  - FirebaseCore (4.0.20):
     - GoogleToolboxForMac/NSData+zlib (~> 2.1)
   - FirebaseInstanceID (2.0.10):
     - FirebaseCore (~> 4.0)
-  - Google-Mobile-Ads-SDK (7.29.0)
+  - Google-Mobile-Ads-SDK (7.30.0)
   - GoogleToolboxForMac/Defines (2.1.3)
   - GoogleToolboxForMac/NSData+zlib (2.1.3):
     - GoogleToolboxForMac/Defines (= 2.1.3)
   - MBProgressHUD (1.1.0)
-  - MNetAdSdk (1.12.3)
+  - MNetAdSdk (1.12.4)
   - mopub-ios-sdk (4.12.0):
     - mopub-ios-sdk/MoPubSDK (= 4.12.0)
   - mopub-ios-sdk/MoPubSDK (4.12.0)
@@ -43,22 +43,22 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   MNetAdSdk:
-    :path: "../MNetAdSdk.podspec.json"
+    :path: ../MNetAdSdk.podspec.json
 
 SPEC CHECKSUMS:
-  Firebase: cc13dfab1038c8b45d7903e01fc690451d6d0b24
-  FirebaseAnalytics: 3dfae28d4a5e06f86c4fae830efc2ad3fadb19bc
-  FirebaseCore: b981f47e5254cbcfdeb483355300d743f6fcab2c
+  Firebase: 5ec5e863d269d82d66b4bf56856726f8fb8f0fb3
+  FirebaseAnalytics: 7ef69e76a5142f643aeb47c780e1cdce4e23632e
+  FirebaseCore: 90cb1c53d69b556f112a1bf72b5fcfaad7650790
   FirebaseInstanceID: 8d20d890d65c917f9f7d9950b6e10a760ad34321
-  Google-Mobile-Ads-SDK: 375bbb821b3df2106c37b74f6b0a97576ddc5f6b
+  Google-Mobile-Ads-SDK: 7404f68120ae8682afeb5af001fbf4aad731c78e
   GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
-  MNetAdSdk: 4e2bed0e8ccfb5f1dd99a788ac97cfee66e69d01
+  MNetAdSdk: d918138eba1e1e40151297437f024d9f6e778b22
   mopub-ios-sdk: f1223e3f54a4ff68394f4fd9e42651801cf09704
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c
   Toast: 14a93686d6c8bfe2727afd342414e35660a8a1f3
 
 PODFILE CHECKSUM: 1e0a57bdc672f84e35910766c0acc5a825686215
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1

Example/Tests/MNetContextLinkTests.m

@@ -61,6 +61,6 @@ - (void)testContextLinkValidity{
 
 - (void)testContextLinkNil{
     MNetAdBaseCommon *adBaseCommon = [[MNetAdBaseCommon alloc] init];
-    XCTAssertNil(adBaseCommon.fetchVCLink);
+    XCTAssert(adBaseCommon.fetchVCLink != nil);
 }
 @end

MNetAdSdk.podspec.json

@@ -41,8 +41,8 @@
     }, 
     "source": {
         "git": "https://github.com/media-net/mnet-ios-pod.git", 
-        "tag": "v1.12.3"
+        "tag": "v1.12.4"
     }, 
     "summary": "iOS Ad SDK by Media.NET", 
-    "version": "1.12.3"
+    "version": "1.12.4"
 }

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNet.h

@@ -16,13 +16,13 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// The customer Id of the MNetAdSdk
-@property (nonatomic) NSString *customerId;
+@property (atomic) NSString *customerId;
 
 /// Setting this parameter will send the test requests to the servers.
 /// It can be used for testing purposes.
-@property (nonatomic) BOOL isTest;
+@property (atomic) BOOL isTest;
 
-@property (nonatomic, nullable) MNetUser *user;
+@property (atomic, nullable) MNetUser *user;
 
 /// Initialises the MNetAdSdk for a given customer Id.
 /// This can be run only once in a session.

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetAdRequest.h

@@ -14,10 +14,10 @@
 @interface MNetAdRequest : NSObject
 
 /// Keywords for the ad
-@property (nonatomic, nullable) NSString *keywords;
+@property (atomic, nullable) NSString *keywords;
 
 /// The website link for the current screen. This is for better context.
-@property (nonatomic, nullable) NSString *contextLink;
+@property (atomic, nullable) NSString *contextLink;
 
 /// Get a new request object
 + (MNetAdRequest *_Nonnull)newRequest;

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetAdSize.h

@@ -10,7 +10,7 @@
 
 @interface MNetAdSize : NSObject
 
-@property (nonatomic) int h;
-@property (nonatomic) int w;
+@property (atomic) int h;
+@property (atomic) int w;
 
 @end

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetAdView.h

@@ -22,32 +22,32 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// The banner ads delegate for callbacks from banner ads
-@property (nonatomic, weak) id<MNetAdViewDelegate> delegate;
+@property (atomic, weak) id<MNetAdViewDelegate> delegate;
 
 /// The video ads delegate for callbacks from video ads
-@property (nonatomic, weak) id<MNetVideoDelegate> videoDelegate;
+@property (atomic, weak) id<MNetVideoDelegate> videoDelegate;
 
 /// The size the of the ad. This does not reflect the size of the frame,
 /// within which the MNetAdView resides, but simply the size of the ad to
 /// be displayed
-@property (nonatomic) CGSize size;
+@property (atomic) CGSize size;
 
-@property (nonatomic, nullable) MNetError *error;
+@property (atomic, nullable) MNetError *error;
 
 /// The adunit Id of the ad to be displayed
-@property (nonatomic) NSString *adUnitId;
+@property (atomic) NSString *adUnitId;
 
 /// Optional keywords to be sent in the ad request
-@property (nonatomic, nullable) NSString *keywords;
+@property (atomic, nullable) NSString *keywords;
 
 /// The ad request object
-@property (nonatomic) MNetAdRequest *adRequest;
+@property (atomic) MNetAdRequest *adRequest;
 
 /// The view controller on which the MNetAdView is displayed.
 /// The primary purpose of this is when the adView is clicked
 /// (called a click-through), a clickthrough-webview is displayed,
 /// which is presented on top of this viewController.
-@property (weak, nonatomic) UIViewController *_Nullable rootViewController;
+@property (weak, atomic) UIViewController *_Nullable rootViewController;
 
 // All init methods
 

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetInterstitialAd.h

@@ -18,19 +18,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 /// The interstitial ads delegate for callbacks on banner ads
-@property (nonatomic, weak) id<MNetInterstitialAdDelegate> interstitialDelegate;
+@property (atomic, weak) id<MNetInterstitialAdDelegate> interstitialDelegate;
 
 /// The interstitial video ads delegate for callbacks on video ads
-@property (nonatomic, weak) id<MNetInterstitialVideoAdDelegate> interstitialVideoDelegate;
+@property (atomic, weak) id<MNetInterstitialVideoAdDelegate> interstitialVideoDelegate;
 
 /// The adunit Id of the ad to be displayed
-@property (nonatomic) NSString *adUnitId;
+@property (atomic) NSString *adUnitId;
 
 /// Optional keywords to be sent in the ad request
-@property (nonatomic, nullable) NSString *keywords;
+@property (atomic, nullable) NSString *keywords;
 
 /// The ad request object
-@property (nonatomic, nullable) MNetAdRequest *adRequest;
+@property (atomic, nullable) MNetAdRequest *adRequest;
 
 /// Initialise the interstitial ad with the adunit Id
 - (id)initWithAdUnitId:(NSString *)adUnitId;

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetReward.h

@@ -12,16 +12,16 @@
 @interface MNetReward : NSObject
 
 /// The name of the reward
-@property (nonatomic, nullable) NSString *name;
+@property (atomic, nonnull) NSString *name;
 
 /// The currency type of the reward in string
-@property (nonatomic, nullable) NSString *currency;
+@property (atomic, nonnull) NSString *currency;
 
 /// The amount of the reward
-@property (nonatomic) NSNumber *amount;
+@property (atomic, nonnull) NSNumber *amount;
 
 /// Initialise the reward
-- (instancetype _Nonnull)initWith:(NSString *_Nullable)name
-                     withCurrency:(NSString *_Nullable)currency
-                       withAmount:(NSNumber *)amount;
+- (instancetype _Nonnull)initWith:(NSString *_Nonnull)name
+                     withCurrency:(NSString *_Nonnull)currency
+                       withAmount:(NSNumber *_Nonnull)amount;
 @end

MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/Headers/MNetRewardedVideo.h

@@ -19,12 +19,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// The ad delegate for callbacks from rewarded video ads
-@property (weak, nonatomic) id<MNetRewardedVideoDelegate> rewardedVideoDelegate;
+@property (weak, atomic) id<MNetRewardedVideoDelegate> rewardedVideoDelegate;
 
 NS_ASSUME_NONNULL_END
 
 /// Optional keywords to be sent in the ad request
-@property (nonatomic, nullable) NSString *keywords;
+@property (atomic, nullable) NSString *keywords;
 
 /// Gives an instance of the rewarded video for an adunit Id
 + (MNetRewardedVideo *_Nullable)getInstanceForAdUnitId:(NSString *_Nonnull)adUnitId;
@@ -39,8 +39,8 @@ NS_ASSUME_NONNULL_END
 - (void)showAdFromViewController:(UIViewController *_Nonnull)rootViewController;
 
 /// Set the reward for the rewarded video instance
-- (void)setRewardWithName:(NSString *_Nullable)name
-              forCurrency:(NSString *_Nullable)currency
+- (void)setRewardWithName:(NSString *_Nonnull)name
+              forCurrency:(NSString *_Nonnull)currency
                 forAmount:(NSNumber *_Nonnull)amount;
 @end