Skip to content

Commit cbb5efc

Browse files
author
Jenkins CI
committed
1 parent d0d12a6 commit cbb5efc

File tree

93 files changed

+84
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+84
-70
lines changed

Module-Geozones-Source/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext {
2-
pushwoosh = "6.2.7"
2+
pushwoosh = "6.3.3"
33
}
44

55
dependencies {

Module-Geozones-Source/android/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 6.0.4
5+
version: 6.0.5
66
apiversion: 4
77
architectures: arm64-v8a armeabi-v7a x86 x86_64
88
description: pushwoosh_geozones
Binary file not shown.

Module-Geozones-Source/ios/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 6.0.4
5+
version: 6.0.5
66
apiversion: 2
77
architectures: armv7 arm64 i386 x86_64
88
description: PushwooshGeozones

Module-Source/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext {
2-
pushwoosh = "6.2.7"
2+
pushwoosh = "6.3.3"
33
}
44

55
dependencies {

Module-Source/android/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 6.0.4
5+
version: 6.0.5
66
apiversion: 4
77
architectures: arm64-v8a armeabi-v7a x86 x86_64
88
description: pushnotifications

Module-Source/ios/Library/PWRichMediaStyle.h

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
//
66

77
#import <Foundation/Foundation.h>
8+
9+
#if TARGET_OS_IOS || TARGET_OS_WATCH
810
#import <UIKit/UIKit.h>
11+
#endif
912

1013
FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration;
1114

@@ -17,13 +20,14 @@ FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration;
1720
/**
1821
This method can be used to animate Rich Media presenting view.
1922
*/
23+
#if TARGET_OS_IOS || TARGET_OS_WATCH
2024
- (void)runPresentingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion;
2125

2226
/**
2327
This method can be used to animate Rich Media dismissing view.
2428
*/
2529
- (void)runDismissingAnimationWithContentView:(UIView *)contentView parentView:(UIView *)parentView completion:(dispatch_block_t)completion;
26-
30+
#endif
2731
@end
2832

2933
/**
@@ -52,17 +56,16 @@ FOUNDATION_EXPORT NSTimeInterval const PWRichMediaStyleDefaultAnimationDuration;
5256
/**
5357
Custom Rich Media loading view. It is shown while Rich Media is loading.
5458
*/
59+
#if TARGET_OS_IOS || TARGET_OS_WATCH
5560
@interface PWLoadingView : UIView
5661

5762
@property (nonatomic) IBOutlet UIActivityIndicatorView *activityIndicatorView;
5863
@property (nonatomic) IBOutlet UIButton *cancelLoadingButton;
5964

6065
@end
6166

62-
6367
typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void);
64-
65-
68+
#endif
6669
/**
6770
'PWRichMediaStyle' class allows customizing the appearance of Rich Media pages.
6871
*/
@@ -71,7 +74,11 @@ typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void);
7174
/**
7275
Background color of Rich Media pages.
7376
*/
77+
#if TARGET_OS_IOS || TARGET_OS_WATCH
7478
@property (nonatomic) UIColor *backgroundColor;
79+
#elif TARGET_OS_OSX
80+
@property (nonatomic) NSColor *backgroundColor;
81+
#endif
7582

7683
/**
7784
Delegate to manage Rich Media presenting animation.
@@ -88,8 +95,9 @@ typedef PWLoadingView *(^PWRichMediaLoadingViewBlock)(void);
8895
};
8996
@endcode
9097
*/
98+
#if TARGET_OS_IOS
9199
@property (nonatomic) PWRichMediaLoadingViewBlock loadingViewBlock;
92-
100+
#endif
93101
/**
94102
Delay of the close button presenting in seconds.
95103
*/

Module-Source/ios/Library/Pushwoosh.h

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
#endif
2020

21-
22-
#define PUSHWOOSH_VERSION @"6.1.1"
21+
#define PUSHWOOSH_VERSION @"6.2.5"
2322

2423

