Skip to content

Commit

Permalink
Update 2.3.3
Browse files Browse the repository at this point in the history
* Gradle 8.9
* AGP 8.5.1
* ezXHelper 2.2.0
* AndroidSDK 35
  • Loading branch information
YuKongA committed Jul 12, 2024
1 parent be9b1a4 commit 054d7eb
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 36 deletions.
35 changes: 11 additions & 24 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")

import com.android.build.gradle.internal.api.BaseVariantOutputImpl
import java.util.Properties

Expand All @@ -8,13 +10,13 @@ plugins {

android {
namespace = "top.yukonga.mediaControlBlur"
compileSdk = 34
compileSdk = 35
defaultConfig {
applicationId = namespace
minSdk = 34
targetSdk = 34
versionCode = 2320
versionName = "2.3.2"
targetSdk = 35
versionCode = 2330
versionName = "2.3.3"
}
val properties = Properties()
runCatching { properties.load(project.rootProject.file("local.properties").inputStream()) }
Expand Down Expand Up @@ -48,33 +50,18 @@ android {
release {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
vcsInfo.include = false
proguardFiles("proguard-rules.pro")
signingConfig = signingConfigs.getByName(if (keystorePath != null) "github" else "release")
}
debug {
if (keystorePath != null) signingConfig = signingConfigs.getByName("github")
}
}
java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}
kotlin {
jvmToolchain(21)
compilerOptions {
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions",
"-Xno-receiver-assertions",
"-language-version=2.0"
)
}
}
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
kotlin.jvmToolchain(21)
packaging {
resources {
excludes += "**"
}
resources. excludes += "**"
applicationVariants.all {
outputs.all {
(this as BaseVariantOutputImpl).outputFileName = "MediaControlBlur-$versionName.apk"
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
agp = "8.4.1"
ezXHelper = "2.1.0"
agp = "8.5.1"
ezXHelper = "2.2.0"
kotlin = "2.0.0"
xposed = "82"

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#Tue Dec 12 16:56:06 CST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions gradlew
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -202,7 +203,7 @@ fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
4 changes: 0 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,5 @@ dependencyResolutionManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
}

rootProject.name = "MediaControlBlur"
include(":app")

0 comments on commit 054d7eb

Please sign in to comment.