Skip to content

Commit f1108ce

Browse files
committed
Move Riru-ModuleTemplate to 3rdparty
Rename riru folder as module
1 parent b586258 commit f1108ce

35 files changed

+13
-15
lines changed

.github/workflows/android.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
- uses: actions/checkout@v2
2222
with:
2323
submodules: recursive
24-
- name: Build Riru modules
25-
run: ls riru/Riru-ModuleTemplate
2624
- name: Decode Keystore
2725
env:
2826
ENCODED_STRING: ${{ secrets.SIGNING_STORE_BASE64 }}
@@ -37,7 +35,7 @@ jobs:
3735
architecture: x64
3836
targets: 'JAVA_HOME_15'
3937
- name: Build Riru modules
40-
run: cd ./riru && bash ./make.sh
38+
run: cd ./module && bash ./make.sh
4139
- name: Grant execute permission for gradlew
4240
run: chmod +x gradlew
4341
- name: Build with Gradle
@@ -56,8 +54,8 @@ jobs:
5654
with:
5755
name: magisk.${{ steps.current-time.outputs.formattedTime }}
5856
path: |
59-
riru/build/release/*.zip
60-
!riru/build/release/*-all-*.zip
57+
module/build/release/*.zip
58+
!module/build/release/*-all-*.zip
6159
- name: Assign release version from version.properties to Env variable
6260
run: |
6361
cat ./app/build.gradle| grep versionName | sed -E 's/.+"(.+)".*/release_version=\1/g' >> $GITHUB_ENV
@@ -76,7 +74,7 @@ jobs:
7674
tag_name: "${{ env.release_version }}-ci"
7775
files: |
7876
app/build/outputs/apk/release/*.apk
79-
riru/build/release/*.zip
77+
module/build/release/*.zip
8078
body: "[Github Action](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}})"
8179
- name: Upload artifacts - Xposed
8280
uses: Wandalen/wretry.action@master
@@ -101,7 +99,7 @@ jobs:
10199
webdav_password: ${{secrets.WEBDAV_PASSWORD}}
102100
webdav_upload_path: "/${{ env.release_version }}"
103101
files: |
104-
riru/build/release/zygisk-*.zip
102+
module/build/release/zygisk-*.zip
105103
attempt_limit: 3
106104
attempt_delay: 0
107105
- name: Upload artifacts - Riru
@@ -114,6 +112,6 @@ jobs:
114112
webdav_password: ${{secrets.WEBDAV_PASSWORD}}
115113
webdav_upload_path: "/${{ env.release_version }}"
116114
files: |
117-
riru/build/release/riru-*.zip
115+
module/build/release/riru-*.zip
118116
attempt_limit: 3
119117
attempt_delay: 0

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
distribution: 'adopt'
2727
cache: gradle
2828
- name: Build Riru modules
29-
run: cd ./riru && bash ./make.sh
29+
run: cd ./module && bash ./make.sh
3030
- name: Grant execute permission for gradlew
3131
run: chmod +x gradlew
3232
- name: Build with Gradle
@@ -41,5 +41,5 @@ jobs:
4141
with:
4242
name: magisk.${{ steps.current-time.outputs.formattedTime }}
4343
path: |
44-
riru/build/release/*.zip
45-
!riru/build/release/*-all-*.zip
44+
module/build/release/*.zip
45+
!module/build/release/*-all-*.zip

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
.externalNativeBuild
88
/.idea
99
/app/release/
10-
/riru/build/
10+
/module/build/

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[submodule "riru/Riru-ModuleTemplate"]
2-
path = riru/Riru-ModuleTemplate
1+
[submodule "3rdparty/Riru-ModuleTemplate"]
2+
path = 3rdparty/Riru-ModuleTemplate
33
url = https://github.com/RikkaApps/Riru-ModuleTemplate.git
44
[submodule "3rdparty/FingerprintIdentify"]
55
path = 3rdparty/FingerprintIdentify

riru/build.sh renamed to module/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cd ${0%/*}
44
MODULE_GRALDE_TASK="$1"
55
MODULE_GRALDE_FILE="$2"
66
PLUGIN_TYPE_NAME="$3"
7-
MODULE_TEMPLATE="./Riru-ModuleTemplate"
7+
MODULE_TEMPLATE="../3rdparty/Riru-ModuleTemplate"
88
VERSION_NAME=$(cat ../app/build.gradle| grep versionName | sed -E 's/.+"(.+)".*/\1/g')
99
VERSION_CODE=$(cat ../app/build.gradle| grep versionCode | sed -E 's/.+versionCode +([0-9]+).*/\1/g')
1010
APP_PRODUCT_TARGET=$(echo "$MODULE_GRALDE_FILE"|sed -E 's/.+\/(.+)\..+/\1/g')
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)