Merge tag 'v0.78.2' into ci

v0.78.2

- Finalize errors produced by SVR-B operations.

Author: tulir

Cargo.lock

@@ -37,7 +37,7 @@ default-members = [
 resolver = "2" # so that our dev-dependency features don't leak into products
 
 [workspace.package]
-version = "0.78.0"
+version = "0.78.2"
 authors = ["Signal Messenger LLC"]
 license = "AGPL-3.0-only"
 rust-version = "1.83.0"

Cargo.toml

@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'LibSignalClient'
-  s.version          = '0.78.0'
+  s.version          = '0.78.2'
   s.summary          = 'A Swift wrapper library for communicating with the Signal messaging service.'
 
   s.homepage         = 'https://github.com/signalapp/libsignal'

LibSignalClient.podspec

@@ -1,12 +1,3 @@
-v0.78.0
+v0.78.2
 
-## SVR-B
-
-- Operations have been consistently renamed to `store` and `restore`.
-- `restore` now returns an object containing both the BackupForwardSecrecyToken for decryption, and "secret data" to be used in the first `store` after restoration.
-- `SvrB` now has a `createNewBackupChain` method, allowing you to locally persist the backup "secret data" *before* the first store to SVR-B for a fresh install.
-- With the first two changes, the secret data argument to `restore` is now required. See doc comments for more details.
-
-## Other changes
-
-- Rust: `SessionRecord::has_usable_sender_chain` now takes an additional parameter to specify which criteria make a session "usable" beyond simply *having* a sender chain. The previous behavior can be requested by using `SessionUsabilityRequirements::NotStale`.
+- Finalize errors produced by SVR-B operations.

RELEASE_NOTES.md

@@ -9,8 +9,9 @@ public class AndroidBase64 : org.signal.libsignal.util.Base64.Impl {
 
   public override fun encode(raw: ByteArray): String = Base64.encodeToString(raw, Base64.NO_WRAP)
 
-  public override fun encodeUrl(raw: ByteArray): String = Base64.encodeToString(
-    raw,
-    Base64.NO_WRAP or Base64.NO_PADDING or Base64.URL_SAFE,
-  )
+  public override fun encodeUrl(raw: ByteArray): String =
+    Base64.encodeToString(
+      raw,
+      Base64.NO_WRAP or Base64.NO_PADDING or Base64.URL_SAFE,
+    )
 }

java/android/src/androidTest/java/org/signal/libsignal/util/AndroidBase64.kt

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id "base"
     id "signing"
-    id "com.diffplug.spotless" version "6.20.0"
+    id "com.diffplug.spotless" version "7.2.1"
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
 
     id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false
@@ -15,8 +15,14 @@ plugins {
     id 'org.jetbrains.kotlin.android' version "2.1.0" apply false
 }
 
+repositories {
+    mavenCentral()
+    google()
+    mavenLocal()
+}
+
 allprojects {
-    version = "0.78.0"
+    version = "0.78.2"
     group   = "org.signal"
 
     tasks.withType(KotlinCompile).configureEach {
@@ -45,25 +51,7 @@ subprojects {
         }
     }
 
-    apply plugin: "com.diffplug.spotless"
     apply plugin: "org.jetbrains.dokka"
-    spotless {
-        kotlin {
-            target('**/*.kt')
-            targetExclude("**/acknowledgments/**")
-            ktlint()
-        }
-        java {
-            target('**/*.java')
-            targetExclude('**/Native.java', '**/NativeTesting.java')
-            importOrder()
-            removeUnusedImports()
-
-            googleJavaFormat()
-            formatAnnotations()
-            licenseHeaderFile rootProject.file('license_header.txt')
-        }
-    }
 }
 
 task makeJniLibrariesDesktop(type:Exec) {
@@ -142,3 +130,32 @@ nexusPublishing {
 def isReleaseBuild() {
     return version.contains("SNAPSHOT") == false
 }
+
+// Late evaluation after this point.
+
+evaluationDependsOnChildren()
+
+spotless {
+    kotlin {
+        target allprojects.collectMany {
+            return it.tasks.withType(KotlinCompile)
+        }.inject(files()) { collected, next ->
+            collected + next.sources
+        }
+        ktlint()
+    }
+    java {
+        target allprojects.collectMany {
+            return it.tasks.withType(JavaCompile)
+        }.inject(files()) { collected, next ->
+            collected + next.source
+        }
+        targetExclude('**/Native.java', '**/NativeTesting.java')
+        importOrder()
+        removeUnusedImports()
+
+        googleJavaFormat()
+        formatAnnotations()
+        licenseHeaderFile rootProject.file('license_header.txt')
+    }
+}

java/build.gradle

@@ -19,23 +19,24 @@ import kotlin.coroutines.resumeWithException
  * @throws Exception if the CompletableFuture completed exceptionally
  * @throws CancellationException if the coroutine was cancelled
  */
-public suspend fun <T> CompletableFuture<T>.await(): T = suspendCancellableCoroutine { c ->
-  // From https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/-cancellable-continuation/
-  val future = this
-  future.whenComplete { result, throwable ->
-    if (throwable != null) {
-      // Resume continuation with an exception if an external source failed
-      c.resumeWithException(throwable)
-    } else {
-      // Resume continuation with a value if it was computed
-      c.resume(result)
+public suspend fun <T> CompletableFuture<T>.await(): T =
+  suspendCancellableCoroutine { c ->
+    // From https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/-cancellable-continuation/
+    val future = this
+    future.whenComplete { result, throwable ->
+      if (throwable != null) {
+        // Resume continuation with an exception if an external source failed
+        c.resumeWithException(throwable)
+      } else {
+        // Resume continuation with a value if it was computed
+        c.resume(result)
+      }
+    }
+    // Cancel the computation if the continuation itself was cancelled because a caller of 'await' is cancelled
+    c.invokeOnCancellation {
+      future.cancel(true)
     }
   }
-  // Cancel the computation if the continuation itself was cancelled because a caller of 'await' is cancelled
-  c.invokeOnCancellation {
-    future.cancel(true)
-  }
-}
 
 /**
  * Converts a `CompletableFuture<T>` to a `CompletableFuture<Result<T>>`.
@@ -48,12 +49,11 @@ public suspend fun <T> CompletableFuture<T>.await(): T = suspendCancellableCorou
  *
  * @return A new CompletableFuture that completes with `Result.success(value)` or `Result.failure(exception)`
  */
-public fun <T> CompletableFuture<T>.toResultFuture(): CompletableFuture<Result<T>> {
-  return this.handle { value, throwable ->
+public fun <T> CompletableFuture<T>.toResultFuture(): CompletableFuture<Result<T>> =
+  this.handle { value, throwable ->
     if (throwable == null) {
       Result.success(value)
     } else {
       Result.failure(throwable)
     }
   }
-}