Skip to content
Open
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
4 changes: 2 additions & 2 deletions pkgs/ok_http/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

- `OkHttpClient` now receives an `OkHttpClientConfiguration` to configure the client on a per-call basis.
- `OkHttpClient` supports setting four types of timeouts: [`connectTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/connect-timeout.html), [`readTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/read-timeout.html), [`writeTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/write-timeout.html), and [`callTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/call-timeout.html), using the `OkHttpClientConfiguration`.
- Upgrade to `jni` 0.14.0
- Upgrade to `jnigen` 0.14.0
- Upgrade to `jni` 0.15.2
- Upgrade to `jnigen` 0.15.0
- `OKHttpClient` supports client certificates.
- Support `package:web_socket` 1.0.0.
- Set `minSdk=24`.
Expand Down
6 changes: 3 additions & 3 deletions pkgs/ok_http/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ group = "com.example.ok_http"
version = "1.0"

buildscript {
ext.kotlin_version = '1.8.22'
ext.kotlin_version = '2.2.20'
repositories {
google()
mavenCentral()
}

dependencies {
// The Android Gradle Plugin knows how to build native code with the NDK.
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.11.1")
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down Expand Up @@ -42,7 +42,7 @@ android {

// Bumping the plugin compileSdk version requires all clients of this plugin
// to bump the version in their app.
compileSdk = 35
compileSdk = 36

// Use the NDK version
// declared in /android/app/build.gradle file of the Flutter project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ class FixedResponseX509ExtendedKeyManager(
private val alias: String,
) : X509ExtendedKeyManager() {

override fun getClientAliases(keyType: String, issuers: Array<Principal>?) = arrayOf(alias)
override fun getClientAliases(keyType: String?, issuers: Array<Principal?>?) = arrayOf(alias)

override fun chooseClientAlias(
keyType: Array<String>,
issuers: Array<Principal>?,
keyType: Array<String?>?,
issuers: Array<Principal?>?,
socket: Socket?,
) = alias

override fun getServerAliases(keyType: String, issuers: Array<Principal>?) = arrayOf(alias)
override fun getServerAliases(keyType: String?, issuers: Array<Principal?>?) = arrayOf(alias)

override fun chooseServerAlias(
keyType: String,
issuers: Array<Principal>?,
keyType: String?,
issuers: Array<Principal?>?,
socket: Socket?,
) = alias

override fun getCertificateChain(alias: String) = certificateChain
override fun getCertificateChain(alias: String?) = certificateChain

override fun getPrivateKey(alias: String) = privateKey
override fun getPrivateKey(alias: String?) = privateKey

override fun chooseEngineClientAlias(
keyType: Array<String?>?,
Expand Down
Loading
Loading