Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 5.12.3 #545

Merged
merged 9 commits into from
Sep 30, 2024
Merged

Release 5.12.3 #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3391fe
Merge pull request #539 from qonversion/release/5.12.2
suriksarkisyan Sep 9, 2024
0234eef
Added option to skip auth
actions-user Sep 10, 2024
f326217
Updated sample main screen logic
actions-user Sep 10, 2024
df528fe
Merge pull request #541 from qonversion/feature/sampleSkipAuth
suriksarkisyan Sep 10, 2024
9cfc5b4
The setNotificationsToken and handleNotification methods were marked …
SpertsyanKM Sep 18, 2024
95b3dbf
The setNotificationsToken and handleNotification methods were marked …
SpertsyanKM Sep 18, 2024
1539000
Merge pull request #543 from qonversion/tech/sc-35135/deprecatePushToken
SpertsyanKM Sep 30, 2024
bf1ef83
[create-pull-request] automated change
SpertsyanKM Sep 30, 2024
4de9cd3
Merge branch 'main' into release/5.12.3
SpertsyanKM Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/Info.plist
View file
Open in desktop
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>5.12.2</string>
<string>5.12.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
20 changes: 0 additions & 20 deletions IntegrationTests/QNAPIClientIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,26 +529,6 @@ - (void)testIdentifyError {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testSendPushToken {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Send push token call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_sendPushToken"];
QNAPIClient *client = [self getClient:uid];

// when
[client launchRequest:^(NSDictionary * _Nullable initRes, NSError * _Nullable createUserError) {
XCTAssertNil(createUserError);

[client sendPushToken:^(BOOL success) {
XCTAssertFalse(success); // no push token on emulator
[completionExpectation fulfill];
}];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testScreens {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Screens call"];
Expand Down
20 changes: 0 additions & 20 deletions IntegrationTests/QNOutagerIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,26 +329,6 @@ - (void)testIdentify {
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testSendPushToken {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Send push token call"];
NSString *uid = [NSString stringWithFormat:@"%@%@", self.kUidPrefix, @"_sendPushToken"];
QNAPIClient *client = [self getClient:uid];

// when
[client launchRequest:^(NSDictionary * _Nullable initRes, NSError * _Nullable createUserError) {
XCTAssertNil(createUserError);

[client sendPushToken:^(BOOL success) {
XCTAssertFalse(success);
[completionExpectation fulfill];
}];
}];

// then
[self waitForExpectationsWithTimeout:self.kRequestTimeout handler:nil];
}

- (void)testScreens {
// given
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Screens call"];
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 578415250db59f137d92c9b1ce32646ae18974ba

COCOAPODS: 1.15.2
COCOAPODS: 1.13.0
2 changes: 1 addition & 1 deletion Qonversion.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
idfa_exclude_files = ['Sources/Qonversion/IDFA']
s.name = 'Qonversion'
s.swift_version = '5.5'
s.version = '5.12.2'
s.version = '5.12.3'
s.summary = 'qonversion.io'
s.description = <<-DESC
Deep Analytics for iOS Subscriptions
Expand Down
20 changes: 2 additions & 18 deletions Qonversion.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@
701922762B10AB3300724926 /* QONSubscriptionPeriod+Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 701922752B10AB3300724926 /* QONSubscriptionPeriod+Protected.h */; };
701BAC102C524626009B16FB /* QONPurchaseOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 701BAC0F2C524626009B16FB /* QONPurchaseOptions.m */; };
701BAC112C524626009B16FB /* QONPurchaseOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 701BAC0E2C524626009B16FB /* QONPurchaseOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
702394912923EBF3003126D5 /* QONNotificationsService.h in Headers */ = {isa = PBXBuildFile; fileRef = 7023948F2923EBF3003126D5 /* QONNotificationsService.h */; };
702394922923EBF3003126D5 /* QONNotificationsService.m in Sources */ = {isa = PBXBuildFile; fileRef = 702394902923EBF3003126D5 /* QONNotificationsService.m */; };
70283DF729F66FAC00D138BC /* PurchasesMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70283DF629F66FAC00D138BC /* PurchasesMapper.swift */; };
702BF8B629531A68000B6C3E /* QONScreenCustomizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 702BF8B529531A68000B6C3E /* QONScreenCustomizationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
702DBDEC2A3216C900D590D0 /* QONExperiment+Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 702DBDEB2A3216C900D590D0 /* QONExperiment+Protected.h */; };
Expand Down Expand Up @@ -393,8 +391,6 @@
701922752B10AB3300724926 /* QONSubscriptionPeriod+Protected.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "QONSubscriptionPeriod+Protected.h"; sourceTree = "<group>"; };
701BAC0E2C524626009B16FB /* QONPurchaseOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QONPurchaseOptions.h; sourceTree = "<group>"; };
701BAC0F2C524626009B16FB /* QONPurchaseOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QONPurchaseOptions.m; sourceTree = "<group>"; };
7023948F2923EBF3003126D5 /* QONNotificationsService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QONNotificationsService.h; sourceTree = "<group>"; };
702394902923EBF3003126D5 /* QONNotificationsService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QONNotificationsService.m; sourceTree = "<group>"; };
70283DF629F66FAC00D138BC /* PurchasesMapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PurchasesMapper.swift; sourceTree = "<group>"; };
702BF8B529531A68000B6C3E /* QONScreenCustomizationDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QONScreenCustomizationDelegate.h; sourceTree = "<group>"; };
702DBDEB2A3216C900D590D0 /* QONExperiment+Protected.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "QONExperiment+Protected.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -906,15 +902,6 @@
path = "NSError+Sugare";
sourceTree = "<group>";
};
7023948E2923EBE8003126D5 /* QONNotificationsService */ = {
isa = PBXGroup;
children = (
7023948F2923EBF3003126D5 /* QONNotificationsService.h */,
702394902923EBF3003126D5 /* QONNotificationsService.m */,
);
path = QONNotificationsService;
sourceTree = "<group>";
};
70283DF529F66FAC00D138BC /* Swift */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1235,7 +1222,6 @@
8957320126DD03A3009507A6 /* Services */ = {
isa = PBXGroup;
children = (
7023948E2923EBE8003126D5 /* QONNotificationsService */,
8957320226DD03A3009507A6 /* QONAutomationsService */,
8957320526DD03A3009507A6 /* QONAutomationsScreenProcessor */,
);
Expand Down Expand Up @@ -1737,7 +1723,6 @@
895732F326DD03A3009507A6 /* QNUserPropertiesManager.h in Headers */,
70F07B1B28AD085600A45D41 /* QONEntitlementsCacheLifetime.h in Headers */,
707734F42A9F607700CFF742 /* QONRemoteConfigurationSource.h in Headers */,
702394912923EBF3003126D5 /* QONNotificationsService.h in Headers */,
895732F126DD03A3009507A6 /* QNMapper.h in Headers */,
7097C6BE2A38BFC800565DE4 /* QONRemoteConfig+Protected.h in Headers */,
895732DF26DD03A3009507A6 /* QONUser+Protected.h in Headers */,
Expand Down Expand Up @@ -2135,7 +2120,6 @@
895732B326DD03A3009507A6 /* QONAutomationsViewController.m in Sources */,
895732EC26DD03A3009507A6 /* QNUserInfoMapper.m in Sources */,
895732B526DD03A3009507A6 /* QONAutomationsService.m in Sources */,
702394922923EBF3003126D5 /* QONNotificationsService.m in Sources */,
8957328A26DD03A3009507A6 /* QONActionResult.m in Sources */,
70283DF729F66FAC00D138BC /* PurchasesMapper.swift in Sources */,
701BAC102C524626009B16FB /* QONPurchaseOptions.m in Sources */,
Expand Down Expand Up @@ -2578,7 +2562,7 @@
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = MTVL2X9L7N;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 5ZBNSPDUJ2;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
Expand All @@ -2599,7 +2583,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = MTVL2X9L7N;
DEVELOPMENT_TEAM = 5ZBNSPDUJ2;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0;
Expand Down
2 changes: 1 addition & 1 deletion Sample/ActivePermissionsTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ActivePermissionsTableViewCell: UITableViewCell {
@IBOutlet weak var renewStateLabel: UILabel!

func setup(with permission: Qonversion.Entitlement) {
permissionIdLabel.text = "Permission id: \(permission.entitlementID)"
permissionIdLabel.text = "Permission id: \(permission.entitlementID). isActive: \(permission.isActive)"
productIdLabel.text = "Product id: \(permission.productID)"
var renewState = ""
switch permission.renewState {
Expand Down
4 changes: 4 additions & 0 deletions Sample/AuthViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ class AuthViewController: UIViewController {
}
}

@IBAction func didTapSkipAuth(_ sender: Any) {
showMainScreen()
}

@IBAction func didTouchSignInButton(_ sender: Any) {
let conf = GIDConfiguration(clientID: "11599271839-qalspkpqrihnkl1e12be731tgmre5uop.apps.googleusercontent.com")
GIDSignIn.sharedInstance.signIn(with: conf, presenting: self) { [weak self] user, error in
Expand Down
Loading
Loading