2524
@class Pushwoosh, PWMessage, PWNotificationCenterDelegateProxy;
@@ -391,15 +390,6 @@ Unregisters from push notifications.
391390
*/
392391
- (void)setUser:(NSString *)userId email:(NSString *)email completion:(void(^)(NSError * error))completion;
393392

394-
/**
395-
Set User indentifier. This could be Facebook ID, username or email, or any other user ID.
396-
This allows data and events to be matched across multiple user devices.
397-
398-
@param userId user identifier
399-
@param email user's email string
400-
*/
401-
- (void)setUser:(NSString *)userId email:(NSString *)email;
402-
403393
/**
404394
Register emails list associated to the current user.
405395
If setEmails succeeds competion is called with nil argument. If setEmails fails completion is called with error.
@@ -440,20 +430,35 @@ Unregisters from push notifications.
440430
*/
441431
- (void)mergeUserId:(NSString *)oldUserId to:(NSString *)newUserId doMerge:(BOOL)doMerge completion:(void (^)(NSError *error))completion;
442432

433+
/**
434+
Starts communication with Pushwoosh server.
435+
*/
436+
- (void)startServerCommunication;
437+
438+
/**
439+
Stops communication with Pushwoosh server.
440+
*/
441+
- (void)stopServerCommunication;
442+
443443
/**
444444
Process URL of some deep link. Primarly used for register test devices.
445445
446446
@param url Deep Link URL
447447
*/
448+
#if TARGET_OS_IOS || TARGET_OS_WATCH
448449
- (BOOL)handleOpenURL:(NSURL *)url;
450+
#endif
449451

450452
@end
451453

452454
/**
453455
`PWNotificationCenterDelegateProxy` class handles notifications on iOS 10 and forwards methods of UNUserNotificationCenterDelegate to all added delegates.
454456
*/
457+
#if TARGET_OS_IOS || TARGET_OS_WATCH
455458
@interface PWNotificationCenterDelegateProxy : NSObject <UNUserNotificationCenterDelegate>
456-
459+
#elif TARGET_OS_OSX
460+
@interface PWNotificationCenterDelegateProxy : NSObject <NSUserNotificationCenterDelegate>
461+
#endif
457462
/**
458463
Returns UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10
459464
*/
@@ -466,8 +471,9 @@ Unregisters from push notifications.
466471
/**
467472
Adds extra UNUserNotificationCenterDelegate that handles foreground push notifications on iOS10.
468473
*/
474+
#if TARGET_OS_IOS || TARGET_OS_WATCH
469475
- (void)addNotificationCenterDelegate:(id<UNUserNotificationCenterDelegate>)delegate;
470-
476+
#endif
471477
@end
472478

473479

-20.4 KB
Binary file not shown.

