diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index 9785859..eed1cc8 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -9,32 +9,32 @@ runs: uses: actions/upload-artifact@v4 with: name: app-v${{ env.PACKAGE_VERSION }}-arm64-v8a-release - path: android/app/build/outputs/apk/release/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk + path: android/app/build/outputs/apk/release/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk - name: Upload Artifact armeabi-v7a if: env.PACKAGE_TYPE == null uses: actions/upload-artifact@v4 with: name: app-v${{ env.PACKAGE_VERSION }}-armeabi-v7a-release - path: android/app/build/outputs/apk/release/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk + path: android/app/build/outputs/apk/release/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk - name: Upload Artifact universal if: env.PACKAGE_TYPE != 'Android_SL' uses: actions/upload-artifact@v4 with: name: app-v${{ env.PACKAGE_VERSION }}-universal-release - path: android/app/build/outputs/apk/release/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-universal.apk + path: android/app/build/outputs/apk/release/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-universal.apk - name: Upload Artifact x86_64 if: env.PACKAGE_TYPE == null uses: actions/upload-artifact@v4 with: name: app-v${{ env.PACKAGE_VERSION }}-x86_64-release - path: android/app/build/outputs/apk/release/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-x86_64.apk + path: android/app/build/outputs/apk/release/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-x86_64.apk - name: Upload Artifact x86 if: env.PACKAGE_TYPE == null uses: actions/upload-artifact@v4 with: name: app-v${{ env.PACKAGE_VERSION }}-x86-release - path: android/app/build/outputs/apk/release/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-x86.apk + path: android/app/build/outputs/apk/release/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-x86.apk diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b938067..ebbc4c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: run: | cd android chmod +x ./gradlew - ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE='debug.keystore' -PMYAPP_UPLOAD_KEY_ALIAS='androiddebugkey' -PMYAPP_UPLOAD_STORE_PASSWORD='android' -PMYAPP_UPLOAD_KEY_PASSWORD='android' + ./gradlew assembleRelease -PMYAPP_UPLOAD_STORE_FILE=${{ secrets.KEY_FILE }} -PMYAPP_UPLOAD_KEY_ALIAS=${{ secrets.KEY_ALIAS }}' -PMYAPP_UPLOAD_STORE_PASSWORD=${{ secrets.ALIAS_PASSWORD }} -PMYAPP_UPLOAD_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }} # Push tag to GitHub if package.json version's tag is not tagged - name: Get package version @@ -78,11 +78,11 @@ jobs: draft: false tag_name: v${{ env.PACKAGE_VERSION }} files: | - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-x86_64.apk - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-x86.apk - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-universal.apk - artifacts/lx-music-mobile-mod-v${{ env.PACKAGE_VERSION }}-sl-arm64-v8a.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-arm64-v8a.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-armeabi-v7a.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-x86_64.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-x86.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-universal.apk + artifacts/ikun-music-mobile-v${{ env.PACKAGE_VERSION }}-sl-arm64-v8a.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/android/app/debug.keystore b/android/app/debug.keystore deleted file mode 100644 index 364e105..0000000 Binary files a/android/app/debug.keystore and /dev/null differ diff --git a/package.json b/package.json index f9e98c0..ef6413d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "lx-music-mobile-mod", + "name": "ikun-music-mobile", "version": "3.4.8", "versionCode": 69, "private": true, @@ -28,7 +28,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/ikunshare/lx-music-mobile-mod.git" + "url": "git+https://github.com/ikunshare/ikun-music-mobile.git" }, "keywords": [ "music-player", @@ -40,9 +40,9 @@ }, "license": "Apache-2.0", "bugs": { - "url": "https://github.com/ikunshare/lx-music-mobile-mod/issues" + "url": "https://github.com/ikunshare/ikun-music-mobile/issues" }, - "homepage": "https://github.com/ikunshare/lx-music-mobile-mod#readme", + "homepage": "https://github.com/ikunshare/ikun-music-mobile#readme", "dependencies": { "@craftzdog/react-native-buffer": "^6.0.5", "@react-native-async-storage/async-storage": "^2.0.0", diff --git a/src/navigation/components/PactModal.tsx b/src/navigation/components/PactModal.tsx index 5126bac..f814af2 100644 --- a/src/navigation/components/PactModal.tsx +++ b/src/navigation/components/PactModal.tsx @@ -17,7 +17,7 @@ const Content = () => { const theme = useTheme() const openHomePage = () => { - void openUrl('https://github.com/ikunshare/lx-music-mobile-mod#readme') + void openUrl('https://github.com/ikunshare/ikun-music-mobile#readme') } const openLicensePage = () => { void openUrl('http://www.apache.org/licenses/LICENSE-2.0') diff --git a/src/screens/Home/Views/Setting/settings/About.tsx b/src/screens/Home/Views/Setting/settings/About.tsx index 0d57528..dbc3b66 100644 --- a/src/screens/Home/Views/Setting/settings/About.tsx +++ b/src/screens/Home/Views/Setting/settings/About.tsx @@ -17,7 +17,7 @@ export default memo(() => { const theme = useTheme() const t = useI18n() const openHomePage = () => { - void openUrl('https://github.com/ikunshare/lx-music-mobile-mod#readme') + void openUrl('https://github.com/ikunshare/ikun-music-mobile#readme') } const openNetdiskPage = () => { void openUrl('https://www.lanzoui.com/s/LXMusic') @@ -45,7 +45,7 @@ export default memo(() => { 本软件完全免费,代码已开源,开源地址: - https://github.com/ikunshare/lx-music-mobile-mod + https://github.com/ikunshare/ikun-music-mobile diff --git a/src/utils/version.js b/src/utils/version.js index 88d2d5a..874452b 100644 --- a/src/utils/version.js +++ b/src/utils/version.js @@ -13,14 +13,9 @@ const abis = [ ] const address = [ - [`https://raw.githubusercontent.com/${author.name}/${name}/master/publish/version.json`, 'direct'], - ['https://registry.npmjs.org/lx-music-mobile-version-info/latest', 'npm'], - [`https://cdn.jsdelivr.net/gh/${author.name}/${name}/publish/version.json`, 'direct'], [`https://fastly.jsdelivr.net/gh/${author.name}/${name}/publish/version.json`, 'direct'], [`https://gcore.jsdelivr.net/gh/${author.name}/${name}/publish/version.json`, 'direct'], - ['https://registry.npmmirror.com/lx-music-mobile-version-info/latest', 'npm'], - ['https://gitee.com/lyswhut/lx-music-mobile-versions/raw/master/version.json', 'direct'], - ['http://cdn.stsky.cn/lx-music/mobile/version.json', 'direct'], + [`https://jsd.onmicrosoft.cn/gh/${author.name}/${name}/publish/version.json`, 'direct'], ] @@ -87,7 +82,7 @@ let apkSavePath export const downloadNewVersion = async(version, onDownload = noop) => { const abi = await getTargetAbi() const url = `https://github.com/${author.name}/${name}/releases/download/v${version}/${name}-v${version}-${abi}.apk` - let savePath = temporaryDirectoryPath + '/lx-music-mobile.apk' + let savePath = temporaryDirectoryPath + '/ikun-music-mobile.apk' if (downloadJobId) stopDownload(downloadJobId)