diff --git a/README.md b/README.md index 2962e304..04652bce 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ v1.44.0 - in development | [OneSignal](onesignal/) | 5.2.4 | | [Pollfish](pollfish/) | 6.5.0 | | [SAMKeychain](samkeychain/) | 1.5.3 | -| [Singular](singular/) | 12.4.4 | +| [Singular](singular/) | 12.5.0 | | [Tenjin](tenjin/) | 1.14.4 | | [UnityAds](unityads/) | 4.12.2 | | [YouTubePlayer](youtube/) | 1.0.4 | diff --git a/singular/README.md b/singular/README.md index 0ba935dc..46cc20ce 100644 --- a/singular/README.md +++ b/singular/README.md @@ -4,7 +4,7 @@ | RoboPods Version | Singular Version | |------------------|------------------| -| 1.38.0-1.43.0 | 12.3.2-12.4.2 | +| 1.38.0-1.44.0 | 12.3.2-12.5.0 | | 1.35.0 | 12.2.0 | | 1.33.0 | 12.1.1 | | 1.32.0 | 12.0.6 | diff --git a/singular/ios/pom.xml b/singular/ios/pom.xml index 4f791b33..45ac78df 100644 --- a/singular/ios/pom.xml +++ b/singular/ios/pom.xml @@ -7,7 +7,7 @@ robopods-singular-ios - RoboPods Singular SDK iOS v12.4.4 + RoboPods Singular SDK iOS v12.5.0 jar diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Attributes.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/Attributes.h deleted file mode 100644 index 878d2c13..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Attributes.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __ATTRIBUTES_H__ -#define __ATTRIBUTES_H__ - -#define ATTRIBUTE_SNG_ATTR_FROM_DATE @"sng_attr_from_date" -#define ATTRIBUTE_SNG_ATTR_TO_DATE @"sng_attr_to_date" -#define ATTRIBUTE_SNG_ATTR_ACHIEVEMENT_ID @"sng_attr_achievement_id" -#define ATTRIBUTE_SNG_ATTR_CONTENT @"sng_attr_content" -#define ATTRIBUTE_SNG_ATTR_CONTENT_ID @"sng_attr_content_id" -#define ATTRIBUTE_SNG_ATTR_CONTENT_LIST @"sng_attr_content_list" -#define ATTRIBUTE_SNG_ATTR_CONTENT_TYPE @"sng_attr_content_type" -#define ATTRIBUTE_SNG_ATTR_COUPON_CODE @"sng_attr_coupon_code" -#define ATTRIBUTE_SNG_ATTR_DEEP_LINK @"sng_attr_deep_link" -#define ATTRIBUTE_SNG_ATTR_EVENT_END @"sng_attr_event_end" -#define ATTRIBUTE_SNG_ATTR_EVENT_START @"sng_attr_event_start" -#define ATTRIBUTE_SNG_ATTR_HOTEL_SCORE @"sng_attr_hotel_score" -#define ATTRIBUTE_SNG_ATTR_ITEM_DESCRIPTION @"sng_attr_item_description" -#define ATTRIBUTE_SNG_ATTR_ITEM_PRICE @"sng_attr_item_price" -#define ATTRIBUTE_SNG_ATTR_LEVEL @"sng_attr_level" -#define ATTRIBUTE_SNG_ATTR_COUNTRY @"sng_attr_country" -#define ATTRIBUTE_SNG_ATTR_REGION @"sng_attr_region" -#define ATTRIBUTE_SNG_ATTR_MAX @"sng_attr_max" -#define ATTRIBUTE_SNG_ATTR_NEW_VERSION @"sng_attr_new_version" -#define ATTRIBUTE_SNG_ATTR_ORIGIN @"sng_attr_origin" -#define ATTRIBUTE_SNG_ATTR_PAYMENT_INFO_AVAILABLE @"sng_attr_payment_info_available" -#define ATTRIBUTE_SNG_ATTR_QUANTITY @"sng_attr_quantity" -#define ATTRIBUTE_SNG_ATTR_RATING @"sng_attr_rating" -#define ATTRIBUTE_SNG_ATTR_REGISTRATION_METHOD @"sng_attr_registration_method" -#define ATTRIBUTE_SNG_ATTR_REVIEW_TEXT @"sng_attr_review_text" -#define ATTRIBUTE_SNG_ATTR_SCORE @"sng_attr_score" -#define ATTRIBUTE_SNG_ATTR_SEARCH_STRING @"sng_attr_search_string" -#define ATTRIBUTE_SNG_ATTR_SUBSCRIPTION_ID @"sng_attr_subscription_id" -#define ATTRIBUTE_SNG_ATTR_SUCCESS @"sng_attr_success" -#define ATTRIBUTE_SNG_ATTR_TRANSACTION_ID @"sng_attr_transaction_id" -#define ATTRIBUTE_SNG_ATTR_TUTORIAL_ID @"sng_attr_tutorial_id" -#define ATTRIBUTE_SNG_ATTR_VALID @"sng_attr_valid" - -#endif \ No newline at end of file diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Events.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/Events.h deleted file mode 100644 index c7c869bd..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Events.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef __EVENTS_H__ -#define __EVENTS_H__ - -#define EVENT_SNG_RATE @"sng_rate" -#define EVENT_SNG_SPENT_CREDITS @"sng_spent_credits" -#define EVENT_SNG_TUTORIAL_COMPLETE @"sng_tutorial_complete" -#define EVENT_SNG_LOGIN @"sng_login" -#define EVENT_SNG_START_TRIAL @"sng_start_trial" -#define EVENT_SNG_SUBSCRIBE @"sng_subscribe" -#define EVENT_SNG_BOOK @"sng_book" -#define EVENT_SNG_CONTENT_VIEW_LIST @"sng_content_view_list" -#define EVENT_SNG_INVITE @"sng_invite" -#define EVENT_SNG_SHARE @"sng_share" -#define EVENT_SNG_SUBMIT_APPLICATION @"sng_submit_application" -#define EVENT_SNG_UPDATE @"sng_update" -#define EVENT_SNG_ECOMMERCE_PURCHASE @"sng_ecommerce_purchase" -#define EVENT_SNG_VIEW_CART @"sng_view_cart" -#define EVENT_SNG_ACHIEVEMENT_UNLOCKED @"sng_achievement_unlocked" -#define EVENT_SNG_ADD_PAYMENT_INFO @"sng_add_payment_info" -#define EVENT_SNG_ADD_TO_CART @"sng_add_to_cart" -#define EVENT_SNG_ADD_TO_WISHLIST @"sng_add_to_wishlist" -#define EVENT_SNG_CHECKOUT_INITIATED @"sng_checkout_initiated" -#define EVENT_SNG_COMPLETE_REGISTRATION @"sng_complete_registration" -#define EVENT_SNG_CONTENT_VIEW @"sng_content_view" -#define EVENT_SNG_LEVEL_ACHIEVED @"sng_level_achieved" -#define EVENT_SNG_SEARCH @"sng_search" - -#endif \ No newline at end of file diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Singular.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/Singular.h deleted file mode 100644 index 830adb74..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/Singular.h +++ /dev/null @@ -1,161 +0,0 @@ -// -// Singular.h -// Singular SDK for iOS public API -// -// Copyright © 2010-2023 Singular Inc. All rights reserved. -// - -#import -#import -#import -#import "Attributes.h" -#import "Events.h" -#import "SingularAdData.h" - -// avoid circular include of SingularLinkParams -#ifndef SingularLinkParams -#import "SingularLinkParams.h" -#endif - -// avoid circular include of SingularConfig -#ifndef SingularConfig -#import "SingularConfig.h" -#endif - -@interface Singular : NSObject - -#pragma mark - Session lifecycle - -+ (BOOL)start:(SingularConfig *)config; - -+ (void)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret; -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andLaunchOptions:(NSDictionary *)launchOptions withSingularLinkHandler:(void (^)(SingularLinkParams *))handler; -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret - andLaunchOptions:(NSDictionary *)launchOptions withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andShortLinkResolveTimeout:(long)timeoutSec; -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andLaunchOptions:(NSDictionary *)launchOptions withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andSupportedDomains:(NSArray *)domains __attribute__((deprecated)); -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andLaunchOptions:(NSDictionary *)launchOptions withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andShortLinkResolveTimeout:(long)timeoutSec andSupportedDomains:(NSArray *)domains __attribute__((deprecated)); -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andUserActivity:(NSUserActivity *)userActivity withSingularLinkHandler:(void (^)(SingularLinkParams *))handler; -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andUserActivity:(NSUserActivity *)userActivity withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andShortLinkResolveTimeout:(long)timeoutSec; -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andUserActivity:(NSUserActivity *)userActivity withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andSupportedDomains:(NSArray *)domains __attribute__((deprecated)); -+ (BOOL)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andUserActivity:(NSUserActivity *)userActivity withSingularLinkHandler:(void (^)(SingularLinkParams *))handler andShortLinkResolveTimeout:(long)timeoutSec andSupportedDomains:(NSArray *)domains __attribute__((deprecated)); -+ (void)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andLaunchOptions:(NSDictionary *)launchOptions; -+ (void)startSession:(NSString *)apiKey withKey:(NSString *)apiSecret andLaunchURL:(NSURL *)url; -+ (void)reStartSession:(NSString *)apiKey withKey:(NSString *)apiSecret; -+ (BOOL)sessionStarted; -+ (void)endSession; - -+ (void)event:(NSString *)name; -+ (void)event:(NSString *)name withArgs:(NSDictionary *)args; -+ (void)eventWithArgs:(NSString *)name, ...; // use only subclasses of - // NSObject, not primitive types - // like int -+ (void)setDeviceCustomUserId:(NSString *)customUserId; - -+ (void)registerDeviceTokenForUninstall:(NSData *)deviceToken; -+ (void)registerDeferredDeepLinkHandler:(void (^)(NSString *deeplink))handler; -+ (int)setDeferredDeepLinkTimeout:(int)duration; - -+ (Singular *)shared; -+ (NSTimeInterval)sessionDuration; -+ (NSDate *)sessionStartDate; -+ (NSString *)sessionID; -+ (NSString *)version; -+ (NSString *)singularID; -+ (NSString *)singularKeyspace; -+ (void)setBufferLimit:(int)size; -@property (strong, nonatomic, readonly) NSString *applicationName; -@property (strong, nonatomic, readonly) NSString *applicationIdentifier; -+ (BOOL)processJSRequestWK:(WKWebView *)webView withURL:(NSURLRequest *)url; -@property (nonatomic) int minSessionDuration; // Default: 5 -+ (void)setMinSessionDuration:(int)seconds; - -#pragma mark - IAP -+ (void)initializeApStore; -+ (void)setAllowAutoIAPComplete:(BOOL)boolean; -+ (void)iapComplete:(id)transaction; -+ (void)iapComplete:(id)transaction withName:(NSString *)name; -+ (void)iapComplete:(id)transaction withAttributes:(id)value, ...; -+ (void)iapComplete:(id)transaction withName:(NSString *)name withAttributes:(id)value, ...; - -#pragma mark - DEMO -+ (void)setGender:(NSString *)gender; -+ (void)setAge:(id)age; - -#pragma mark - BATCHING -+ (int)batchInterval; -+ (void)setBatchInterval:(int)interval; -+ (BOOL)batchesEvents; -+ (void)setBatchesEvents:(BOOL)boolean; -+ (void)sendAllBatches; - -#pragma mark - ANIMESH UPDATE / REVENUE -+ (void)revenue:(id)transaction; -+ (void)revenue:(id)transaction withAttributes:(NSDictionary *)attributes; -+ (void)revenue:(NSString *)currency amount:(double)amount; -+ (void)revenue:(NSString *)currency amount:(double)amount withAttributes:(NSDictionary *)attributes; -+ (void)revenue:(NSString *)currency amount:(double)amount productSKU:(NSString *)productSKU productName:(NSString *)productName productCategory:(NSString *)productCategory productQuantity:(int)productQuantity productPrice:(double)productPrice; - -+ (void)customRevenue:(NSString *)eventname transaction:(id)transaction; -+ (void)customRevenue:(NSString *)eventname transaction:(id)transaction withAttributes:(NSDictionary *)attributes; -+ (void)customRevenue:(NSString *)eventname currency:(NSString *)currency amount:(double)amount; -+ (void)customRevenue:(NSString *)eventname currency:(NSString *)currency amount:(double)amount withAttributes:(NSDictionary *)attributes; -+ (void)customRevenue:(NSString *)eventname currency:(NSString *)currency amount:(double)amount productSKU:(NSString *)productSKU productName:(NSString *)productName productCategory:(NSString *)productCategory productQuantity:(int)productQuantity productPrice:(double)productPrice; - -+ (void)customRevenue:(NSData *)transactionJsonRepresentation productJsonRepresentation:(NSData *)productJsonRepresentation; -+ (void)customRevenue:(NSString *)eventName transactionJsonRepresentation:(NSData *)transactionJsonRepresentation productJsonRepresentation:(NSData *)productJsonRepresentation; - -+ (void)setCustomUserId:(NSString *)customUserId; -+ (void)unsetCustomUserId; - -+ (void)setSessionTimeout:(int)timeout; -+ (NSInteger)getFirstSessionUnixTime; - -+ (void)setWrapperName:(NSString *)name andVersion:(NSString *)version; - -#pragma mark - Global Properties - -+ (NSDictionary *)getGlobalProperties; -+ (BOOL)setGlobalProperty:(NSString *)key andValue:(NSString *)value overrideExisting:(BOOL)overrideExisting; -+ (void)unsetGlobalProperty:(NSString *)key; -+ (void)clearGlobalProperties; - -#pragma mark - GDPR helpers - -+ (void)trackingOptIn; -+ (void)trackingUnder13; -+ (void)stopAllTracking; -+ (void)resumeAllTracking; -+ (BOOL)isAllTrackingStopped; -+ (void)limitDataSharing:(BOOL)shouldLimitDataSharing; -+ (BOOL)getLimitDataSharing; - -#pragma mark - SKAN Methods - -+ (void)skanRegisterAppForAdNetworkAttribution; -+ (BOOL)skanUpdateConversionValue:(NSInteger)conversionValue; -+ (void)skanUpdateConversionValue:(NSInteger)conversionValue coarse:(NSInteger)coarse lock:(BOOL)lock; -+ (NSNumber *)skanGetConversionValue; - -#pragma mark - Singular Links - -+ (BOOL)isSingularLink:(id)linkHolder; - -#pragma mark - Admon Methods - -+ (void)adRevenue:(SingularAdData *)adData; - -#pragma mark - Referrer Links - -+ (void)createReferrerShortLink:(NSString *)baseLink - referrerName:(NSString *)referrerName - referrerId:(NSString *)referrerId - completionHandler:(void (^)(NSString *, NSError *))completionHandler; - -+ (void)createReferrerShortLink:(NSString *)baseLink - referrerName:(NSString *)referrerName - referrerId:(NSString *)referrerId - passthroughParams:(NSDictionary *)passthroughParams - completionHandler:(void (^)(NSString *, NSError *))completionHandler; - - -@end diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularAdData.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularAdData.h deleted file mode 100644 index 0feef56b..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularAdData.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SingularAdData.h -// Singular -// -// Copyright © 2010-2023 Singular Inc. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface SingularAdData : NSMutableDictionary - -- (id)initWithAdPlatfrom:(NSString*)adPlatform withCurrency:(NSString*)currency withRevenue:(NSNumber*)revenue; - -- (void)setNetworkName:(NSString*)networkName; -- (void)setAdType:(NSString*)adType; -- (void)setGroupType:(NSString*)adGroupType; -- (void)setImpressionId:(NSString*)impressionId; -- (void)setAdPlacementName:(NSString*)adPlacementName; -- (void)setAdUnitId:(NSString*)adUnitId; -- (void)setAdGroupId:(NSString*)adGroupId; -- (void)setAdGroupName:(NSString*)adGroupName; -- (void)setAdGroupPriority:(NSString*)adGroupPriority; -- (void)setPrecision:(NSString*)precision; -- (void)setPlacementId:(NSString*)placementId; -- (void)setAdUnitName:(NSString*)adUnitName; - -- (BOOL)hasRequiredParams; - -@end - -NS_ASSUME_NONNULL_END diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularConfig.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularConfig.h deleted file mode 100644 index f77153c3..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularConfig.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// SingularConfig.h -// Singular -// -// Copyright © 2010-2023 Singular Inc. All rights reserved. -// - -#import - -// avoid circular include of SingularLinkParams -#ifndef SingularLinkParams -#import "SingularLinkParams.h" -#endif - -@interface SingularConfig : NSObject - -// General Fields -@property NSString* apikey; -@property NSString* secret; -@property BOOL clipboardAttribution; - -// Singular Links fields -@property NSDictionary *launchOptions; -@property NSUserActivity* userActivity; -@property NSURL* openUrl; -@property void(^singularLinksHandler)(SingularLinkParams*); -@property long shortLinkResolveTimeOut; -@property NSArray* supportedDomains __attribute__((deprecated)); -@property NSArray* espDomains; - -// Global Properties fields -@property (readonly) NSMutableDictionary* globalProperties; - -// SKAN fields -@property BOOL skAdNetworkEnabled; -@property BOOL manualSkanConversionManagement; -@property void(^conversionValueUpdatedCallback)(NSInteger); -@property void(^conversionValuesUpdatedCallback)(NSNumber *, NSNumber *, BOOL); -@property NSInteger waitForTrackingAuthorizationWithTimeoutInterval; -@property void(^deviceAttributionCallback)(NSDictionary *); - -// SDID - Singular Device Identifier -typedef void (^SdidAccessorHandler)(NSString* result); -@property NSString *customSdid; -@property SdidAccessorHandler didSetSdidHandler; -@property SdidAccessorHandler sdidReceivedHandler; - --(id)initWithApiKey:(NSString*)apikey andSecret:(NSString*)secret; - --(void)setGlobalProperty:(NSString*)key withValue:(NSString*)value overrideExisting:(BOOL)overrideExisiting; --(NSString*)toJsonString; - -//Test for app extension -@property BOOL supportAppExtension; -@property NSString *appGroupName; - -@end diff --git a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularLinkParams.h b/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularLinkParams.h deleted file mode 100644 index 79b21ed8..00000000 --- a/singular/ios/src/main/bro-gen/Singular.lib/Headers/SingularLinkParams.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// SingularLinkParams.h -// Singular -// -// Copyright © 2010-2023 Singular Inc. All rights reserved. -// - -#import - -@interface SingularLinkParams: NSObject - -- (id) initWithDeeplink:(NSString*)deeplink passthrough:(NSString*)passthrough isDeferred:(BOOL)isDeferred url:(NSURL*)url; - -- (NSString *)getDeepLink; -- (NSString *)getPassthrough; -- (BOOL)isDeferred; - -/// Returns a lazy-initialized NSDictionary with key-value pairs of the query parameters in the evaluated URL -- (NSDictionary *)getUrlParameters; - -@end diff --git a/singular/ios/src/main/java/org/robovm/pods/singular/Singular.java b/singular/ios/src/main/java/org/robovm/pods/singular/Singular.java index ba7863cb..70115906 100644 --- a/singular/ios/src/main/java/org/robovm/pods/singular/Singular.java +++ b/singular/ios/src/main/java/org/robovm/pods/singular/Singular.java @@ -199,14 +199,19 @@ public Singular() {} public static native void setGender(String gender); @Method(selector = "setAge:") public static native void setAge(NSObject age); + @Deprecated @Method(selector = "batchInterval") public static native int batchInterval(); + @Deprecated @Method(selector = "setBatchInterval:") public static native void setBatchInterval(int interval); + @Deprecated @Method(selector = "batchesEvents") public static native boolean batchesEvents(); + @Deprecated @Method(selector = "setBatchesEvents:") public static native void setBatchesEvents(boolean v); + @Deprecated @Method(selector = "sendAllBatches") public static native void sendAllBatches(); @Method(selector = "revenue:")