Merge branch 'release/1.12.2'

media-net · Apr 11, 2018 · 50519e4 · 50519e4
2 parents 7dcc6aa + 0148bb5
commit 50519e4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 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.12.1</string>
+	<string>1.12.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -19,7 +19,7 @@ PODS:
   - GoogleToolboxForMac/NSData+zlib (2.1.3):
     - GoogleToolboxForMac/Defines (= 2.1.3)
   - MBProgressHUD (1.1.0)
-  - MNetAdSdk (1.12.1)
+  - MNetAdSdk (1.12.2)
   - mopub-ios-sdk (4.12.0):
     - mopub-ios-sdk/MoPubSDK (= 4.12.0)
   - mopub-ios-sdk/MoPubSDK (4.12.0)
@@ -53,7 +53,7 @@ SPEC CHECKSUMS:
   Google-Mobile-Ads-SDK: 375bbb821b3df2106c37b74f6b0a97576ddc5f6b
   GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
-  MNetAdSdk: bf8c12c935e95bc0a87756bc2a3690094854f9d7
+  MNetAdSdk: 2b229de45a92cba5cd115353e64a69aeb19e25fe
   mopub-ios-sdk: f1223e3f54a4ff68394f4fd9e42651801cf09704
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c

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.12.1"
+        "tag": "v1.12.2"
     }, 
     "summary": "iOS Ad SDK by Media.NET", 
-    "version": "1.12.1"
+    "version": "1.12.2"
 }
diff --git a/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk b/MNetAdSdk/ios/MNetAdSdk.framework/Versions/A/MNetAdSdk