Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid expensive SSL init on main #8248

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'master' into avoid_init_on_main
# Conflicts:
#	okhttp/src/commonJvmAndroid/kotlin/okhttp3/OkHttpClient.kt
#	okhttp/src/jvmTest/kotlin/okhttp3/OkHttpClientConstructionTest.kt
yschimke committed Jan 4, 2025
commit 0b92aca24aaa1f7e180282e41a6241b543847a61
19 changes: 19 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"image": "mcr.microsoft.com/devcontainers/java:21-bookworm",
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "17"
}
},
"customizations": {
"vscode": {
"settings": {
"java.server.launchMode": "Standard"
},
"extensions": [
"vscjava.vscode-java-pack",
"vscjava.vscode-gradle"
]
}
}
}
40 changes: 25 additions & 15 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,50 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"config:recommended",
":dependencyDashboard",
"schedule:weekly"
],
"labels": ["renovate"],
"labels": [
"renovate"
],
"ignoreDeps": [
"com.squareup.okhttp3:okhttp",
"com.squareup.okhttp3:okhttp-tls",
"com.squareup.okhttp3:mockwebserver"
],
"packageRules": [
{
"matchPackageNames": ["org.objenesis:objenesis"],
"groupName": "bnd",
"matchPackageNames": [
"/biz.*/"
]
},
{
"groupName": "graalvm",
"matchPackageNames": [
"/org.graalvm.*/"
]
},
{
"matchPackageNames": [
"org.objenesis:objenesis"
],
"allowedVersions": "<=2.6"
},
{
"matchPackageNames": ["org.eclipse.jetty:jetty-client"],
"matchPackageNames": [
"org.eclipse.jetty:jetty-client"
],
"allowedVersions": "<10.0",
"description": "JDK 11 requirement"
},
{
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
"matchPackageNames": [
"org.junit-pioneer:junit-pioneer"
],
"allowedVersions": "<2.0.0",
"description": "JDK 11 requirement"
},
{
"matchPackageNames": ["gradle"],
"allowedVersions": "<8.0",
"description": "Recent release, not compatible with pinned AGP and Kotlin versions yet. Wait for AGP 8?"
},
{
"matchPackageNames": ["com.android.tools.build:gradle"],
"allowedVersions": "<7.4",
"description": "Recent release, no compatible Intellij stable release (2023.1)"
}
]
}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.