diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index a4b76b9530..1b33c55baa 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index c1d5e01859..7705927e94 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index f5feea6d6b..23d15a9367 100755 --- a/android/gradlew +++ b/android/gradlew @@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi 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, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/android/gradlew.bat b/android/gradlew.bat index 9b42019c79..5eed7ee845 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/pages/app/p/[package].bundle.[bundle].vue b/src/pages/app/p/[package].bundle.[bundle].vue index eecb3ed9aa..8d5838682e 100644 --- a/src/pages/app/p/[package].bundle.[bundle].vue +++ b/src/pages/app/p/[package].bundle.[bundle].vue @@ -673,132 +673,132 @@ async function deleteBundle() { class="flex flex-col overflow-hidden overflow-y-auto bg-white border border-slate-300 shadow-lg md:rounded-lg dark:border-slate-900 dark:bg-slate-800" >
- - {{ version.name }} - - - {{ version.id.toString() }} - - - {{ formatDate(version.created_at) }} - - - {{ formatDate(version.updated_at) }} - - - - {{ hideString(version.checksum) }} - - - - {{ version.min_update_version }} - - - -
-
- - {{ chn!.name }} - + + {{ version.name }} + + + {{ version.id.toString() }} + + + {{ formatDate(version.created_at) }} + + + {{ formatDate(version.updated_at) }} + + + + {{ hideString(version.checksum) }} + + + + {{ version.min_update_version }} + + + +
+
+ + {{ chn!.name }} + + +
+
+ + + {{ t('set-bundle') }} + + + {{ t('encrypted') }} + + + {{ t('not-encrypted-bundle') }} + + + + {{ hideString(version.session_key) }} + + + + {{ version.external_url }} + + + + {{ version.link }} + + + + {{ version.comment }} + + + + {{ showSize }} + + + {{ t('cannot-calculate-size-of-partial-bundle') }} + + + {{ t('enabled') }} + + + {{ t('enabled') }} + + + + + + {{ t('bundle-active') }} -
-
- - - {{ t('set-bundle') }} - - - {{ t('encrypted') }} - - - {{ t('not-encrypted-bundle') }} - - - - {{ hideString(version.session_key) }} - - - - {{ version.external_url }} - - - - {{ version.link }} - - - - {{ version.comment }} - - - - {{ showSize }} - - - {{ t('cannot-calculate-size-of-partial-bundle') }} - - - {{ t('enabled') }} - - - {{ t('enabled') }} - - - - - - {{ t('bundle-active') }} - - - - - - - {{ t('bundle-deleted') }} - + + + + + + {{ t('bundle-deleted') }} +
diff --git a/src/pages/app/p/[package].channel.[channel].vue b/src/pages/app/p/[package].channel.[channel].vue index 92c5d3154f..1e97a6e532 100644 --- a/src/pages/app/p/[package].channel.[channel].vue +++ b/src/pages/app/p/[package].channel.[channel].vue @@ -711,143 +711,143 @@ async function handleRevert() {
- - {{ channel.name }} - - - -
- {{ channel.version.name }} - +
+ + + {{ channel.version.min_update_version ?? t('undefined-fail') }} + + + + {{ formatDate(channel.created_at) }} + + + + {{ formatDate(channel.updated_at) }} + + + + {{ channel.version.link }} + + + + {{ channel.version.comment }} + + + + + + + + + + + + + + +
+ + {{ getAutoUpdateLabel(channel.disable_auto_update) }} + + + +
+ + + + + + + + + + + + -
- - - {{ channel.version.min_update_version ?? t('undefined-fail') }} - - - - {{ formatDate(channel.created_at) }} - - - - {{ formatDate(channel.updated_at) }} - - - - {{ channel.version.link }} - - - - {{ channel.version.comment }} - - - - - - - - - - - - - - -
- - {{ getAutoUpdateLabel(channel.disable_auto_update) }} - - - -
- - - - - - - - - - - - - +