Update platform.

ThePalaceProject · Oct 31, 2024 · f4f9cf1 · f4f9cf1
1 parent fc55519
commit f4f9cf1
Show file tree

Hide file tree

Showing 83 changed files with 192 additions and 25 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Verify
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 
-val gradleVersionRequired = "8.2.1"
+val gradleVersionRequired = "8.10.2"
 val gradleVersionReceived = gradle.gradleVersion
 
 if (gradleVersionRequired != gradleVersionReceived) {
@@ -25,6 +25,10 @@ plugins {
         .version("1.9.0")
         .apply(false)
 
+    id("com.github.ben-manes.versions")
+        .version("0.51.0")
+        .apply(true)
+
     /*
      * The AndroidX plugin for navigation (including view binding generation).
      *
@@ -36,11 +40,11 @@ plugins {
         .apply(false)
 
     id("com.android.library")
-        .version("8.1.0")
+        .version("8.5.0")
         .apply(false)
 
     id("com.android.application")
-        .version("8.1.0")
+        .version("8.5.0")
         .apply(false)
 
     /*
@@ -587,6 +591,7 @@ allprojects {
                 encoding = "UTF-8"
                 sourceCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
                 targetCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
+                isCoreLibraryDesugaringEnabled = true
             }
         }
 
@@ -642,6 +647,7 @@ allprojects {
                 encoding = "UTF-8"
                 sourceCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
                 targetCompatibility = JavaVersion.toVersion(jdkBytecodeTarget)
+                isCoreLibraryDesugaringEnabled = true
             }
 
             android.testOptions {
@@ -762,6 +768,7 @@ allprojects {
         "androidTestReleaseImplementation",
         "androidTestReleaseImplementationDependenciesMetadata",
         "annotationProcessor",
+        "coreLibraryDesugaring",
         "debugAndroidTestCompilationImplementation",
         "debugAndroidTestImplementation",
         "debugAndroidTestImplementationDependenciesMetadata",
@@ -822,7 +829,6 @@ allprojects {
         configurations.all {
             isTransitive = transitiveConfigurations.contains(name)
             // resolutionStrategy.failOnVersionConflict()
-            resolutionStrategy.cacheChangingModulesFor(30, TimeUnit.SECONDS)
         }
     }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 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 -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
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ 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='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_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.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/palace-ui/build.gradle.kts b/palace-ui/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.appcompat)

diff --git a/simplified-accessibility/build.gradle.kts b/simplified-accessibility/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-registry-api"))
     implementation(project(":simplified-opds-core"))

diff --git a/simplified-accounts-api/build.gradle.kts b/simplified-accounts-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-announcements"))
     implementation(project(":simplified-links"))
     implementation(project(":simplified-opds-core"))

diff --git a/simplified-accounts-database-api/build.gradle.kts b/simplified-accounts-database-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-registry-api"))
     implementation(project(":simplified-accounts-source-spi"))

diff --git a/simplified-accounts-database/build.gradle.kts b/simplified-accounts-database/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-json"))

diff --git a/simplified-accounts-json/build.gradle.kts b/simplified-accounts-json/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-announcements"))
     implementation(project(":simplified-books-formats-api"))

diff --git a/simplified-accounts-registry-api/build.gradle.kts b/simplified-accounts-registry-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-taskrecorder-api"))
 

diff --git a/simplified-accounts-registry/build.gradle.kts b/simplified-accounts-registry/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-registry-api"))
     implementation(project(":simplified-accounts-source-spi"))

diff --git a/simplified-accounts-source-filebased/build.gradle.kts b/simplified-accounts-source-filebased/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-json"))
     implementation(project(":simplified-accounts-source-spi"))

diff --git a/simplified-accounts-source-nyplregistry/build.gradle.kts b/simplified-accounts-source-nyplregistry/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-json"))
     implementation(project(":simplified-accounts-registry-api"))

diff --git a/simplified-accounts-source-spi/build.gradle.kts b/simplified-accounts-source-spi/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-buildconfig-api"))
     implementation(project(":simplified-taskrecorder-api"))

diff --git a/simplified-adobe-extensions/build.gradle.kts b/simplified-adobe-extensions/build.gradle.kts
@@ -9,6 +9,8 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-files"))
     implementation(project(":simplified-json-core"))

diff --git a/simplified-analytics-api/build.gradle.kts b/simplified-analytics-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-opds-core"))
 

diff --git a/simplified-analytics-circulation/build.gradle.kts b/simplified-analytics-circulation/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-analytics-api"))
     implementation(project(":simplified-threads"))

diff --git a/simplified-android-ktx/build.gradle.kts b/simplified-android-ktx/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.androidx.activity)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core)

diff --git a/simplified-app-palace/build.gradle.kts b/simplified-app-palace/build.gradle.kts
@@ -234,6 +234,8 @@ afterEvaluate {
 }
 
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":palace-ui"))
     implementation(project(":simplified-accessibility"))
     implementation(project(":simplified-accounts-api"))

diff --git a/simplified-bookmarks-api/build.gradle.kts b/simplified-bookmarks-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-books-api"))

diff --git a/simplified-bookmarks/build.gradle.kts b/simplified-bookmarks/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-bookmarks-api"))

diff --git a/simplified-books-api/build.gradle.kts b/simplified-books-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-json-core"))
     implementation(project(":simplified-lcp"))

diff --git a/simplified-books-audio/build.gradle.kts b/simplified-books-audio/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-books-database-api"))
     implementation(project(":simplified-presentableerror-api"))

diff --git a/simplified-books-borrowing/build.gradle.kts b/simplified-books-borrowing/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-adobe-extensions"))

diff --git a/simplified-books-bundled-api/build.gradle.kts b/simplified-books-bundled-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlin.reflect)
 

diff --git a/simplified-books-controller-api/build.gradle.kts b/simplified-books-controller-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-books-api"))

diff --git a/simplified-books-controller/build.gradle.kts b/simplified-books-controller/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-accounts-database-api"))
     implementation(project(":simplified-accounts-registry"))

diff --git a/simplified-books-covers/build.gradle.kts b/simplified-books-covers/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-bundled-api"))
     implementation(project(":simplified-books-registry-api"))

diff --git a/simplified-books-database-api/build.gradle.kts b/simplified-books-database-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-formats-api"))

diff --git a/simplified-books-database/build.gradle.kts b/simplified-books-database/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-accounts-api"))
     implementation(project(":simplified-bookmarks-api"))
     implementation(project(":simplified-books-api"))

diff --git a/simplified-books-formats-api/build.gradle.kts b/simplified-books-formats-api/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
 
     implementation(libs.irradia.mime.api)

diff --git a/simplified-books-formats/build.gradle.kts b/simplified-books-formats/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-api"))
     implementation(project(":simplified-books-formats-api"))
 

diff --git a/simplified-books-preview/build.gradle.kts b/simplified-books-preview/build.gradle.kts
@@ -1,4 +1,6 @@
 dependencies {
+    coreLibraryDesugaring(libs.android.desugaring)
+
     implementation(project(":simplified-books-audio"))
     implementation(project(":simplified-books-database-api"))
     implementation(project(":simplified-books-formats-api"))