Merge branch 'release/1.4.0' into develop

media-net · Dec 29, 2017 · d13ae02 · d13ae02
2 parents b950509 + 46f9f33
commit d13ae02
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
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.3.0</string>
+	<string>1.4.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.3.0)
+  - MNetAdSdk (1.4.0)
   - mopub-ios-sdk (4.12.0):
     - mopub-ios-sdk/MoPubSDK (= 4.12.0)
   - mopub-ios-sdk/MoPubSDK (4.12.0)
@@ -73,7 +73,7 @@ SPEC CHECKSUMS:
   Google-Mobile-Ads-SDK: 83f7f890e638ce8f1debd440ea363338c9f6be3b
   GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
-  MNetAdSdk: 5c6fa4c081e0c72a8e24ac8e66e28c2851550cfb
+  MNetAdSdk: 603a946a514bdca6ae88de033f5f59af5c2da4ed
   mopub-ios-sdk: f1223e3f54a4ff68394f4fd9e42651801cf09704
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c

diff --git a/Example/Tests/MNetSdkConfigResponse.json b/Example/Tests/MNetSdkConfigResponse.json
@@ -5,6 +5,7 @@
             "adview_cache_max": 3,
             "adview_cache_timeout": 30,
             "adview_reuse_enabled": true,
+            "mnet_inapp_browsing_enabled" : true,
             "ad_units": [
                          {
                          "ad_unit_id": "min_first:0-0,max_first:0-1,min_last:0-3,max_last:0-9,view_pos:LEFT-CENTER",

diff --git a/Example/Tests/MNetSdkConfigTests.m b/Example/Tests/MNetSdkConfigTests.m
@@ -61,6 +61,10 @@ - (void)testSdkConfigAutoRefreshNegative{
     XCTAssert(refreshInterval == nil, @"Auto refresh Interval should've been nil");
 }
 
+- (void)testInAppBrowsingFlag{
+    XCTAssertTrue([[MNetSdkConfig getInstance] isInappBrowsingEnabled]);
+}
+
 - (void)testSdkConfigData{
     MNetSdkConfig *instance = [MNetSdkConfig getInstance];
     MNetSdkConfigData *configData = [instance getSdkConfigData];

diff --git a/MNetAdSdk.podspec.json b/MNetAdSdk.podspec.json
@@ -17,7 +17,8 @@
         "Security", 
         "AVKit", 
         "EventKit", 
-        "Photos"
+        "Photos", 
+        "SafariServices"
     ], 
     "homepage": "https://github.com/media-net/mnet-ios-pod", 
     "ios": {
@@ -39,8 +40,8 @@
     }, 
     "source": {
         "git": "https://github.com/media-net/mnet-ios-pod.git", 
-        "tag": "v1.3.0"
+        "tag": "v1.4.0"
     }, 
     "summary": "iOS Ad SDK by Media.NET", 
-    "version": "1.3.0"
+    "version": "1.4.0"
 }
diff --git a/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk b/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk