diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/rendering/RenderCache.kt b/editor/src/main/java/io/github/rosemoe/sora/widget/rendering/RenderCache.kt index c67877ced..d19ccc8a2 100644 --- a/editor/src/main/java/io/github/rosemoe/sora/widget/rendering/RenderCache.kt +++ b/editor/src/main/java/io/github/rosemoe/sora/widget/rendering/RenderCache.kt @@ -47,7 +47,7 @@ class RenderCache { MeasureCacheItem(line, null, 0L).also { cache.add(it) while (cache.size > maxCacheCount && cache.isNotEmpty()) { - cache.removeFirst() + cache.removeAt(0) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 194de485c..4d25e3f17 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,24 +1,24 @@ [versions] -agp = "8.3.0" -kotlin = "1.9.22" -tsBinding = "4.1.0" +agp = "8.5.2" +kotlin = "1.9.23" +tsBinding = "4.3.1" lsp4j = "0.22.0" -androidxAnnotation = "1.7.1" +androidxAnnotation = "1.8.1" [libraries] androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidxAnnotation" } -androidx-collection = { module = "androidx.collection:collection", version = "1.4.0" } +androidx-collection = { module = "androidx.collection:collection", version = "1.4.2" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.12.0" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" } -androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.1.5" } -androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } +androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" } +androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.6.1" } desugar = { module = "com.android.tools:desugar_jdk_libs", version = "2.0.4" } kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.8.0" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.7.0"} -material = { module = "com.google.android.material:material", version = "1.11.0"} -gms-instantapps = { module = "com.google.android.gms:play-services-instantapps", version = "18.0.1"} +lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.8.4" } +material = { module = "com.google.android.material:material", version = "1.12.0" } +gms-instantapps = { module = "com.google.android.gms:play-services-instantapps", version = "18.1.0" } tree-sitter-java = { module = "com.itsaky.androidide.treesitter:tree-sitter-java", version.ref = "tsBinding" } tree-sitter = { module = "com.itsaky.androidide.treesitter:android-tree-sitter", version.ref = "tsBinding" } lsp4j = { module = "org.eclipse.lsp4j:org.eclipse.lsp4j", version.ref = "lsp4j" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..f6631ef8f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Sat Aug 03 16:05:07 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java b/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java index d7e584d75..8c9980a1b 100644 --- a/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java +++ b/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java @@ -271,6 +271,10 @@ public TextMateNewlineHandler getNewlineHandler() { return newlineHandler; } + public LanguageConfiguration getLanguageConfiguration() { + return languageConfiguration; + } + @Override public TextMateSymbolPairMatch getSymbolPairs() { return symbolPairMatch;