Skip to content

Commit cc1e577

Browse files
committed
Update version to 10.36.5 in package.json and simplify version change checks in RCTPushy.mm
1 parent 8ac7b83 commit cc1e577

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

harmony/src/main/cpp/HDiffPatch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit eb959d671cd94281ca763d609f638b5d248df3a3

harmony/src/main/cpp/lzma

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit c80bb80bbbac61da7ec02d12fb497851b1f59635

ios/RCTPushy/RCTPushy.mm

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -77,41 +77,16 @@ + (NSURL *)bundleURL
7777
NSString *storedPackageVersion = [defaults stringForKey:paramPackageVersion];
7878
NSString *storedBuildTime = [defaults stringForKey:paramBuildTime];
7979

80-
RCTLogInfo(@"RCTPushy -- Version check: curPackageVersion=%@, curBuildTime=%@, storedPackageVersion=%@, storedBuildTime=%@",
81-
curPackageVersion ?: @"nil",
82-
curBuildTime ?: @"nil",
83-
storedPackageVersion ?: @"nil",
84-
storedBuildTime ?: @"nil");
85-
86-
// If stored versions don't exist, write current versions first
87-
if (!storedPackageVersion) {
88-
RCTLogInfo(@"RCTPushy -- No stored package version found, writing current version: %@", curPackageVersion);
89-
[defaults setObject:curPackageVersion forKey:paramPackageVersion];
90-
storedPackageVersion = curPackageVersion;
91-
}
92-
93-
if (!storedBuildTime) {
94-
RCTLogInfo(@"RCTPushy -- No stored build time found, writing current build time: %@", curBuildTime);
95-
[defaults setObject:curBuildTime forKey:paramBuildTime];
96-
storedBuildTime = curBuildTime;
97-
}
98-
99-
BOOL packageVersionChanged = ![curPackageVersion isEqualToString:storedPackageVersion];
100-
BOOL buildTimeChanged = curBuildTime && ![curBuildTime isEqualToString:storedBuildTime];
101-
102-
RCTLogInfo(@"RCTPushy -- Version change check: packageVersionChanged=%d, buildTimeChanged=%d",
103-
packageVersionChanged, buildTimeChanged);
80+
BOOL packageVersionChanged = !storedPackageVersion || ![curPackageVersion isEqualToString:storedPackageVersion];
81+
BOOL buildTimeChanged = !storedBuildTime || ![curBuildTime isEqualToString:storedBuildTime];
10482

10583
if (packageVersionChanged || buildTimeChanged) {
106-
RCTLogInfo(@"RCTPushy -- Version or build time changed, clearing update data. packageVersionChanged=%d, buildTimeChanged=%d",
107-
packageVersionChanged, buildTimeChanged);
10884
// Clear all update data and store new versions
10985
[defaults setObject:nil forKey:keyPushyInfo];
11086
[defaults setObject:nil forKey:keyHashInfo];
11187
[defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
11288
[defaults setObject:curPackageVersion forKey:paramPackageVersion];
11389
[defaults setObject:curBuildTime forKey:paramBuildTime];
114-
11590
}
11691

11792
NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-update",
3-
"version": "10.36.4",
3+
"version": "10.36.5",
44
"description": "react-native hot update",
55
"main": "src/index",
66
"scripts": {

0 commit comments

Comments
 (0)