Module-Source/ios/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 6.0.4
5+
version: 6.0.5
66
apiversion: 2
77
architectures: armv7 arm64 i386 x86_64
88
description: PushwooshModule

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.aar.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.aar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.aar.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.aar.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.pom.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.pom.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.pom.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/6.0.4/geozones-6.0.4.pom.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/maven-metadata.xml.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/maven-metadata.xml.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/maven-metadata.xml.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/m2repository/com/pushwoosh/geozones/maven-metadata.xml.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f380a52e99b2965e632eb2a5728bf6bd
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c2bb5bab64ef1b754dec0573bc83836b901078cb
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
797a3c19ddb0e4ba5244882132387888eb4251276cf20e95fcf22d7032adfd6a
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
de36e201272c702991d020134f84756e8dac1c5bb25d30ff2ee6045eba37aba7b4d0a0cb0d9c8d07680b3d39a08059ebd551d50d9c2ce766586fcf4e7aa64afa
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.pushwoosh</groupId>
55
<artifactId>geozones</artifactId>
6-
<version>6.0.4</version>
6+
<version>6.0.5</version>
77
<packaging>aar</packaging>
88
<dependencies>
99
<dependency>
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>com.pushwoosh</groupId>
2121
<artifactId>pushwoosh-location</artifactId>
22-
<version>6.2.7</version>
22+
<version>6.3.3</version>
2323
</dependency>
2424
</dependencies>
2525
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6c0ff6fdbd849939c587fee195701d84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
66216f834427c31a55a150410d3ae6b4764e82f6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bd4372c2c7b83e39736de09fc8d733d99b9eb05da4ff780d4fdee718af364cd7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
04bf4ba0a9fb3642255c5e63e0c452f26deaebec72ef63a16b194373ebde10723c9a653fc6c6f50893bbb1d6f61ad77cd7dd0553f8a26c8fdc4d387e6a75e72b
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<groupId>com.pushwoosh</groupId>
44
<artifactId>geozones</artifactId>
55
<versioning>
6-
<latest>6.0.4</latest>
7-
<release>6.0.4</release>
6+
<latest>6.0.5</latest>
7+
<release>6.0.5</release>
88
<versions>
9-
<version>6.0.4</version>
9+
<version>6.0.5</version>
1010
</versions>
11-
<lastUpdated>20210408121720</lastUpdated>
11+
<lastUpdated>20210920073713</lastUpdated>
1212
</versioning>
1313
</metadata>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e78ef3ebc75eca136bd633f485359894
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
700b4892c04abb209bda7417a93a42d084ccc83f
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
73677d2ce3ba2910d8906a47971ace543207bd6cadae014eabf45df3399c572c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f5f39465d9de7935f355a4a6e7a9ab7d5b21f61271f89eb18d59375ab03166a3498ff4d9e834200793c661dfa0ce869e94e6b9bf06cfc978ae6a69edc5ba1aa8

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.4/manifest renamed to Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.geozones/6.0.5/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 6.0.4
5+
version: 6.0.5
66
apiversion: 4
77
architectures: arm64-v8a armeabi-v7a x86 x86_64
88
description: pushwoosh_geozones

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.aar.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.aar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.aar.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.aar.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.pom.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.pom.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.pom.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/6.0.4/module-6.0.4.pom.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/maven-metadata.xml.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/maven-metadata.xml.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/maven-metadata.xml.sha256

Lines changed: 0 additions & 1 deletion
This file was deleted.

Titanium-Sample-iOS-Android/modules/android/com.pushwoosh.module/6.0.4/m2repository/com/pushwoosh/module/maven-metadata.xml.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9f4ce532e9fb04d85b3c59aff6b5ac93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7bc1dd1940a1b898f7412c9c3fb6d449a2e606c1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
63a1fdedf20cdbcf80d6127d425947ecdf640e1f2691da5a861079cdd03bb554
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8187844df925723e84182bd31fa465398fc1b187bafc07d4398dc61060e82e12de69f30ae23ddd522117f242aafea525eeaf138c5214204c42d067162adef9f7
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.pushwoosh</groupId>
55
<artifactId>module</artifactId>
6-
<version>6.0.4</version>
6+
<version>6.0.5</version>
77
<packaging>aar</packaging>
88
<dependencies>
99
<dependency>
@@ -19,27 +19,27 @@
1919
<dependency>
2020
<groupId>com.pushwoosh</groupId>
2121
<artifactId>pushwoosh</artifactId>
22-
<version>6.2.7</version>
22+
<version>6.3.3</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>com.pushwoosh</groupId>
2626
<artifactId>pushwoosh-firebase</artifactId>
27-
<version>6.2.7</version>
27+
<version>6.3.3</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>com.pushwoosh</groupId>
3131
<artifactId>pushwoosh-amazon</artifactId>
32-
<version>6.2.7</version>
32+
<version>6.3.3</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.pushwoosh</groupId>
3636
<artifactId>pushwoosh-badge</artifactId>
37-
<version>6.2.7</version>
37+
<version>6.3.3</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.google.firebase</groupId>
4141
<artifactId>firebase-messaging</artifactId>
42-
<version>(+,20.2.2)</version>
42+
<version>(+,20.0.99]</version>
4343
</dependency>
4444
</dependencies>
4545
</project>

0 commit comments

Comments
 (0)