Skip to content

Commit

Permalink
Merge pull request #472 in MOBILE-SDK/app_mobile-sdk-ios from develop…
Browse files Browse the repository at this point in the history
… to master

* commit 'f1117adc15e4ca7049958785b00358b63173c8dd':
  modified text
  update release notes
  release changes
  fix for the crash
  • Loading branch information
Punnaghai Puviarasu committed Oct 29, 2019
2 parents 4eab930 + f1117ad commit 0ff3566
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 84 deletions.
2 changes: 1 addition & 1 deletion AppNexusSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "AppNexusSDK"
s.version = "6.1.1"
s.version = "6.1.2"
s.platform = :ios, "9.0"

s.summary = "AppNexus iOS Mobile Advertising SDK"
Expand Down
6 changes: 6 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 6.1.2

### Improvements/Bug Fixes
+ MS-4092: fix for SKStoreProductViewController crash on iOS 13


## 6.1.1

### New Features
Expand Down
12 changes: 2 additions & 10 deletions sdk/AppNexusSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
8A9AEE0D1A1BF99D00C58BDA /* ANNativeMediatedAdController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AB8762C1A0994310022D9A5 /* ANNativeMediatedAdController.m */; };
8A9AEE0E1A1BF99D00C58BDA /* ANNativeMediatedAdResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AB8762E1A0994310022D9A5 /* ANNativeMediatedAdResponse.m */; };
8A9AEE0F1A1BF99D00C58BDA /* UIView+ANNativeAdCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A6514711A12DB31003F1047 /* UIView+ANNativeAdCategory.m */; };
8A9BBE021D09C4E1001FF571 /* ANStoreProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ABF77581D08CE420068B535 /* ANStoreProductViewController.m */; };
8AC65F5F1A40DE74006BCF39 /* ANMRAIDCalendarManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AC65F371A40DE63006BCF39 /* ANMRAIDCalendarManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
8AC65F601A40DE74006BCF39 /* ANMRAIDCalendarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AC65F381A40DE63006BCF39 /* ANMRAIDCalendarManager.m */; };
8AC65F611A40DE74006BCF39 /* ANMRAIDContainerView.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AC65F391A40DE63006BCF39 /* ANMRAIDContainerView.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -304,7 +303,6 @@
F5731B82228C94CC0012B134 /* ANBrowserViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8AD618AD1981C11F00AC0780 /* ANBrowserViewController.m */; };
F5731B83228C94E70012B134 /* ANOpenInExternalBrowserActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A2F48211A2E255600B0EA05 /* ANOpenInExternalBrowserActivity.h */; settings = {ATTRIBUTES = (Private, ); }; };
F5731B84228C94EE0012B134 /* ANOpenInExternalBrowserActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A2F48221A2E255600B0EA05 /* ANOpenInExternalBrowserActivity.m */; };
F5731B85228C95030012B134 /* ANStoreProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ABF77581D08CE420068B535 /* ANStoreProductViewController.m */; };
F5731B86228C95140012B134 /* ANOMIDImplementation.h in Headers */ = {isa = PBXBuildFile; fileRef = 00D6B04720D1BC9B007A3439 /* ANOMIDImplementation.h */; };
F5731B87228C951D0012B134 /* ANOMIDImplementation.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D6B04920D1BCAF007A3439 /* ANOMIDImplementation.m */; };
F5731BB7228C99350012B134 /* ANAdConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ABB76691A00385C00FEAD9D /* ANAdConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -442,8 +440,6 @@
8ABB766D1A004DBD00FEAD9D /* ANNativeAdStarRating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANNativeAdStarRating.h; sourceTree = "<group>"; };
8ABC03D21C5AD3E100D7C789 /* ANProxyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANProxyViewController.h; sourceTree = "<group>"; };
8ABC03D31C5AD3E100D7C789 /* ANProxyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANProxyViewController.m; sourceTree = "<group>"; };
8ABF77571D08CE420068B535 /* ANStoreProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANStoreProductViewController.h; sourceTree = "<group>"; };
8ABF77581D08CE420068B535 /* ANStoreProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANStoreProductViewController.m; sourceTree = "<group>"; };
8AC65F371A40DE63006BCF39 /* ANMRAIDCalendarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANMRAIDCalendarManager.h; sourceTree = "<group>"; };
8AC65F381A40DE63006BCF39 /* ANMRAIDCalendarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANMRAIDCalendarManager.m; sourceTree = "<group>"; };
8AC65F391A40DE63006BCF39 /* ANMRAIDContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANMRAIDContainerView.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -816,8 +812,6 @@
8AD618C71981C11F00AC0780 /* ANReachability.m */,
0035C5AD1F4496FD00915E97 /* ANSSMMediationAdViewController.h */,
0035C5AF1F44971100915E97 /* ANSSMMediationAdViewController.m */,
8ABF77571D08CE420068B535 /* ANStoreProductViewController.h */,
8ABF77581D08CE420068B535 /* ANStoreProductViewController.m */,
8AD618C81981C11F00AC0780 /* ANTargetingParameters.m */,
4FA566E71F4B94D3004652AB /* ANTrackerInfo.h */,
4FA566E81F4B94D3004652AB /* ANTrackerInfo.m */,
Expand Down Expand Up @@ -1303,7 +1297,6 @@
609732C31E42E9670061EC0A /* ANSSMStandardAd.m in Sources */,
609732BE1E42E95C0061EC0A /* ANSSMVideoAd.m in Sources */,
8AF5A8871ACC60D50089C529 /* ANStandardAd.m in Sources */,
8A9BBE021D09C4E1001FF571 /* ANStoreProductViewController.m in Sources */,
8A9AEE031A1BF99D00C58BDA /* ANTargetingParameters.m in Sources */,
607A21001F85541900BD8353 /* ANTrackerInfo.m in Sources */,
607A20FF1F85540E00BD8353 /* ANTrackerManager.m in Sources */,
Expand Down Expand Up @@ -1358,7 +1351,6 @@
F5731B66228C8E200012B134 /* ANSSMStandardAd.m in Sources */,
F5731B68228C8E260012B134 /* ANSSMVideoAd.m in Sources */,
F5731B6A228C8E2D0012B134 /* ANStandardAd.m in Sources */,
F5731B85228C95030012B134 /* ANStoreProductViewController.m in Sources */,
F5731B70228C8F820012B134 /* ANTargetingParameters.m in Sources */,
F5731B7F228C94AB0012B134 /* ANTrackerInfo.m in Sources */,
F5731B7E228C94990012B134 /* ANTrackerManager.m in Sources */,
Expand Down Expand Up @@ -1426,7 +1418,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/sourcefiles/Viewability/OMAppnexusSDK";
MARKETING_VERSION = 6.1.1;
MARKETING_VERSION = 6.1.2;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1464,7 +1456,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/sourcefiles/Viewability/OMAppnexusSDK";
MARKETING_VERSION = 6.1.1;
MARKETING_VERSION = 6.1.2;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion sdk/AppNexusSDK/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions sdk/sourcefiles/internal/ANBrowserViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
*/

