Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions projectBlueWater/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,16 @@ def getGeneratedVersionCode() {
}

dependencies {
def compose_version = '1.7.8'
def media3_version = '1.5.1'
def lifecycle_version = '2.8.7'
def junit5_version = '5.11.4'
def compose_version = '1.8.1'
def media3_version = '1.6.1'
def lifecycle_version = '2.9.0'
def junit5_version = '5.12.2'

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'

implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.core:core-ktx:1.16.0'
implementation 'androidx.annotation:annotation:1.9.1'
implementation 'androidx.work:work-runtime:2.10.0'
implementation 'androidx.work:work-runtime:2.10.1'
implementation 'androidx.media:media:1.7.0'
implementation 'androidx.palette:palette-ktx:1.0.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
Expand All @@ -186,18 +186,18 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.startup:startup-runtime:1.2.0"
implementation 'com.google.android.material:material:1.12.0'
implementation 'com.google.guava:guava:33.4.0-android'
implementation 'joda-time:joda-time:2.13.1'
implementation 'commons-io:commons-io:2.18.0'
implementation 'org.slf4j:slf4j-api:2.0.16'
implementation 'com.google.guava:guava:33.4.8-android'
implementation 'joda-time:joda-time:2.14.0'
implementation 'commons-io:commons-io:2.19.0'
implementation 'org.slf4j:slf4j-api:2.0.17'
implementation 'com.github.tony19:logback-android:3.0.0'
implementation 'com.namehillsoftware:handoff:0.30.0'
implementation 'io.reactivex.rxjava3:rxjava:3.1.10'
implementation 'com.namehillsoftware:lazy-j:0.11.0'
implementation 'org.jsoup:jsoup:1.18.3'
implementation 'org.jsoup:jsoup:1.20.1'
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-datasource-okhttp:$media3_version"
implementation 'com.squareup.okio:okio:3.10.2'
implementation 'com.squareup.okio:okio:3.11.0'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
implementation 'com.namehillsoftware:querydroid:0.5.2'
implementation "androidx.compose.ui:ui:$compose_version"
Expand All @@ -206,22 +206,22 @@ dependencies {
implementation "androidx.compose.runtime:runtime-rxjava3:$compose_version"
implementation 'androidx.activity:activity-compose:1.10.1'
implementation 'dev.olshevski.navigation:reimagined:1.5.0'
implementation 'com.google.code.gson:gson:2.12.1'
implementation 'com.google.code.gson:gson:2.13.1'
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
testCompileOnly 'junit:junit:4.13.2'
testImplementation 'commons-codec:commons-codec:1.18.0'
testImplementation 'junit:junit:4.13.2'
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation 'org.robolectric:robolectric:4.14.1'
testImplementation 'androidx.test.ext:junit-ktx:1.2.1'
testImplementation 'androidx.test:core:1.6.1'
testImplementation 'androidx.test:runner:1.6.2'
testImplementation 'io.mockk:mockk:1.13.17'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1'
testImplementation 'io.mockk:mockk:1.14.2'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
testImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit5_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
androidTestImplementation "org.assertj:assertj-core:3.27.3"
androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.lasthopesoftware.promises

import androidx.lifecycle.AtomicReference
import com.namehillsoftware.handoff.promises.Promise
import com.namehillsoftware.handoff.promises.propagation.CancellationProxy
import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutionException
import java.util.concurrent.Future
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
import java.util.concurrent.atomic.AtomicReference

fun <Resolution> Promise<Resolution>.toFuture(): Future<Resolution?> = FuturePromise(this)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.assertj.core.api.AssertionsForClassTypes.assertThat
import org.bouncycastle.util.encoders.Hex
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
import java.io.ByteArrayInputStream
import java.security.cert.CertificateException
import java.security.cert.CertificateFactory
import java.security.cert.X509Certificate
Expand Down Expand Up @@ -44,9 +43,8 @@ class WhenValidatingTheClient {
@BeforeAll
fun act() {
val cf = CertificateFactory.getInstance("X.509")
val cert =
ByteArrayInputStream(certificate.toByteArray(Charsets.UTF_8))
.use { caInput -> cf.generateCertificate(caInput) as X509Certificate }
val cert = certificate.trim().toByteArray(Charsets.UTF_8).inputStream()
.use { caInput -> cf.generateCertificate(caInput) as X509Certificate }
val certBytes = Hex.decode("1b6fae967b4a13192d3b65bba33cf7fc510df456")
val selfSignedTrustManager = SelfSignedTrustManager(certBytes, fallbackTrustManager)
try {
Expand Down