Skip to content

Commit 2e5967e

Browse files
KOWX712KOWX712
committed
bump deps
1 parent 3b7be54 commit 2e5967e

10 files changed

Lines changed: 61 additions & 32 deletions

File tree

‎.github/workflows/android.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
java-version: 21
2828

2929
- name: Setup pnpm
30-
uses: pnpm/action-setup@v4
30+
uses: pnpm/action-setup@v5
3131
with:
3232
version: 'latest'
3333

3434
- name: Setup Node
35-
uses: actions/setup-node@v4
35+
uses: actions/setup-node@v6
3636
with:
3737
node-version: 'latest'
3838
cache: 'pnpm'
@@ -56,7 +56,7 @@ jobs:
5656
echo "VERSION=$VERSION" >> $GITHUB_ENV
5757
5858
- name: Upload CI module zip as artifact zip
59-
uses: actions/upload-artifact@v6
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: PlayIntegrityFix_${{ env.VERSION }}-inject-s_${{ github.run_number }}
6262
path: 'module/*'

‎.github/workflows/autopif.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
ref: bot
5050

5151
- name: Process ROM
52-
uses: nick-invision/retry@v3
52+
uses: nick-invision/retry@v4
5353
with:
5454
timeout_minutes: 10
5555
max_attempts: 3
@@ -91,7 +91,7 @@ jobs:
9191
EOF
9292
9393
- name: Upload digest artifact
94-
uses: actions/upload-artifact@v6
94+
uses: actions/upload-artifact@v7
9595
with:
9696
name: ${{ matrix.product }}
9797
path: ${{ matrix.product }}.prop
@@ -111,7 +111,7 @@ jobs:
111111
rm -rf device_prop/*
112112
113113
- name: Download all device prop
114-
uses: actions/download-artifact@v7
114+
uses: actions/download-artifact@v8
115115
with:
116116
path: device_prop
117117

‎gradle.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@ android.useAndroidX=true
1818
# Enables namespacing of each library's R class so that its R class includes only the
1919
# resources declared in the library itself and none from the library's dependencies,
2020
# thereby reducing the size of the R class for that library
21-
android.nonTransitiveRClass=true
21+
android.nonTransitiveRClass=true
22+
android.uniquePackageNames=false
23+
android.dependency.useConstraints=true
24+
android.r8.strictFullModeForKeepRules=false
25+
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false

‎gradle/gradle-daemon-jvm.properties‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/04e088f8677de3b384108493cc9481d0/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/2ddfb13e430f2b3a94c9c937d8d2f67e/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=21

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
agp = "8.13.2"
3-
cxx = "28.1.13356709"
2+
agp = "9.1.0"
3+
cxx = "29.0.14206865"
44
hiddenapibypass = "6.1"
55

66
[libraries]

‎gradle/wrapper/gradle-wrapper.jar‎

542 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎inject/src/main/cpp/inject.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
static std::string dir;
1212
static JNIEnv *env;
13-
static bool isGmsUnstable = false;
14-
static bool isVending = false;
1513

1614
static std::unordered_map<std::string, std::string> propMap;
1715

@@ -352,9 +350,6 @@ static void injectDex() {
352350

353351
extern "C" [[gnu::visibility("default"), maybe_unused]] bool
354352
init(JavaVM *vm, const std::string &gmsDir, bool isGmsUnstable, bool isVending) {
355-
::isGmsUnstable = isGmsUnstable;
356-
::isVending = isVending;
357-
358353
if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
359354
LOGE("[INJECT] JNI_ERR!");
360355
return true;
@@ -389,4 +384,4 @@ init(JavaVM *vm, const std::string &gmsDir, bool isGmsUnstable, bool isVending)
389384
}
390385

391386
return true;
392-
}
387+
}

‎settings.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pluginManagement {
1111
gradlePluginPortal()
1212
}
1313
}
14+
plugins {
15+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
16+
}
1417
dependencyResolutionManagement {
1518
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1619
repositories {

‎zygisk/src/main/cpp/zygisk.cpp‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
#include <fcntl.h>
77
#include <vector>
88
#include <cerrno>
9-
#include <filesystem>
109
#include <sys/stat.h>
11-
#include <fcntl.h>
12-
#include <vector>
1310
#include "checksum.h"
1411

1512
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "PIF", __VA_ARGS__)
@@ -75,16 +72,35 @@ static ssize_t xwrite(int fd, const void *buffer, size_t count_to_write) {
7572
}
7673

7774
static bool copyFile(const std::string &from, const std::string &to, mode_t perms = 0777) {
78-
return std::filesystem::exists(from) &&
79-
std::filesystem::copy_file(
80-
from,
81-
to,
82-
std::filesystem::copy_options::overwrite_existing
83-
) &&
84-
!chmod(
85-
to.c_str(),
86-
perms
87-
);
75+
int src = open(from.c_str(), O_RDONLY);
76+
if (src < 0) return false;
77+
78+
int dst = open(to.c_str(), O_WRONLY | O_CREAT | O_TRUNC, perms);
79+
if (dst < 0) {
80+
close(src);
81+
return false;
82+
}
83+
84+
char buffer[4096];
85+
ssize_t n;
86+
bool ok = true;
87+
while ((n = xread(src, buffer, sizeof(buffer))) > 0) {
88+
if (xwrite(dst, buffer, n) != n) {
89+
ok = false;
90+
break;
91+
}
92+
}
93+
94+
if (n < 0) ok = false;
95+
96+
close(src);
97+
close(dst);
98+
99+
if (ok) {
100+
chmod(to.c_str(), perms);
101+
}
102+
103+
return ok;
88104
}
89105

90106
static uint32_t crc32(const uint8_t *data, size_t len) {
@@ -132,13 +148,11 @@ static bool verifyModule(const char *path, const char *expected_hex) {
132148
std::vector<std::string> lines;
133149
std::string file_str(buf.begin(), buf.end());
134150
size_t pos = 0;
135-
bool found = false;
136151
while (pos < file_str.size()) {
137152
size_t next = file_str.find('\n', pos);
138153
std::string line = file_str.substr(pos, next - pos + 1);
139154
if (line.rfind("description=", 0) == 0) {
140155
line = "description=❌ This module has been tampered, please install from official source.\n";
141-
found = true;
142156
}
143157
lines.push_back(line);
144158
if (next == std::string::npos) break;
@@ -310,4 +324,4 @@ class PlayIntegrityFix : public ModuleBase {
310324

311325
REGISTER_ZYGISK_MODULE(PlayIntegrityFix)
312326

313-
REGISTER_ZYGISK_COMPANION(companion)
327+
REGISTER_ZYGISK_COMPANION(companion)

0 commit comments

Comments
 (0)