Merge branch 'master' into tracing_interceptor

# Conflicts:
#	gradle/libs.versions.toml
#	okhttp-android/build.gradle.kts
#	okhttp-logging-interceptor/src/main/kotlin/okhttp3/logging/LoggingEventListener.kt
#	okhttp/src/androidMain/kotlin/okhttp3/android/TracingConnectionListener.kt
#	okhttp/src/androidMain/kotlin/okhttp3/android/TracingInterceptor.kt

.devcontainer/devcontainer.json

@@ -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"
+          ]
+      }
+  }
+}

.editorconfig

@@ -2,9 +2,10 @@ root = true
 
 [*]
 indent_size = 2
+ij_continuation_indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.{kt, kts}]
-kotlin_imports_layout = ascii
+ij_kotlin_imports_layout = *

.github/renovate.json

@@ -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)"
     }
   ]
 }