#import "ANBrowserViewController.h"
#import "ANStoreProductViewController.h"
#import "ANWebView.h"
#import "ANGlobal.h"
#import "ANLogging.h"
#import "UIView+ANCategory.h"
#import "ANOpenInExternalBrowserActivity.h"
#import <StoreKit/StoreKit.h>

#import "ANSDKSettings.h"

Expand Down Expand Up @@ -512,7 +512,7 @@ - (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWe

- (void)loadAndPresentStoreControllerWithiTunesId:(NSNumber *)iTunesId {
if (iTunesId) {
self.iTunesStoreController = [[ANStoreProductViewController alloc] init];
self.iTunesStoreController = [[SKStoreProductViewController alloc] init];
self.iTunesStoreController.delegate = self;
[self.iTunesStoreController loadProductWithParameters:@{SKStoreProductParameterITunesItemIdentifier:iTunesId}
completionBlock:nil];
Expand Down
2 changes: 1 addition & 1 deletion sdk/sourcefiles/internal/ANGlobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define AN_ERROR_TABLE @"errors"

#define AN_DEFAULT_PLACEMENT_ID @"default_placement_id"
#define AN_SDK_VERSION @"6.1.1"
#define AN_SDK_VERSION @"6.1.2"


#define APPNEXUS_BANNER_SIZE CGSizeMake(320, 50)
Expand Down
20 changes: 0 additions & 20 deletions sdk/sourcefiles/internal/ANStoreProductViewController.h

This file was deleted.

49 changes: 0 additions & 49 deletions sdk/sourcefiles/internal/ANStoreProductViewController.m

This file was deleted.

0 comments on commit 0ff3566

Please sign in to comment.