diff --git a/Example/harmony_use_pushy/bun.lock b/Example/harmony_use_pushy/bun.lock index ab8dd2a5..bd90a0e4 100644 --- a/Example/harmony_use_pushy/bun.lock +++ b/Example/harmony_use_pushy/bun.lock @@ -7,7 +7,7 @@ "@react-native-oh/react-native-harmony": "^0.72.59", "react": "18.2.0", "react-native": "0.72.5", - "react-native-update": "^10.26.4", + "react-native-update": "latest", }, "devDependencies": { "@babel/core": "^7.20.0", @@ -1339,7 +1339,7 @@ "react-native": ["react-native@0.72.5", "", { "dependencies": { "@jest/create-cache-key-function": "^29.2.1", "@react-native-community/cli": "11.3.7", "@react-native-community/cli-platform-android": "11.3.7", "@react-native-community/cli-platform-ios": "11.3.7", "@react-native/assets-registry": "^0.72.0", "@react-native/codegen": "^0.72.7", "@react-native/gradle-plugin": "^0.72.11", "@react-native/js-polyfills": "^0.72.1", "@react-native/normalize-colors": "^0.72.0", "@react-native/virtualized-lists": "^0.72.8", "abort-controller": "^3.0.0", "anser": "^1.4.9", "base64-js": "^1.1.2", "deprecated-react-native-prop-types": "4.1.0", "event-target-shim": "^5.0.1", "flow-enums-runtime": "^0.0.5", "invariant": "^2.2.4", "jest-environment-node": "^29.2.1", "jsc-android": "^250231.0.0", "memoize-one": "^5.0.0", "metro-runtime": "0.76.8", "metro-source-map": "0.76.8", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "pretty-format": "^26.5.2", "promise": "^8.3.0", "react-devtools-core": "^4.27.2", "react-refresh": "^0.4.0", "react-shallow-renderer": "^16.15.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.24.0-canary-efb381bbf-20230505", "stacktrace-parser": "^0.1.10", "use-sync-external-store": "^1.0.0", "whatwg-fetch": "^3.0.0", "ws": "^6.2.2", "yargs": "^17.6.2" }, "peerDependencies": { "react": "18.2.0" }, "bin": { "react-native": "cli.js" } }, "sha512-oIewslu5DBwOmo7x5rdzZlZXCqDIna0R4dUwVpfmVteORYLr4yaZo5wQnMeR+H7x54GaMhmgeqp0ZpULtulJFg=="], - "react-native-update": ["react-native-update@10.28.2", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-hNk0pm6bFxEy8d7tDCTIc0e5QryVKbRCmbhyeNjW5ACxL3EYMH0KCCuk5VAWattBQsTtrYTawlkxNNAWyLF+hA=="], + "react-native-update": ["react-native-update@10.28.10", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-ZoE/MvunB7tE465jy582dX6DeHrmO3oCelBPa74jmoy1QhyvwqbfLCNg8pMT9zqoQ/s6qfyT559pxOpjU9KtLA=="], "react-native-url-polyfill": ["react-native-url-polyfill@2.0.0", "", { "dependencies": { "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "react-native": "*" } }, "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA=="], diff --git a/Example/harmony_use_pushy/harmony/build-profile.json5 b/Example/harmony_use_pushy/harmony/build-profile.json5 index 8f4d86ec..1e69556b 100644 --- a/Example/harmony_use_pushy/harmony/build-profile.json5 +++ b/Example/harmony_use_pushy/harmony/build-profile.json5 @@ -36,10 +36,6 @@ ] } ] - }, - { - name: 'pushy', - srcPath: '../node_modules/react-native-update/harmony', } ] } \ No newline at end of file diff --git a/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5 b/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5 index 5147e75b..aca97746 100644 --- a/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5 +++ b/Example/harmony_use_pushy/harmony/entry/oh-package-lock.json5 @@ -6,7 +6,7 @@ "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38", - "pushy@../../node_modules/react-native-update/harmony": "pushy@../../node_modules/react-native-update/harmony" + "pushy@../../node_modules/react-native-update/harmony/pushy.har": "pushy@../../node_modules/react-native-update/harmony/pushy.har" }, "packages": { "@rnoh/react-native-openharmony@0.72.38": { @@ -16,10 +16,10 @@ "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har", "registryType": "ohpm" }, - "pushy@../../node_modules/react-native-update/harmony": { + "pushy@../../node_modules/react-native-update/harmony/pushy.har": { "name": "pushy", "version": "3.1.0-0.0.7", - "resolved": "../../node_modules/react-native-update/harmony", + "resolved": "../../node_modules/react-native-update/harmony/pushy.har", "registryType": "local", "dependencies": { "@rnoh/react-native-openharmony": "^0.72.38" diff --git a/Example/harmony_use_pushy/harmony/entry/oh-package.json5 b/Example/harmony_use_pushy/harmony/entry/oh-package.json5 index 0d832c9f..4ab46020 100644 --- a/Example/harmony_use_pushy/harmony/entry/oh-package.json5 +++ b/Example/harmony_use_pushy/harmony/entry/oh-package.json5 @@ -7,7 +7,7 @@ "license": "", "dependencies": { "@rnoh/react-native-openharmony": "0.72.38", - "pushy": "file:../../node_modules/react-native-update/harmony" + "pushy": "file:../../node_modules/react-native-update/harmony/pushy.har" } } diff --git a/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json b/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json index 7c3ad724..76360302 100644 --- a/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json +++ b/Example/harmony_use_pushy/harmony/entry/src/main/resources/rawfile/meta.json @@ -1,4 +1,4 @@ { - "pushy_build_time": "2025-04-30T02:46:33.340Z", + "pushy_build_time": "2025-05-12T06:00:15.878Z", "versionName": "1.0.0" } \ No newline at end of file diff --git a/Example/harmony_use_pushy/package.json b/Example/harmony_use_pushy/package.json index 64890de4..56fcf6aa 100644 --- a/Example/harmony_use_pushy/package.json +++ b/Example/harmony_use_pushy/package.json @@ -18,7 +18,7 @@ "@react-native-oh/react-native-harmony": "^0.72.59", "react": "18.2.0", "react-native": "0.72.5", - "react-native-update": "^10.26.4" + "react-native-update": "latest" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/harmony/oh_modules/@rnoh/react-native-openharmony b/harmony/oh_modules/@rnoh/react-native-openharmony deleted file mode 120000 index 37f4a5ea..00000000 --- a/harmony/oh_modules/@rnoh/react-native-openharmony +++ /dev/null @@ -1 +0,0 @@ -../../../../../harmony/oh_modules/.ohpm/@rnoh+react-native-openharmony@0.72.38/oh_modules/@rnoh/react-native-openharmony \ No newline at end of file diff --git a/harmony/pushy.har b/harmony/pushy.har new file mode 100644 index 00000000..5ae90c03 Binary files /dev/null and b/harmony/pushy.har differ diff --git a/harmony/BuildProfile.ets b/harmony/pushy/BuildProfile.ets similarity index 100% rename from harmony/BuildProfile.ets rename to harmony/pushy/BuildProfile.ets diff --git a/harmony/OAT.xml b/harmony/pushy/OAT.xml similarity index 100% rename from harmony/OAT.xml rename to harmony/pushy/OAT.xml diff --git a/harmony/README.md b/harmony/pushy/README.md similarity index 100% rename from harmony/README.md rename to harmony/pushy/README.md diff --git a/harmony/build-profile.json5 b/harmony/pushy/build-profile.json5 similarity index 100% rename from harmony/build-profile.json5 rename to harmony/pushy/build-profile.json5 diff --git a/harmony/hvigorfile.ts b/harmony/pushy/hvigorfile.ts similarity index 100% rename from harmony/hvigorfile.ts rename to harmony/pushy/hvigorfile.ts diff --git a/harmony/index.ets b/harmony/pushy/index.ets similarity index 100% rename from harmony/index.ets rename to harmony/pushy/index.ets diff --git a/harmony/oh-package-lock.json5 b/harmony/pushy/oh-package-lock.json5 similarity index 100% rename from harmony/oh-package-lock.json5 rename to harmony/pushy/oh-package-lock.json5 diff --git a/harmony/oh-package.json5 b/harmony/pushy/oh-package.json5 similarity index 100% rename from harmony/oh-package.json5 rename to harmony/pushy/oh-package.json5 diff --git a/harmony/src/main/cpp/CMakeLists.txt b/harmony/pushy/src/main/cpp/CMakeLists.txt similarity index 100% rename from harmony/src/main/cpp/CMakeLists.txt rename to harmony/pushy/src/main/cpp/CMakeLists.txt diff --git a/harmony/src/main/cpp/PushyPackage.h b/harmony/pushy/src/main/cpp/PushyPackage.h similarity index 100% rename from harmony/src/main/cpp/PushyPackage.h rename to harmony/pushy/src/main/cpp/PushyPackage.h diff --git a/harmony/src/main/cpp/PushyTurboModule.cpp b/harmony/pushy/src/main/cpp/PushyTurboModule.cpp similarity index 100% rename from harmony/src/main/cpp/PushyTurboModule.cpp rename to harmony/pushy/src/main/cpp/PushyTurboModule.cpp diff --git a/harmony/src/main/cpp/PushyTurboModule.h b/harmony/pushy/src/main/cpp/PushyTurboModule.h similarity index 100% rename from harmony/src/main/cpp/PushyTurboModule.h rename to harmony/pushy/src/main/cpp/PushyTurboModule.h diff --git a/harmony/src/main/cpp/hpatch.c b/harmony/pushy/src/main/cpp/hpatch.c similarity index 100% rename from harmony/src/main/cpp/hpatch.c rename to harmony/pushy/src/main/cpp/hpatch.c diff --git a/harmony/src/main/cpp/hpatch.h b/harmony/pushy/src/main/cpp/hpatch.h similarity index 100% rename from harmony/src/main/cpp/hpatch.h rename to harmony/pushy/src/main/cpp/hpatch.h diff --git a/harmony/src/main/cpp/pushy.c b/harmony/pushy/src/main/cpp/pushy.c similarity index 100% rename from harmony/src/main/cpp/pushy.c rename to harmony/pushy/src/main/cpp/pushy.c diff --git a/harmony/src/main/cpp/pushy.h b/harmony/pushy/src/main/cpp/pushy.h similarity index 100% rename from harmony/src/main/cpp/pushy.h rename to harmony/pushy/src/main/cpp/pushy.h diff --git a/harmony/src/main/ets/DownloadTask.ts b/harmony/pushy/src/main/ets/DownloadTask.ts similarity index 100% rename from harmony/src/main/ets/DownloadTask.ts rename to harmony/pushy/src/main/ets/DownloadTask.ts diff --git a/harmony/src/main/ets/DownloadTaskParams.ts b/harmony/pushy/src/main/ets/DownloadTaskParams.ts similarity index 100% rename from harmony/src/main/ets/DownloadTaskParams.ts rename to harmony/pushy/src/main/ets/DownloadTaskParams.ts diff --git a/harmony/src/main/ets/EventHub.ts b/harmony/pushy/src/main/ets/EventHub.ts similarity index 100% rename from harmony/src/main/ets/EventHub.ts rename to harmony/pushy/src/main/ets/EventHub.ts diff --git a/harmony/src/main/ets/Logger.ts b/harmony/pushy/src/main/ets/Logger.ts similarity index 100% rename from harmony/src/main/ets/Logger.ts rename to harmony/pushy/src/main/ets/Logger.ts diff --git a/harmony/src/main/ets/PushyFileJSBundleProvider.ets b/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets similarity index 100% rename from harmony/src/main/ets/PushyFileJSBundleProvider.ets rename to harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets diff --git a/harmony/src/main/ets/PushyPackage.ts b/harmony/pushy/src/main/ets/PushyPackage.ts similarity index 100% rename from harmony/src/main/ets/PushyPackage.ts rename to harmony/pushy/src/main/ets/PushyPackage.ts diff --git a/harmony/src/main/ets/PushyTurboModule.ts b/harmony/pushy/src/main/ets/PushyTurboModule.ts similarity index 100% rename from harmony/src/main/ets/PushyTurboModule.ts rename to harmony/pushy/src/main/ets/PushyTurboModule.ts diff --git a/harmony/src/main/ets/UpdateContext.ts b/harmony/pushy/src/main/ets/UpdateContext.ts similarity index 100% rename from harmony/src/main/ets/UpdateContext.ts rename to harmony/pushy/src/main/ets/UpdateContext.ts diff --git a/harmony/src/main/ets/UpdateModuleImpl.ts b/harmony/pushy/src/main/ets/UpdateModuleImpl.ts similarity index 100% rename from harmony/src/main/ets/UpdateModuleImpl.ts rename to harmony/pushy/src/main/ets/UpdateModuleImpl.ts diff --git a/harmony/src/main/module.json5 b/harmony/pushy/src/main/module.json5 similarity index 100% rename from harmony/src/main/module.json5 rename to harmony/pushy/src/main/module.json5 diff --git a/harmony/src/main/resources/base/element/string.json b/harmony/pushy/src/main/resources/base/element/string.json similarity index 100% rename from harmony/src/main/resources/base/element/string.json rename to harmony/pushy/src/main/resources/base/element/string.json diff --git a/harmony/src/main/resources/en_US/element/string.json b/harmony/pushy/src/main/resources/en_US/element/string.json similarity index 100% rename from harmony/src/main/resources/en_US/element/string.json rename to harmony/pushy/src/main/resources/en_US/element/string.json diff --git a/harmony/src/main/resources/zh_CN/element/string.json b/harmony/pushy/src/main/resources/zh_CN/element/string.json similarity index 100% rename from harmony/src/main/resources/zh_CN/element/string.json rename to harmony/pushy/src/main/resources/zh_CN/element/string.json diff --git a/harmony/ts.ts b/harmony/pushy/ts.ts similarity index 100% rename from harmony/ts.ts rename to harmony/pushy/ts.ts diff --git a/harmony/src/main/cpp/HDiffPatch b/harmony/src/main/cpp/HDiffPatch deleted file mode 160000 index eb959d67..00000000 --- a/harmony/src/main/cpp/HDiffPatch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb959d671cd94281ca763d609f638b5d248df3a3 diff --git a/harmony/src/main/cpp/lzma b/harmony/src/main/cpp/lzma deleted file mode 160000 index c80bb80b..00000000 --- a/harmony/src/main/cpp/lzma +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c80bb80bbbac61da7ec02d12fb497851b1f59635