Skip to content

Commit b4cb0e0

Browse files
malliaridismalliaridis
authored
SOLR-17924: Introduce Configset create and import flows (#4166)
1 parent a317f73 commit b4cb0e0

71 files changed

Lines changed: 3045 additions & 1045 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎changelog/unreleased/SOLR-17924-configset-creation-new-ui.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
title: SOLR 17845 - Implement Configset Creation and Importing in New UI
2+
type: added
3+
authors:
4+
- name: Christos Malliaridis
5+
nick: malliaridis
6+
links:
7+
- name: SOLR-17924
8+
url: https://issues.apache.org/jira/browse/SOLR-17924
9+
- name: PR#4166
10+
url: https://github.com/apache/solr/pull/4166

‎gradle/libs.versions.toml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
[versions]
1616
adobe-testing-s3mock = "3.12.0"
1717
amazon-awssdk = "2.42.34"
18+
androidx-adaptive = "1.3.0-alpha07"
19+
androidx-lifecycle = "2.10.0"
20+
androidx-navigation3 = "1.1.0"
1821
# @keep Antora version used in ref-guide
1922
antora = "3.1.12"
2023
# @keep Most recent commit as of 2025-08-03, this repo does not have tags
@@ -236,6 +239,12 @@ amazon-awssdk-retries-spi = { module = "software.amazon.awssdk:retries-spi", ver
236239
amazon-awssdk-s3 = { module = "software.amazon.awssdk:s3", version.ref = "amazon-awssdk" }
237240
amazon-awssdk-sdkcore = { module = "software.amazon.awssdk:sdk-core", version.ref = "amazon-awssdk" }
238241
amazon-awssdk-sts = { module = "software.amazon.awssdk:sts", version.ref = "amazon-awssdk" }
242+
androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
243+
androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
244+
androidx-lifecycle-viewModelNav3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" }
245+
androidx-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "androidx-adaptive" }
246+
androidx-material3-adaptive-nav3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "androidx-adaptive" }
247+
androidx-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }
239248
apache-calcite-avatica-core = { module = "org.apache.calcite.avatica:avatica-core", version.ref = "apache-calcite-avatica" }
240249
apache-calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "apache-calcite" }
241250
apache-calcite-linq4j = { module = "org.apache.calcite:calcite-linq4j", version.ref = "apache-calcite" }

‎solr/ui/build.gradle.kts‎

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,49 +67,51 @@ kotlin {
6767

6868
sourceSets {
6969
// Shared multiplatform dependencies
70-
val commonMain by getting {
71-
dependencies {
72-
implementation(project.dependencies.platform(project(":platform")))
73-
implementation(libs.compose.runtime)
74-
implementation(libs.compose.foundation)
75-
implementation(libs.compose.material3)
76-
implementation(libs.compose.ui)
77-
implementation(libs.compose.components.resources)
78-
implementation(libs.compose.uiToolingPreview)
79-
80-
implementation(libs.kotlinx.serialization.core)
81-
implementation(libs.kotlinx.serialization.json)
82-
implementation(libs.kotlinx.coroutines.core)
83-
implementation(libs.kotlinx.datetime)
84-
85-
implementation(libs.decompose.decompose)
86-
implementation(libs.essenty.lifecycle)
87-
implementation(libs.decompose.extensions.compose)
88-
implementation(libs.mvikotlin.extensions.coroutines)
89-
implementation(libs.mvikotlin.mvikotlin)
90-
implementation(libs.mvikotlin.main)
91-
implementation(libs.mvikotlin.logging)
92-
93-
implementation(project.dependencies.platform(libs.ktor.bom))
94-
implementation(libs.ktor.client.auth)
95-
implementation(libs.ktor.client.core)
96-
implementation(libs.ktor.client.cio)
97-
implementation(libs.ktor.client.contentNegotiation)
98-
implementation(libs.ktor.client.serialization.json)
99-
implementation(libs.squareup.okio)
100-
101-
implementation(libs.oshai.logging)
102-
implementation(libs.slf4j.api)
103-
}
70+
commonMain.dependencies {
71+
implementation(project.dependencies.platform(project(":platform")))
72+
implementation(libs.compose.runtime)
73+
implementation(libs.compose.foundation)
74+
implementation(libs.compose.material3)
75+
implementation(libs.compose.ui)
76+
implementation(libs.compose.components.resources)
77+
implementation(libs.compose.uiToolingPreview)
78+
implementation(libs.androidx.lifecycle.viewmodelCompose)
79+
implementation(libs.androidx.lifecycle.runtimeCompose)
80+
implementation(libs.androidx.lifecycle.viewModelNav3)
81+
implementation(libs.androidx.navigation3.ui)
82+
implementation(libs.androidx.material3.adaptive.asProvider())
83+
implementation(libs.androidx.material3.adaptive.nav3)
84+
85+
implementation(libs.kotlinx.serialization.core)
86+
implementation(libs.kotlinx.serialization.json)
87+
implementation(libs.kotlinx.coroutines.core)
88+
implementation(libs.kotlinx.datetime)
89+
90+
implementation(libs.decompose.decompose)
91+
implementation(libs.essenty.lifecycle)
92+
implementation(libs.decompose.extensions.compose)
93+
implementation(libs.mvikotlin.extensions.coroutines)
94+
implementation(libs.mvikotlin.mvikotlin)
95+
implementation(libs.mvikotlin.main)
96+
implementation(libs.mvikotlin.logging)
97+
98+
implementation(project.dependencies.platform(libs.ktor.bom))
99+
implementation(libs.ktor.client.auth)
100+
implementation(libs.ktor.client.core)
101+
implementation(libs.ktor.client.cio)
102+
implementation(libs.ktor.client.contentNegotiation)
103+
implementation(libs.ktor.client.serialization.json)
104+
implementation(libs.squareup.okio)
105+
106+
implementation(libs.oshai.logging)
107+
implementation(libs.slf4j.api)
104108
}
105109

106-
val commonTest by getting {
107-
dependencies {
108-
implementation(kotlin("test"))
109-
implementation(libs.kotlinx.coroutines.test)
110-
implementation(libs.compose.uiTest)
111-
implementation(libs.ktor.client.mock)
112-
}
110+
commonTest.dependencies {
111+
implementation(kotlin("test"))
112+
implementation(libs.kotlinx.coroutines.test)
113+
implementation(libs.compose.uiTest)
114+
implementation(libs.ktor.client.mock)
113115
}
114116

115117
val desktopMain by getting {
@@ -122,6 +124,10 @@ kotlin {
122124
}
123125
}
124126
}
127+
128+
compilerOptions {
129+
freeCompilerArgs.add("-Xexplicit-backing-fields")
130+
}
125131
}
126132

127133
configurations {

0 commit comments

Comments
 (0)