Merge remote-tracking branch 'origin/master'

This commit is contained in:
WhiteChi 2023-12-19 22:10:03 +08:00
commit 31936feb98
8 changed files with 16 additions and 14 deletions

View File

@ -126,6 +126,11 @@ android {
} }
configureAppSigningConfigsForRelease(project) configureAppSigningConfigsForRelease(project)
packagingOptions {
jniLibs {
useLegacyPackaging = true
}
}
} }
fun configureAppSigningConfigsForRelease(project: Project) { fun configureAppSigningConfigsForRelease(project: Project) {

View File

@ -3,10 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:name=".app.MyApplication" android:name=".app.MyApplication"
@ -19,7 +15,6 @@
android:theme="@style/Theme.Shamrock" android:theme="@style/Theme.Shamrock"
android:zygotePreloadName="@string/app_name" android:zygotePreloadName="@string/app_name"
android:multiArch="true" android:multiArch="true"
android:extractNativeLibs="true"
tools:targetApi="31"> tools:targetApi="31">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"

View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.1.2" apply false id("com.android.application") version "8.2.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.10" apply false id("org.jetbrains.kotlin.android") version "1.8.10" apply false
id("com.android.library") version "8.1.2" apply false id("com.android.library") version "8.2.0" apply false
//id("io.realm.kotlin") version "1.11.0" apply false //id("io.realm.kotlin") version "1.11.0" apply false
} }

Binary file not shown.

View File

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

3
gradlew vendored
View File

@ -83,7 +83,8 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

View File

@ -5,10 +5,10 @@ plugins {
android { android {
namespace = "moe.fuqiuluo.qqinterface" namespace = "moe.fuqiuluo.qqinterface"
compileSdk = 33 compileSdk = 34
defaultConfig { defaultConfig {
minSdk = 24 minSdk = 27
consumerProguardFiles("consumer-rules.pro") consumerProguardFiles("consumer-rules.pro")
} }

View File

@ -8,12 +8,13 @@ plugins {
android { android {
namespace = "moe.fuqiuluo.xposed" namespace = "moe.fuqiuluo.xposed"
compileSdk = 33 compileSdk = 34
defaultConfig { defaultConfig {
minSdk = 24 minSdk = 27
consumerProguardFiles("consumer-rules.pro") consumerProguardFiles("consumer-rules.pro")
@Suppress("UnstableApiUsage")
externalNativeBuild { externalNativeBuild {
cmake { cmake {
cppFlags += "" cppFlags += ""