Fix crash on kotlin editor on older APIs (fixes #512) and fix crash o…

…n google-java-format Tested-by: Pranav Purwar <[email protected]> Signed-off-by: PranavPurwar <[email protected]>
Cosmic-Ide · Mar 25, 2024 · 3b29983 · 3b29983
1 parent cfed39b
commit 3b29983
Show file tree

Hide file tree

Showing 150 changed files with 15,282 additions and 10 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -35,7 +35,7 @@ jobs:
         uses: gradle/[email protected]
         with:
           gradle-version: nightly
-          arguments: assembleDebug
+          arguments: assembleDevDebug
 
       - name: Upload debug apks
         uses: actions/upload-artifact@v4

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -173,6 +173,7 @@ materialThemeBuilder {
 
 configurations.all {
     resolutionStrategy.force("com.squareup.okhttp3:okhttp:4.12.0")
+    resolutionStrategy.force("com.google.guava:guava:33.1.0-android")
 }
 
 dependencies {
@@ -199,12 +200,10 @@ dependencies {
     implementation("androidx.activity:activity-ktx:1.9.0-beta01")
     implementation("androidx.startup:startup-runtime:1.2.0-alpha02")
 
-    val editorVersion = "0.23.4"
+    val editorVersion = "0.23.4-cac2770-SNAPSHOT"
     //noinspection GradleDependency
     implementation("io.github.Rosemoe.sora-editor:editor:$editorVersion")
     //noinspection GradleDependency
-    implementation("io.github.Rosemoe.sora-editor:language-textmate:$editorVersion")
-    //noinspection GradleDependency
     implementation("io.github.Rosemoe.sora-editor:language-treesitter:$editorVersion") {
         isTransitive = false
     }
@@ -253,6 +252,7 @@ dependencies {
     implementation(projects.util)
     implementation(projects.jgit)
     implementation(projects.feature.treeView)
+    implementation(projects.feature.editorTextmate)
 
     // jgit uses some methods like `transferTo` are only available from Android 13 onwards
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")