TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-21 15:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade gradle

Browse Source
This commit is contained in:
LoveSy 2024-07-13 00:50:24 +08:00 committed by John Wu
parent 2963d4ca9e
commit a97191052b
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/java/Codegen.kt
View File

@ -164,11 +164,11 @@ abstract class ManifestUpdater: DefaultTask() {
// Shuffle the order of the components // Shuffle the order of the components
cmpList.shuffle(RANDOM) cmpList.shuffle(RANDOM)
val (factoryPkg, factoryClass) = factoryClassDir.asFileTree.first().let { val (factoryPkg, factoryClass) = factoryClassDir.asFileTree.firstNotNullOf {
it.parentFile.name to it.name.removeSuffix(".java") it.parentFile!!.name to it.name.removeSuffix(".java")
} }
val (appPkg, appClass) = appClassDir.asFileTree.first().let { val (appPkg, appClass) = appClassDir.asFileTree.firstNotNullOf {
it.parentFile.name to it.name.removeSuffix(".java") it.parentFile!!.name to it.name.removeSuffix(".java")
} }
val components = cmpList.joinToString("\n\n") val components = cmpList.joinToString("\n\n")
.replace("\${applicationId}", applicationId.get()) .replace("\${applicationId}", applicationId.get())

2
buildSrc/src/main/java/Setup.kt
View File

@ -231,7 +231,7 @@ abstract class AddCommentTask: DefaultTask() {
noTimestamps = true noTimestamps = true
autoSortFiles = true autoSortFiles = true
} }
outFile.parentFile.mkdirs() outFile.parentFile?.mkdirs()
inFile.copyTo(outFile, overwrite = true) inFile.copyTo(outFile, overwrite = true)
ZFiles.apk(outFile, options).use { ZFiles.apk(outFile, options).use {
SigningExtension(signingOptions).register(it) SigningExtension(signingOptions).register(it)

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

5
gradlew vendored
View File

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # 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. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

2
gradlew.bat vendored
View File

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################