Skip to content

Commit 64c744c

Browse files
eritpchyeritpchy
committed
Upgrade com.android.tools.build:gradle to 8.1.2, build tools to 33
1 parent 16db805 commit 64c744c

File tree

9 files changed

+34
-26
lines changed

9 files changed

+34
-26
lines changed

‎.github/workflows/android.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ jobs:
2525
env:
2626
ENCODED_STRING: ${{ secrets.SIGNING_STORE_BASE64 }}
2727
run: echo $ENCODED_STRING | base64 -di > app/keystore.jks
28-
- name: set up JDK 11
29-
uses: actions/setup-java@v2
28+
- uses: AdoptOpenJDK/install-jdk@v1
3029
with:
31-
java-version: '11'
32-
distribution: 'adopt'
33-
cache: gradle
30+
version: '17'
31+
architecture: x64
32+
- uses: AdoptOpenJDK/install-jdk@v1
33+
with:
34+
version: '15'
35+
architecture: x64
36+
targets: 'JAVA_HOME_15'
3437
- name: Build Riru modules
3538
run: cd ./riru && bash ./make.sh
3639
- name: Grant execute permission for gradlew

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
22

33
android {
44

5-
compileSdkVersion 30
6-
buildToolsVersion "30.0.2"
5+
compileSdkVersion 33
76
defaultConfig {
87
applicationId "com.surcumference.fingerprintpay"
98
minSdkVersion 14
10-
targetSdkVersion 30
11-
versionCode 25
12-
versionName "4.7.5"
9+
targetSdkVersion 33
10+
versionCode 27
11+
versionName "4.8.0"
1312
buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""
1413
}
1514

@@ -39,6 +38,7 @@ android {
3938

4039
//https://proandroiddev.com/how-to-securely-build-and-sign-your-android-app-with-github-actions-ad5323452ce#fromHistory
4140
def keystoreFile = file('keystore.jks')
41+
namespace 'com.surcumference.fingerprint'
4242
if (keystoreFile.exists()) {
4343
signingConfigs {
4444
release {
@@ -71,5 +71,5 @@ dependencies {
7171
implementation 'com.lzy.net:okgo:3.0.4'
7272
implementation 'eu.chainfire:libsuperuser:1.1.0.202004101746'
7373
implementation 'net.lingala.zip4j:zip4j:1.3.2'
74-
provided 'de.robv.android.xposed:api:53'
74+
compileOnly 'de.robv.android.xposed:api:53'
7575
}

‎app/debug.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ project.ext.appInfo.each {entry ->
77
executable = ADB_PATH
88
args = ['shell', "am force-stop $packageName"]
99
}
10-
def startTask = tasks.create(name: "start$name", type: Exec) {
10+
def startTask = tasks.create(name: "start$name", dependsOn: [stopTask], type: Exec) {
1111
doFirst { println "Start $name..." }
1212
executable = ADB_PATH
13-
args = ['shell', "monkey -p ${packageName} -c android.intent.category.LAUNCHER 1"]
13+
args = ['shell', "sleep 3;am start \$(cmd package resolve-activity --brief ${packageName} | tail -n 1)"]
1414
}
1515
def debugXposedTask = tasks.create(name: "debug${name}Xposed", dependsOn: ["installDebug", stopTask], type: Exec) {
1616
executable = ADB_PATH
1717
args = ['shell', "package=${android.defaultConfig.applicationId}&& cp -f \$(pm path \$package| cut -d: -f2) /data/local/tmp/\$package.apk && chmod 777 /data/local/tmp/\$package.apk"]
1818
}
1919
debugXposedTask.finalizedBy(startTask)
20-
def debugRiruTask = tasks.create(name: "debug${name}Riru", dependsOn: ["mergeDexDebug", stopTask], type: Exec) {
21-
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/out/classes.dex").absolutePath
20+
def debugRiruTask = tasks.create(name: "debug${name}Riru", dependsOn: ["mergeDexDebug"], type: Exec) {
21+
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/mergeDexDebug/classes.dex").absolutePath
2222
executable = ADB_PATH
2323
args = ['push', classDexPath, "/data/local/tmp/libriru-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
2424
}
2525
debugRiruTask.finalizedBy(startTask)
26-
def debugZygiskTask = tasks.create(name: "debug${name}Zygisk", dependsOn: ["mergeDexDebug", stopTask], type: Exec) {
27-
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/out/classes.dex").absolutePath
26+
def debugZygiskTask = tasks.create(name: "debug${name}Zygisk", dependsOn: ["mergeDexDebug"], type: Exec) {
27+
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/mergeDexDebug/classes.dex").absolutePath
2828
executable = ADB_PATH
2929
args = ['push', classDexPath, "/data/local/tmp/libzygisk-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
3030
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.surcumference.fingerprint">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
54
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -31,7 +30,8 @@
3130

3231
<activity
3332
android:name=".activity.HomeActivity"
34-
android:label="@string/app_name">
33+
android:label="@string/app_name"
34+
android:exported="true">
3535
<intent-filter>
3636
<action android:name="android.intent.action.MAIN" />
3737
<category android:name="de.robv.android.xposed.category.MODULE_SETTINGS" />
@@ -59,7 +59,8 @@
5959
android:enabled="true"
6060
android:name=".Main"
6161
android:label="@string/app_name"
62-
android:targetActivity=".activity.HomeActivity">
62+
android:targetActivity=".activity.HomeActivity"
63+
android:exported="true">
6364
<intent-filter>
6465
<action android:name="android.intent.action.MAIN"/>
6566
<category android:name="android.intent.category.LAUNCHER"/>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ buildscript {
77
maven { url 'https://maven.google.com' }
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.6.4'
10+
classpath 'com.android.tools.build:gradle:8.1.2'
1111
}
1212
}
1313

1414

1515
allprojects {
1616
repositories {
17-
def REPOSITORY_URL = 'http://maven.aliyun.com/nexus/content/groups/public/'
17+
def REPOSITORY_URL = 'https://maven.aliyun.com/nexus/content/groups/public/'
1818
all { ArtifactRepository repo ->
1919
if (repo instanceof MavenArtifactRepository) {
2020
def url = repo.url.toString()

‎gradle.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx1536m
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
1818
android.useAndroidX=true
19-
android.enableJetifier=true
19+
android.enableJetifier=true
20+
android.defaults.buildfeatures.buildconfig=true
21+
android.nonTransitiveRClass=true
22+
android.nonFinalResIds=false

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

‎riru/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ echo VERSION_CODE: $VERSION_CODE
1414
bash ./reset.sh
1515
echo "updateJson=\${updateJson}" >> $MODULE_TEMPLATE/template/magisk_module/module.prop
1616
perl -i -pe 's/(description: moduleDescription,)/$1 \nupdateJson: moduleUpdateJson,/g' $MODULE_TEMPLATE/module/build.gradle
17+
echo org.gradle.java.home="$(java_home || echo "$JAVA_HOME_15")" >> $MODULE_TEMPLATE/gradle.properties
1718

1819
cp -rfv ./src/cpp/* $MODULE_TEMPLATE/module/src/main/cpp/
1920
cp -rfv "$MODULE_GRALDE_FILE" $MODULE_TEMPLATE/module.gradle

‎riru/src/gradle/fingerprint.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ afterEvaluate {
88
}
99
file("$magiskDir/system/framework").mkdirs()
1010
copy {
11-
from file("$rootDir/../../app/build/intermediates/dex/release/out/classes.dex")
11+
from file("$rootDir/../../app/build/intermediates/dex/release/mergeDexRelease/classes.dex")
1212
rename('classes.dex', "lib${moduleLibraryName}.dex")
1313
into file("$magiskDir/system/framework")
1414
}

0 commit comments

Comments
 (0)