Skip to content

build: upgrade to Gradle 9.8.0 #94

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.

Sign up for GitHub

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

Merged
kdroidFilter merged 1 commit into from
Sep 29, 2026
Merged

build: upgrade to Gradle 9.8.0 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion SeforimMagicIndexer
Open in desktop
Submodule SeforimMagicIndexer updated 2 files
+2 −2 gradle/libs.versions.toml
+1 −1 gradle/wrapper/gradle-wrapper.properties
2 changes: 1 addition & 1 deletion core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ group = "io.github.kdroidfilter.seforimlibrary"
kotlin {
jvmToolchain(libs.versions.jvmToolchain.get().toInt())

androidLibrary {
android {
namespace = "io.github.kdroidfilter.seforimlibrary"
compileSdk = 35
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion dao/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ group = "io.github.kdroidfilter.seforimlibrary"
kotlin {
jvmToolchain(libs.versions.jvmToolchain.get().toInt())

androidLibrary {
android {
namespace = "io.github.kdroidfilter.seforimlibrary"
compileSdk = 35
minSdk = 21
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

filekitCore = "0.13.0"
kotlin = "2.3.20"
agp = "8.12.3"
agp = "9.1.1"
jvmToolchain = "25"
lucene = "10.4.0"
onnxruntime = "1.20.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
10 changes: 9 additions & 1 deletion search/src/jvmMain/kotlin/io/github/kdroidfilter/seforimlibrary/search/LuceneSearchEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import org.apache.lucene.search.BooleanClause
import org.apache.lucene.search.BooleanQuery
import org.apache.lucene.search.BoostQuery
import org.apache.lucene.search.Collector
import org.apache.lucene.search.CollectorManager
import org.apache.lucene.search.FuzzyQuery
import org.apache.lucene.search.IndexSearcher
import org.apache.lucene.search.LeafCollector
Expand Down Expand Up @@ -274,7 +275,14 @@ class LuceneSearchEngine(
override fun scoreMode(): ScoreMode = ScoreMode.COMPLETE_NO_SCORES
}

searcher.search(context.query, collector)
// ponytail: searcher has no executor, so slices run sequentially and can share one collector
searcher.search(
context.query,
object : CollectorManager<Collector, Unit> {
override fun newCollector(): Collector = collector
override fun reduce(collectors: Collection<Collector>) = Unit
}
)

SearchFacets(
totalHits = totalHits,
Expand Down
Loading