Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-05-08 10:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into refactor

Browse Source
This commit is contained in:
rhunk 2024-07-17 12:51:17 +02:00
commit fb3d7af9cc
6 changed files with 133 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
.github/workflows/debug.yml vendored
View File

@ -16,10 +16,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -32,41 +32,32 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv8Debug run: ./gradlew assembleArmv8Debug
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: tiann/zipalign-sign-android-release@v1.1.4 uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/armv8/debug/ releaseDirectory: app/build/outputs/apk/armv8/debug/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
zipAlign: true
env: env:
BUILD_TOOLS_VERSION: "34.0.0" BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
- name: Delete unsigned file - name: Get current build version
run: |
cd app/build/outputs/apk/armv8/debug/
shopt -s extglob
rm -rf !(*-signed*)
- name: Build Version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name - name: Delete unsigned APK file and rename the signed one
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK file
run: | run: |
mv app/build/outputs/apk/armv8/debug/*.apk app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${{ steps.version-env.outputs.sha_short }}.apk find app/build/outputs/apk/armv8/debug/ -type f ! -name '*-signed*' -delete
mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${GITHUB_SHA::7}.apk
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -82,10 +73,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -98,41 +89,32 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv7Debug run: ./gradlew assembleArmv7Debug
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: tiann/zipalign-sign-android-release@v1.1.4 uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/armv7/debug/ releaseDirectory: app/build/outputs/apk/armv7/debug/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
zipAlign: true
env: env:
BUILD_TOOLS_VERSION: "34.0.0" BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
- name: Delete unsigned file - name: Get current build version
run: |
cd app/build/outputs/apk/armv7/debug/
shopt -s extglob
rm -rf !(*-signed*)
- name: Build Version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name - name: Delete unsigned APK file and rename the signed one
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK file
run: | run: |
mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${{ steps.version-env.outputs.sha_short }}.apk find app/build/outputs/apk/armv7/debug/ -type f ! -name '*-signed*' -delete
mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${GITHUB_SHA::7}.apk
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -148,10 +130,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -164,41 +146,32 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleAllDebug run: ./gradlew assembleAllDebug
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: tiann/zipalign-sign-android-release@v1.1.4 uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/all/debug/ releaseDirectory: app/build/outputs/apk/all/debug/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
zipAlign: true
env: env:
BUILD_TOOLS_VERSION: "34.0.0" BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
- name: Delete unsigned file - name: Get current build version
run: |
cd app/build/outputs/apk/all/debug/
shopt -s extglob
rm -rf !(*-signed*)
- name: Build Version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name - name: Delete unsigned APK file and rename the signed one
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK files
run: | run: |
mv app/build/outputs/apk/all/debug/*.apk app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${{ steps.version-env.outputs.sha_short }}.apk find app/build/outputs/apk/all/debug/ -type f ! -name '*-signed*' -delete
mv ${{steps.sign_app.outputs.signedReleaseFile}} app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${GITHUB_SHA::7}.apk
- name: Upload universal - name: Upload universal
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -214,10 +187,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -241,10 +214,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -258,4 +231,4 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: core name: core
path: app/build/outputs/apk/core/debug/*.apk path: app/build/outputs/apk/core/debug/*.apk

61
.github/workflows/pull_request.yml vendored
View File

@ -12,10 +12,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -28,22 +28,15 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv8Debug run: ./gradlew assembleArmv8Debug
- name: Build Version - name: Get current build version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK file - name: Rename APK file
run: | run: |
mv app/build/outputs/apk/armv8/debug/*.apk app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${{ steps.version-env.outputs.sha_short }}.apk mv app/build/outputs/apk/armv8/debug/*.apk app/build/outputs/apk/armv8/debug/snapenhance-${{ env.version }}-armv8-${GITHUB_SHA::7}.apk
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -59,10 +52,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -75,22 +68,15 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv7Debug run: ./gradlew assembleArmv7Debug
- name: Build Version - name: Get current build version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK file - name: Rename APK file
run: | run: |
mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${{ steps.version-env.outputs.sha_short }}.apk mv app/build/outputs/apk/armv7/debug/*.apk app/build/outputs/apk/armv7/debug/snapenhance-${{ env.version }}-armv7-${GITHUB_SHA::7}.apk
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -106,10 +92,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -122,22 +108,15 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleAllDebug run: ./gradlew assembleAllDebug
- name: Build Version - name: Get current build version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Git branch name - name: Rename APK file
id: git-branch-name
uses: EthanSK/git-branch-name-action@main
- name: Rename APK files
run: | run: |
mv app/build/outputs/apk/all/debug/*.apk app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${{ steps.version-env.outputs.sha_short }}.apk mv app/build/outputs/apk/all/debug/*.apk app/build/outputs/apk/all/debug/snapenhance-${{ env.version }}-universal-${GITHUB_SHA::7}.apk
- name: Upload universal - name: Upload universal
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -153,10 +132,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -180,10 +159,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle

99
.github/workflows/release.yml vendored
View File

@ -20,10 +20,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -35,28 +35,28 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv8Release run: ./gradlew assembleArmv8Release
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: kevin-david/zipalign-sign-android-release@main uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/armv8/release/ releaseDirectory: app/build/outputs/apk/armv8/release/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- name: Delete unsigned file BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
run: |
cd app/build/outputs/apk/armv8/release/
shopt -s extglob
rm !(*-signed*)
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: snapenhance-armv8-release name: snapenhance-armv8-release
path: app/build/outputs/apk/armv8/release/*.apk path: ${{steps.sign_app.outputs.signedReleaseFile}}
job_armv7: job_armv7:
runs-on: macos-latest runs-on: macos-latest
@ -66,10 +66,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -82,27 +82,27 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleArmv7Release run: ./gradlew assembleArmv7Release
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: kevin-david/zipalign-sign-android-release@main uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/armv7/release/ releaseDirectory: app/build/outputs/apk/armv7/release/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- name: Delete unsigned file BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
run: |
cd app/build/outputs/apk/armv7/release/
shopt -s extglob
rm !(*-signed*)
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: snapenhance-armv7-release name: snapenhance-armv7-release
path: app/build/outputs/apk/armv7/release/*.apk path: ${{steps.sign_app.outputs.signedReleaseFile}}
job_universal: job_universal:
runs-on: macos-latest runs-on: macos-latest
@ -112,10 +112,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -127,28 +127,28 @@ jobs:
- name: Build - name: Build
run: ./gradlew assembleAllRelease run: ./gradlew assembleAllRelease
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: kevin-david/zipalign-sign-android-release@main uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: app/build/outputs/apk/all/release/ releaseDirectory: app/build/outputs/apk/all/release/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- name: Delete unsigned file BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
run: |
cd app/build/outputs/apk/all/release/
shopt -s extglob
rm !(*-signed*)
- name: Upload universal - name: Upload universal
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: snapenhance-universal-release name: snapenhance-universal-release
path: app/build/outputs/apk/all/release/*.apk path: ${{steps.sign_app.outputs.signedReleaseFile}}
job_manager: job_manager:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -158,10 +158,10 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
@ -171,27 +171,27 @@ jobs:
- name: Build - name: Build
run: ./gradlew manager:assembleRelease run: ./gradlew manager:assembleRelease
- name: Determine the latest Build Tools version installed
shell: bash
run: echo "BUILD_TOOL_VERSION=$(ls "$ANDROID_HOME/build-tools/" | tail -n 1)" >> $GITHUB_ENV
- name: Sign APK - name: Sign APK
id: sign_app id: sign_app
uses: kevin-david/zipalign-sign-android-release@main uses: SnapEnhance/sign-android-release@master
with: with:
releaseDirectory: manager/build/outputs/apk/release/ releaseDirectory: manager/build/outputs/apk/release/
signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }} signingKeyBase64: ${{ secrets.JAVA_KEYSTORE_DATA }}
alias: ${{ secrets.KEY_ALIAS }} alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }} keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
- name: Delete unsigned file BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
run: |
cd manager/build/outputs/apk/release/
shopt -s extglob
rm !(*-signed*)
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: manager name: manager
path: manager/build/outputs/apk/release/*.apk path: ${{steps.sign_app.outputs.signedReleaseFile}}
job_release: job_release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -203,24 +203,21 @@ jobs:
with: with:
submodules: 'recursive' submodules: 'recursive'
- name: set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
cache: gradle cache: gradle
- name: Grant execute permission for gradlew - name: Grant execute permission for gradlew
run: chmod +x gradlew run: chmod +x gradlew
- name: Generate version - name: Get current build version
run: ./gradlew getVersion
- name: Set Environment Variables
id: version-env id: version-env
run: | run: |
./gradlew getVersion
echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV echo "version=$(cat app/build/version.txt)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@ -229,9 +226,9 @@ jobs:
merge-multiple: true merge-multiple: true
- name: Publish APK - name: Publish APK
uses: marvinpinto/action-automatic-releases@latest uses: softprops/action-gh-release@v2
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" token: ${{ secrets.GITHUB_TOKEN }}
prerelease: ${{ inputs.prerelease }} prerelease: ${{ inputs.prerelease }}
files: bins/*.apk files: bins/*.apk
automatic_release_tag: v${{ env.version }} tag_name: v${{ env.version }}

3
README.md
View File

@ -176,7 +176,7 @@ We no longer offer official `LSPatch` binaries for obvious reasons. However, you
<details> <details>
<summary>Can I get banned with this?</summary> <summary>Can I get banned with this?</summary>
- Obviously, however, the risk is very low, and we have no reported cases of anyone ever getting banned while using the mod. - Obviously, however, the risk is low. SnapEnhance takes no responsibility for any consequences, including but not limited to account bans or suspensions.
</details> </details>
<details> <details>
@ -253,6 +253,7 @@ Thanks to everyone involved including the [third-party libraries](https://github
- [CanerKaraca23](https://github.com/CanerKaraca23) - [CanerKaraca23](https://github.com/CanerKaraca23)
- [bocajthomas](https://github.com/bocajthomas) - [bocajthomas](https://github.com/bocajthomas)
- [w451](https://github.com/w451) - [w451](https://github.com/w451)
- [sn-o-w](https://github.com/sn-o-w)
## Donate ## Donate
**@rhunk** **@rhunk**

3
common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Rules.kt
View File

@ -19,9 +19,10 @@ class Rules : ConfigContainer() {
customTranslationPath = "rules.properties.${ruleType.key}" customTranslationPath = "rules.properties.${ruleType.key}"
customOptionTranslationPath = "rules.modes" customOptionTranslationPath = "rules.modes"
addNotices(*ruleType.configNotices) addNotices(*ruleType.configNotices)
requireRestart()
}.apply { }.apply {
set(ruleType.defaultValue) set(ruleType.defaultValue)
} }
} }
} }
} }

23
composer/build.gradle.kts
View File

@ -1,3 +1,4 @@
import org.apache.tools.ant.taskdefs.condition.Os
plugins { plugins {
alias(libs.plugins.androidLibrary) alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinAndroid) alias(libs.plugins.kotlinAndroid)
@ -16,12 +17,22 @@ android {
task("compileTypeScript") { task("compileTypeScript") {
doLast { doLast {
project.exec { if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine("npx", "--yes", "tsc", "--project", "tsconfig.json") project.exec {
} commandLine("npx.cmd", "--yes", "tsc", "--project", "tsconfig.json")
project.exec { }
commandLine("npx", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs") project.exec {
commandLine("npx.cmd", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs")
}
} else {
project.exec {
commandLine("npx", "--yes", "tsc", "--project", "tsconfig.json")
}
project.exec {
commandLine("npx", "--yes", "rollup", "--config", "rollup.config.js", "--bundleConfigAsCjs")
}
} }
project.copy { project.copy {
from("build/loader.js") from("build/loader.js")
into("build/assets/composer") into("build/assets/composer")
@ -31,4 +42,4 @@ task("compileTypeScript") {
tasks.named("preBuild").configure { tasks.named("preBuild").configure {
dependsOn("compileTypeScript") dependsOn("compileTypeScript")
} }