diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee1d3a84..5c5b94c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this library adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Gradle 8.5
+
 ## [2.0.3] - 2023-11-08
 
 ### Added
diff --git a/build-conventions/build.gradle.kts b/build-conventions/build.gradle.kts
index 778329af..92580a41 100644
--- a/build-conventions/build.gradle.kts
+++ b/build-conventions/build.gradle.kts
@@ -24,7 +24,7 @@ buildscript {
 dependencyLocking {
     // This property is treated specially, as it is not defined by default in the root gradle.properties
     // and declaring it in the root gradle.properties is ignored by included builds. This only picks up
-    // a value declared as a system property, a command line argument, or a an environment variable.
+    // a value declared as a system property, a command line argument, or an environment variable.
     val isDependencyLockingEnabled = if (project.hasProperty("ZCASH_IS_DEPENDENCY_LOCKING_ENABLED")) {
         project.property("ZCASH_IS_DEPENDENCY_LOCKING_ENABLED").toString().toBoolean()
     } else {
diff --git a/build-conventions/buildscript-gradle.lockfile b/build-conventions/buildscript-gradle.lockfile
index f9c8c199..3dec884a 100644
--- a/build-conventions/buildscript-gradle.lockfile
+++ b/build-conventions/buildscript-gradle.lockfile
@@ -1,38 +1,35 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.1.0=classpath
-org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.0=classpath
+org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.2.1=classpath
+org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-assignment:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-native-utils:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-project-model:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-util-io:1.9.0=classpath
-org.jetbrains.kotlin:kotlin-util-klib:1.9.0=classpath
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-assignment:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-native-utils:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-project-model:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-util-io:1.9.20=classpath
+org.jetbrains.kotlin:kotlin-util-klib:1.9.20=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
 org.jetbrains:annotations:13.0=classpath
 empty=
diff --git a/build-conventions/gradle.lockfile b/build-conventions/gradle.lockfile
index 4ffaf998..0250c6bf 100644
--- a/build-conventions/gradle.lockfile
+++ b/build-conventions/gradle.lockfile
@@ -113,14 +113,14 @@ org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath
 org.jdom:jdom2:2.0.6=runtimeClasspath
 org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-assignment-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-build-tools-api:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-compiler-runner:1.9.10=runtimeClasspath
 org.jetbrains.kotlin:kotlin-daemon-client:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.10=runtimeClasspath
@@ -133,25 +133,22 @@ org.jetbrains.kotlin:kotlin-native-utils:1.9.10=compileClasspath,runtimeClasspat
 org.jetbrains.kotlin:kotlin-project-model:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
 org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.9.0=compileClasspath
-org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-reflect:1.9.20=compileClasspath
+org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-common:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10=runtimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0=kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.10=runtimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=compileClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=compileClasspath
 org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=runtimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
+org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
 org.jetbrains.kotlin:kotlin-tooling-core:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-io:1.9.10=compileClasspath,runtimeClasspath
 org.jetbrains.kotlin:kotlin-util-klib:1.9.10=compileClasspath,runtimeClasspath
diff --git a/gradle.properties b/gradle.properties
index cfacdde9..f3e1913b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -88,7 +88,7 @@ DETEKT_VERSION=1.23.0
 DETEKT_COMPOSE_RULES_VERSION=0.2.1
 DOKKA_VERSION=1.8.20
 EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.12.2
-FLANK_VERSION=23.07.0
+FLANK_VERSION=23.10.1
 # When changing this, be sure to change build-conventions/gradle.properties#FOOJAY_TOOLCHAIN_RESOLVER_VERSION too
 FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.5.0
 FULLADLE_VERSION=0.17.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 864d6c47..db8c3baa 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=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ 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
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | 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
@@ -202,11 +202,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/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt
index e174a20d..39fc73df 100644
--- a/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt
+++ b/sdk-lib/src/main/java/cash/z/ecc/android/sdk/internal/transaction/TransactionEncoderImpl.kt
@@ -18,7 +18,7 @@ import cash.z.ecc.android.sdk.model.Zatoshi
  * behaving like a stateless API so that callers can request [createTransaction] and receive a
  * result, even though there are intermediate database interactions.
  *
- * @property rustBackend the instance of RustBackendWelding to use for creating and validating.
+ * @property backend the instance of RustBackendWelding to use for creating and validating.
  * @property repository the repository that stores information about the transactions being created
  * such as the raw bytes and raw txId.
  */
@@ -35,7 +35,7 @@ internal class TransactionEncoderImpl(
      *
      * @param usk the unified spending key associated with the notes that will be spent.
      * @param amount the amount of zatoshi to send.
-     * @param toAddress the recipient's address.
+     * @param recipient the recipient's address.
      * @param memo the optional memo to include as part of the transaction.
      *
      * @return the successfully encoded transaction or an exception