From d985cf4c6386f47e9cccb3fc7dc90920cd7b69a1 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 23 Jul 2022 13:49:05 +0800
Subject: [PATCH] Update gradle (#2046)

---
 app/build.gradle.kts                                           | 2 +-
 core/src/main/jni/include/{ConfigBridge.h => config_bridge.h}  | 0
 core/src/main/jni/include/native_util.h                        | 2 +-
 core/src/main/jni/src/jni/resources_hook.cpp                   | 2 +-
 gradle/wrapper/gradle-wrapper.properties                       | 2 +-
 magisk-loader/src/main/jni/api/riru_main.cpp                   | 2 +-
 magisk-loader/src/main/jni/api/zygisk_main.cpp                 | 2 +-
 magisk-loader/src/main/jni/src/{ConfigImpl.h => config_impl.h} | 3 ++-
 magisk-loader/src/main/jni/src/magisk_loader.cpp               | 2 +-
 magisk-loader/src/main/jni/src/service.cpp                     | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)
 rename core/src/main/jni/include/{ConfigBridge.h => config_bridge.h} (100%)
 rename magisk-loader/src/main/jni/src/{ConfigImpl.h => config_impl.h} (97%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5b2798fc..594ba35b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -159,7 +159,7 @@ dependencies {
     implementation("dev.rikka.rikkax.appcompat:appcompat:1.4.1")
     implementation("dev.rikka.rikkax.core:core:1.4.1")
     implementation("dev.rikka.rikkax.insets:insets:1.3.0")
-    implementation("dev.rikka.rikkax.material:material:2.5.0")
+    implementation("dev.rikka.rikkax.material:material:2.5.1")
     implementation("dev.rikka.rikkax.material:material-preference:2.0.0")
     implementation("dev.rikka.rikkax.preference:simplemenu-preference:1.0.3")
     implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1")
diff --git a/core/src/main/jni/include/ConfigBridge.h b/core/src/main/jni/include/config_bridge.h
similarity index 100%
rename from core/src/main/jni/include/ConfigBridge.h
rename to core/src/main/jni/include/config_bridge.h
diff --git a/core/src/main/jni/include/native_util.h b/core/src/main/jni/include/native_util.h
index 6689414e..7fa9e3d3 100644
--- a/core/src/main/jni/include/native_util.h
+++ b/core/src/main/jni/include/native_util.h
@@ -31,7 +31,7 @@
 #include "logging.h"
 #include "config.h"
 #include <cassert>
-#include "ConfigBridge.h"
+#include "config_bridge.h"
 
 #define _uintval(p)               reinterpret_cast<uintptr_t>(p)
 #define _ptr(p)                   reinterpret_cast<void *>(p)
diff --git a/core/src/main/jni/src/jni/resources_hook.cpp b/core/src/main/jni/src/jni/resources_hook.cpp
index 6c0cb597..5b62b5c8 100644
--- a/core/src/main/jni/src/jni/resources_hook.cpp
+++ b/core/src/main/jni/src/jni/resources_hook.cpp
@@ -24,7 +24,7 @@
 #include "elf_util.h"
 #include "native_util.h"
 #include "resources_hook.h"
-#include "ConfigBridge.h"
+#include "config_bridge.h"
 
 using namespace lsplant;
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..8049c684 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/magisk-loader/src/main/jni/api/riru_main.cpp b/magisk-loader/src/main/jni/api/riru_main.cpp
index af17864f..bc0a4794 100644
--- a/magisk-loader/src/main/jni/api/riru_main.cpp
+++ b/magisk-loader/src/main/jni/api/riru_main.cpp
@@ -24,7 +24,7 @@
 #include <array>
 #include "logging.h"
 #include "loader.h"
-#include "ConfigImpl.h"
+#include "config_impl.h"
 #include "magisk_loader.h"
 #include "symbol_cache.h"
 
diff --git a/magisk-loader/src/main/jni/api/zygisk_main.cpp b/magisk-loader/src/main/jni/api/zygisk_main.cpp
index 0a404e60..242346cd 100644
--- a/magisk-loader/src/main/jni/api/zygisk_main.cpp
+++ b/magisk-loader/src/main/jni/api/zygisk_main.cpp
@@ -25,7 +25,7 @@
 #include "zygisk.h"
 #include "logging.h"
 #include "loader.h"
-#include "ConfigImpl.h"
+#include "config_impl.h"
 #include "magisk_loader.h"
 #include "symbol_cache.h"
 
diff --git a/magisk-loader/src/main/jni/src/ConfigImpl.h b/magisk-loader/src/main/jni/src/config_impl.h
similarity index 97%
rename from magisk-loader/src/main/jni/src/ConfigImpl.h
rename to magisk-loader/src/main/jni/src/config_impl.h
index e3d5d0c0..4b035422 100644
--- a/magisk-loader/src/main/jni/src/ConfigImpl.h
+++ b/magisk-loader/src/main/jni/src/config_impl.h
@@ -23,7 +23,8 @@
 
 #ifndef LSPOSED_CONFIGIMPL_H
 #define LSPOSED_CONFIGIMPL_H
-#include "ConfigBridge.h"
+
+#include "config_bridge.h"
 #include "service.h"
 
 class ConfigImpl: public ConfigBridge {
diff --git a/magisk-loader/src/main/jni/src/magisk_loader.cpp b/magisk-loader/src/main/jni/src/magisk_loader.cpp
index ee5796e1..6110a845 100644
--- a/magisk-loader/src/main/jni/src/magisk_loader.cpp
+++ b/magisk-loader/src/main/jni/src/magisk_loader.cpp
@@ -22,7 +22,7 @@
 #include <linux/fs.h>
 #include <sys/mman.h>
 
-#include "ConfigImpl.h"
+#include "config_impl.h"
 #include "elf_util.h"
 #include "loader.h"
 #include "magisk_loader.h"
diff --git a/magisk-loader/src/main/jni/src/service.cpp b/magisk-loader/src/main/jni/src/service.cpp
index 1de6ce21..35b62f75 100644
--- a/magisk-loader/src/main/jni/src/service.cpp
+++ b/magisk-loader/src/main/jni/src/service.cpp
@@ -28,7 +28,7 @@
 #include "context.h"
 #include "utils/jni_helper.hpp"
 #include "symbol_cache.h"
-#include "ConfigBridge.h"
+#include "config_bridge.h"
 
 using namespace lsplant;