From 8b8cfc8e06733db5e091cfcb71b7f52e3595529e Mon Sep 17 00:00:00 2001 From: leavesCZY <1990724437@qq.com> Date: Fri, 14 Jun 2024 23:45:29 +0800 Subject: [PATCH] optimize code --- .github/workflows/create_release.yml | 11 ++++++----- README.md | 2 +- build.gradle.kts | 3 --- proguard-rules.pro | 6 ++++-- workflows-trigger.properties | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 62f8a08..4316b02 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -48,26 +48,26 @@ jobs: - if: matrix.os == 'windows-latest' name: rename File run: | - mv ./build/compose/binaries/main-release/exe/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}.exe ./build/compose/binaries/main-release/exe/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-windows-x86-64.exe + mv ./build/compose/binaries/main-release/exe/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}.exe ./build/compose/binaries/main-release/exe/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-windows-x86_64.exe - if: matrix.os == 'windows-latest' name: zip AppImage uses: thedoctor0/zip-release@0.7.6 with: type: "zip" - filename: "compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-windows-x86-64.zip" + filename: "compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-windows-x86_64.zip" directory: "./build/compose/binaries/main-release/app/compose-multiplatform-xlog-decode" - if: matrix.os == 'ubuntu-latest' name: rename File run: | - mv /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/rpm/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}-1.x86_64.rpm /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/rpm/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-linux-x86-64.rpm + mv /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/rpm/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}-1.x86_64.rpm /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/rpm/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-linux-x86_64.rpm mv /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/deb/compose-multiplatform-xlog-decode_${{env.PACKAGE_VERSION}}_amd64.deb /home/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/deb/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-linux-amd64.deb - if: matrix.os == 'macos-13' name: rename File run: | - mv /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}.dmg /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-macos-x86-64.dmg + mv /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.PACKAGE_VERSION}}.dmg /Users/runner/work/compose-multiplatform-xlog-decode/compose-multiplatform-xlog-decode/build/compose/binaries/main-release/dmg/compose-multiplatform-xlog-decode-${{env.V_PACKAGE_VERSION}}-macos-x86_64.dmg - if: matrix.os == 'macos-14' name: rename File @@ -79,6 +79,7 @@ jobs: uses: josStorer/get-current-time@v2 with: format: YYYY-MM-DD + utcOffset: "+08:00" - name: draft a new release uses: ncipollo/release-action@v1 @@ -86,7 +87,7 @@ jobs: token: ${{secrets.ACTION_TOKEN}} allowUpdates: true artifactErrorsFailBuild: false - generateReleaseNotes: false + generateReleaseNotes: true artifacts: "**/exe/*.exe,**/app/compose-multiplatform-xlog-decode/*.zip,**/deb/*.deb,**/rpm/*.rpm,**/dmg/*.dmg" body: "## ${{env.V_PACKAGE_VERSION}} / ${{steps.currentTime.outputs.formattedTime}}" tag: "${{env.V_PACKAGE_VERSION}}" diff --git a/README.md b/README.md index 8f4b20e..7320ee4 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ - [Compose Multiplatform 写一个跨平台的 xlog 解析工具](https://juejin.cn/post/7378452954221084682) -![](https://github.com/leavesCZY/compose-multiplatform-xlog-decode/assets/30774063/57187495-9dd6-4644-afb6-154c31944a40) \ No newline at end of file +![](https://github.com/leavesCZY/compose-multiplatform-xlog-decode/assets/30774063/41377b6c-35e2-44e7-8486-2ed8caeedb0b) \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index fbbab08..b3c787c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,9 +7,6 @@ plugins { alias(libs.plugins.jetbrains.compose.compiler) } -group = "github.leavesczy" -version = "1.0.0" - kotlin { jvmToolchain(18) compilerOptions { diff --git a/proguard-rules.pro b/proguard-rules.pro index 6c8104e..374d1c1 100644 --- a/proguard-rules.pro +++ b/proguard-rules.pro @@ -1,5 +1,5 @@ -ignorewarnings --optimizationpasses 6 +-optimizationpasses 8 -keepattributes SourceFile,LineNumberTable -renamesourcefileattribute SourceFile @@ -8,4 +8,6 @@ -keep class org.lwjgl.** { *; } -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite { ; -} \ No newline at end of file +} + +-keep class github.leavesczy.xlog.decode.** { *; } \ No newline at end of file diff --git a/workflows-trigger.properties b/workflows-trigger.properties index 2c1da59..ff4f39d 100644 --- a/workflows-trigger.properties +++ b/workflows-trigger.properties @@ -1 +1 @@ -trigger=2 \ No newline at end of file +trigger=3 \ No newline at end of file