This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 81905b169e30b0e51e3cd3bdef64f20265a60714 Author: Solr Bot <[email protected]> AuthorDate: Mon Sep 14 16:08:12 2026 +0200 Update Admin UI (#4841) Co-authored-by: Eric Pugh <[email protected]> (cherry picked from commit 9d6380ac373231d6527f270f2d707ed3c1454cf7) --- gradle/libs.versions.toml | 14 +++++++------- settings.gradle | 2 +- solr/modules/jwt-auth/gradle.lockfile | 8 ++++---- .../kotlin/org/apache/solr/ui/views/theme/Theme.kt | 5 ----- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 168ada919d3..8692f2bd989 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,9 +15,9 @@ [versions] adobe-testing-s3mock = "5.2.0" amazon-awssdk = "2.54.6" -androidx-adaptive = "1.3.0-alpha07" -androidx-lifecycle = "2.10.0" -androidx-navigation3 = "1.1.0" +androidx-adaptive = "1.3.0-rc01" +androidx-lifecycle = "2.11.0" +androidx-navigation3 = "1.1.1" # @keep Antora version used in ref-guide antora = "3.1.12" # @keep Most recent commit as of 2025-08-03, this repo does not have tags @@ -77,7 +77,7 @@ codehaus-woodstox = "4.3.0" commons-cli = "1.11.0" commons-codec = "1.22.1" commons-io = "2.22.0" -compose = "1.11.1" +compose = "1.12.0" cuvs-java = "26.08.1" cuvs-lucene = "25.12.0" decompose = "3.5.0" @@ -89,7 +89,7 @@ eclipse-ecj = "3.46.0" eclipse-jetty = "12.0.34" # @keep jgit version used by git-status.gradle eclipse-jgit = "7.7.1.202607240634-r" -essenty = "2.5.0" +essenty = "2.6.0" fasterxml = "2.22.2" fasterxml-woodstox = "7.2.2" # @keep Flexmark used in classpath @@ -142,7 +142,7 @@ jna = "5.19.1" # @keep for version alignment joda-time = "2.14.3" junit = "4.13.2" -kotlin = "2.4.0" +kotlin = "2.4.20" # @keep for version alignment kotlinx-atomicfu = "0.33.0" # @keep for version alignment @@ -152,7 +152,7 @@ kotlinx-datetime = "0.8.0-0.6.x-compat" kotlinx-serialization = "1.11.0" # @keep used by spotless ktlint = "1.8.0" -ktor = "3.5.1" +ktor = "3.5.2" langchain4j-bom = "1.19.0" # @keep Link checker version used in ref-guide link-checker = "1.4.2" diff --git a/settings.gradle b/settings.gradle index c942d5857a2..45cd5aaa8f3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,7 @@ plugins { id 'com.gradle.develocity' version '4.2.2' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0' id 'com.autonomousapps.build-health' version '3.16.0' - id 'org.jetbrains.kotlin.multiplatform' version '2.4.0' apply false + id 'org.jetbrains.kotlin.multiplatform' version '2.4.20' apply false } apply from: file('gradle/develocity.gradle') diff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfile index 8d7ddae7875..8d41512e7c9 100644 --- a/solr/modules/jwt-auth/gradle.lockfile +++ b/solr/modules/jwt-auth/gradle.lockfile @@ -179,11 +179,11 @@ org.hamcrest:hamcrest:3.0=jarValidation,testCompileClasspath,testRuntimeClasspat org.javassist:javassist:3.30.2-GA=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:2.2.21=jarValidation,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21=testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:2.4.0=jarValidation -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.4.0=jarValidation,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.0=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.4.20=jarValidation +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.4.20=jarValidation,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.4.20=jarValidation,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.4.0=jarValidation +org.jetbrains.kotlin:kotlin-stdlib:2.4.20=jarValidation org.jetbrains:annotations:26.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.1=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.6.2=jarValidation,testRuntimeClasspath diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt index bdd40de59da..a6e0c980a2f 100644 --- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt @@ -21,9 +21,6 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.ui.InternalComposeUiApi -import androidx.compose.ui.LocalSystemTheme -import androidx.compose.ui.SystemTheme /** * Solr theme object that holds additional fields, like extended typography and extended colors. @@ -45,7 +42,6 @@ object SolrTheme { get() = LocalExtendedColorScheme.current } -@OptIn(InternalComposeUiApi::class) @Composable fun SolrTheme( useDarkTheme: Boolean = isSystemInDarkTheme(), @@ -59,7 +55,6 @@ fun SolrTheme( CompositionLocalProvider( LocalExtendedTypography provides extendedTypography(), LocalExtendedColorScheme provides extendedColorScheme(useDarkTheme), - LocalSystemTheme provides if (useDarkTheme) SystemTheme.Dark else SystemTheme.Light, ) { MaterialTheme( colorScheme = colorScheme,
