Skip to content

Commit 092eaa7

Browse files
committed
+ support Magisk module update2
1 parent ae3de7c commit 092eaa7

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

riru/build.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ MODULE_GRALDE_TASK="$1"
55
MODULE_GRALDE_FILE="$2"
66
PLUGIN_TYPE_NAME="$3"
77
MODULE_TEMPLATE="./Riru-ModuleTemplate"
8-
VERSION=$(cat ../app/build.gradle| grep versionName | sed -E 's/.+"(.+)".*/\1/g')
8+
VERSION_NAME=$(cat ../app/build.gradle| grep versionName | sed -E 's/.+"(.+)".*/\1/g')
9+
VERSION_CODE=$(cat ../app/build.gradle| grep versionCode | sed -E 's/.+versionCode +([0-9]+).*/\1/g')
910
APP_PRODUCT_TARGET=$(echo "$MODULE_GRALDE_FILE"|sed -E 's/.+\/(.+)\..+/\1/g')
1011
MODULE_LIB_NAME="$(echo "$PLUGIN_TYPE_NAME" | tr '[:upper:]' '[:lower:]')-module-xfingerprint-pay-$APP_PRODUCT_TARGET"
11-
echo VERSION: $VERSION
12+
echo VERSION_NAME: $VERSION_NAME
13+
echo VERSION_CODE: $VERSION_CODE
1214
bash ./reset.sh
1315
echo "updateJson=\${updateJson}" >> $MODULE_TEMPLATE/template/magisk_module/module.prop
1416
perl -i -pe 's/(description: moduleDescription,)/$1 \nupdateJson: moduleUpdateJson,/g' $MODULE_TEMPLATE/module/build.gradle
@@ -36,12 +38,14 @@ perl -i -pe 's/(main\.cpp)/$1 fingerprint.cpp zygisk_main.cpp/g' $MODULE_TEMPL
3638
echo 'add_definitions(-DMODULE_NAME="${MODULE_NAME}")' >> $MODULE_TEMPLATE/module/src/main/cpp/CMakeLists.txt
3739
echo 'target_link_libraries(${MODULE_NAME})' >> $MODULE_TEMPLATE/module/src/main/cpp/CMakeLists.txt
3840
$MODULE_TEMPLATE/gradlew -p $MODULE_TEMPLATE clean \
39-
-PVERSION=$VERSION \
41+
-PVERSION_NAME=$VERSION_NAME \
42+
-PVERSION_CODE=$VERSION_CODE \
4043
-PPLUGIN_TYPE_NAME=$PLUGIN_TYPE_NAME \
4144
-PMODULE_LIB_NAME=$MODULE_LIB_NAME \
4245

4346
$MODULE_TEMPLATE/gradlew -p $MODULE_TEMPLATE $MODULE_GRALDE_TASK \
44-
-PVERSION=$VERSION \
47+
-PVERSION_NAME=$VERSION_NAME \
48+
-PVERSION_CODE=$VERSION_CODE \
4549
-PPLUGIN_TYPE_NAME=$PLUGIN_TYPE_NAME \
4650
-PMODULE_LIB_NAME=$MODULE_LIB_NAME \
4751

riru/src/gradle/alipay.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
moduleName = "${pluginTypeName.capitalize()} - 指纹支付 - 支付宝"
2626
moduleAuthor = "Jason Eric"
2727
moduleDescription = "让支付宝支持指纹支付 Fingerprint pay for Alipay."
28-
moduleVersion = "v${project.property("VERSION")}"
29-
moduleVersionCode = 3
28+
moduleVersion = "v${project.property("VERSION_NAME")}"
29+
moduleVersionCode = project.property("VERSION_CODE") as int
3030
moduleUpdateJson = "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/release/update_${pluginTypeName.toLowerCase()}_alipay.json"
3131
}
3232
apply from: "$rootDir/fingerprint.gradle"

riru/src/gradle/qq.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
moduleName = "${pluginTypeName.capitalize()} - 指纹支付 - QQ"
2626
moduleAuthor = "Jason Eric"
2727
moduleDescription = "让QQ支持指纹支付 Fingerprint pay for QQ."
28-
moduleVersion = "v${project.property("VERSION")}"
29-
moduleVersionCode = 3
28+
moduleVersion = "v${project.property("VERSION_NAME")}"
29+
moduleVersionCode = project.property("VERSION_CODE") as int
3030
moduleUpdateJson = "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/release/update_${pluginTypeName.toLowerCase()}_qq.json"
3131
}
3232
apply from: "$rootDir/fingerprint.gradle"

riru/src/gradle/taobao.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
moduleName = "${pluginTypeName.capitalize()} - 指纹支付 - 淘宝"
2626
moduleAuthor = "Jason Eric"
2727
moduleDescription = "让淘宝支持指纹支付 Fingerprint pay for Taobao."
28-
moduleVersion = "v${project.property("VERSION")}"
29-
moduleVersionCode = 3
28+
moduleVersion = "v${project.property("VERSION_NAME")}"
29+
moduleVersionCode = project.property("VERSION_CODE") as int
3030
moduleUpdateJson = "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/release/update_${pluginTypeName.toLowerCase()}_taobao.json"
3131
}
3232
apply from: "$rootDir/fingerprint.gradle"

riru/src/gradle/unionpay.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
moduleName = "${pluginTypeName.capitalize()} - 指纹支付 - 云闪付"
2626
moduleAuthor = "Jason Eric"
2727
moduleDescription = "让云闪付支持指纹支付 Fingerprint pay for UnionPay."
28-
moduleVersion = "v${project.property("VERSION")}"
29-
moduleVersionCode = 3
28+
moduleVersion = "v${project.property("VERSION_NAME")}"
29+
moduleVersionCode = project.property("VERSION_CODE") as int
3030
moduleUpdateJson = "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/release/update_${pluginTypeName.toLowerCase()}_unionpay.json"
3131
}
3232
apply from: "$rootDir/fingerprint.gradle"

riru/src/gradle/wechat.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
moduleName = "${pluginTypeName.capitalize()} - 指纹支付 - 微信"
2626
moduleAuthor = "Jason Eric"
2727
moduleDescription = "让微信支持指纹支付 Fingerprint pay for WeChat."
28-
moduleVersion = "v${project.property("VERSION")}"
29-
moduleVersionCode = 3
28+
moduleVersion = "v${project.property("VERSION_NAME")}"
29+
moduleVersionCode = project.property("VERSION_CODE") as int
3030
moduleUpdateJson = "https://raw.githubusercontent.com/eritpchy/FingerprintPay/main/release/update_${pluginTypeName.toLowerCase()}_wechat.json"
3131
}
3232
apply from: "$rootDir/fingerprint.gradle"

0 commit comments

Comments
 (0)