From 8d0e36c523d332c3c3bda1fdef6985df58d3f5ed Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sun, 12 Jan 2025 19:48:42 -0500 Subject: [PATCH] Update dependencies Signed-off-by: Andrew Gunnerson --- .github/workflows/ci.yml | 4 +- .github/workflows/release.yml | 2 +- app/build.gradle.kts | 27 +- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 736 +++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 3 +- 7 files changed, 387 insertions(+), 391 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 765ca5a..e5ba395 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,10 +16,10 @@ jobs: submodules: true - name: Validate gradle wrapper checksum - uses: gradle/actions/wrapper-validation@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1 + uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2 - name: Set up JDK 21 - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 + uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd5da31..84ccf8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Create release - uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0 + uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: v${{ steps.get_version.outputs.version }} diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 98cdfaf..47556c3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson + * SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson * SPDX-License-Identifier: GPL-3.0-only */ @@ -239,6 +239,14 @@ interface InjectedExecOps { @get:Inject val execOps: ExecOperations } +// https://github.com/gradle/gradle/issues/12247 +class LazyString(private val source: Lazy) : java.io.Serializable { + constructor(source: () -> String) : this(lazy(source)) + constructor(source: Provider) : this(source::get) + + override fun toString() = source.value +} + val rcbridge = tasks.register("rcbridge") { val rcbridgeSrcDir = File(rootDir, "rcbridge") val tempDir = rcbridgeDir.map { it.dir("temp") } @@ -252,7 +260,10 @@ val rcbridge = tasks.register("rcbridge") { inputs.properties( "android.defaultConfig.minSdk" to android.defaultConfig.minSdk, "android.namespace" to android.namespace, - "android.ndkDirectory" to android.ndkDirectory, + "androidComponents.sdkComponents.ndkDirectory" to + androidComponents.sdkComponents.ndkDirectory.map { it.asFile.absolutePath }, + "androidComponents.sdkComponents.sdkDirectory" to + androidComponents.sdkComponents.sdkDirectory.map { it.asFile.absolutePath }, ) outputs.files( rcbridgeDir.map { it.file("rcbridge.aar") }, @@ -260,19 +271,21 @@ val rcbridge = tasks.register("rcbridge") { ) executable = "gomobile" - args = listOf( + args( "bind", "-v", - "-o", rcbridgeAar.get().asFile.absolutePath, + "-o", LazyString(rcbridgeAar.map { it.asFile.absolutePath }), "-target=android", "-androidapi=${android.defaultConfig.minSdk}", "-javapkg=${android.namespace}.binding", ".", ) environment( - "ANDROID_HOME" to android.sdkDirectory, - "ANDROID_NDK_HOME" to android.ndkDirectory, - "TMPDIR" to tempDir.get().asFile.absolutePath, + "ANDROID_HOME" to LazyString(androidComponents.sdkComponents.sdkDirectory + .map { it.asFile.absolutePath }), + "ANDROID_NDK_HOME" to LazyString(androidComponents.sdkComponents.ndkDirectory + .map { it.asFile.absolutePath }), + "TMPDIR" to LazyString(tempDir.map { it.asFile.absolutePath }), ) if (!environment.containsKey("GOPROXY")) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5d4b503..c2d1d35 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] activity-ktx = "1.9.3" -android-gradle-plugin = "8.7.3" +android-gradle-plugin = "8.8.0" appcompat = "1.7.0" biometric = "1.1.0" core-ktx = "1.15.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 3465ec5..a25c892 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -256,28 +256,28 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -770,231 +770,231 @@ - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -1021,284 +1021,284 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + @@ -2204,12 +2204,12 @@ - - - + + + - - + + @@ -2492,20 +2492,12 @@ - - - + + + - - - - - - - - - - + + @@ -2556,20 +2548,12 @@ - - - - - - - - - - - + + + - - + + @@ -2596,9 +2580,9 @@ - - - + + + @@ -2630,12 +2614,12 @@ - - - + + + - - + + @@ -2667,12 +2651,12 @@ - - - + + + - - + + @@ -2836,44 +2820,44 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb1a55b..e1b837a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/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