diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar index 9024776d5..7e03dd914 100644 Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ diff --git a/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt b/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt index 851f6b9fb..0e71554eb 100755 --- a/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt +++ b/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt @@ -33,6 +33,7 @@ import com.itsaky.androidide.preferences.internal.enableMaterialYou import com.itsaky.androidide.preferences.internal.uiMode import com.itsaky.androidide.tasks.executeAsync import com.itsaky.androidide.utils.ILogger +import com.itsaky.androidide.utils.VMUtils import com.itsaky.toaster.Toaster.Type.ERROR import com.itsaky.toaster.toast import org.greenrobot.eventbus.EventBus @@ -44,9 +45,11 @@ class IDEApplication : BaseApplication() { private var uncaughtExceptionHandler: UncaughtExceptionHandler? = null init { - System.loadLibrary("android-tree-sitter") - System.loadLibrary("tree-sitter-java") - System.loadLibrary("tree-sitter-xml") + if (!VMUtils.isJvm()) { + System.loadLibrary("android-tree-sitter") + System.loadLibrary("tree-sitter-java") + System.loadLibrary("tree-sitter-xml") + } } override fun onCreate() { diff --git a/app/src/test/java/com/itsaky/androidide/utils/ProjectWriterTest.kt b/app/src/test/java/com/itsaky/androidide/utils/ProjectWriterTest.kt deleted file mode 100644 index 24622e71a..000000000 --- a/app/src/test/java/com/itsaky/androidide/utils/ProjectWriterTest.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.itsaky.androidide.utils - -import com.google.common.truth.Truth.assertThat -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config - -@RunWith(RobolectricTestRunner::class) -@Config(manifest = Config.NONE) -class ProjectWriterTest { - - @Test - fun `test activity layout name creation from java file name`() { - val javaName = "MainActivity.java" - val layoutName = ProjectWriter.createLayoutName(javaName) - assertThat(layoutName).isEqualTo("activity_main.xml") - } - - @Test - fun `test fragment layout name creation from java file name`() { - val javaName = "MainFragment.java" - val layoutName = ProjectWriter.createLayoutName(javaName) - assertThat(layoutName).isEqualTo("fragment_main.xml") - } - - @Test - fun `test layout name creation from non-suffixed java file name`() { - val javaName = "Main.java" - val layoutName = ProjectWriter.createLayoutName(javaName) - assertThat(layoutName).isEqualTo("layout_main.xml") - } - - @Test - fun `test layout name creation from lowercase non-suffixed java file name`() { - val javaName = "main.java" - val layoutName = ProjectWriter.createLayoutName(javaName) - assertThat(layoutName).isEqualTo("layout_main.xml") - } -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 617172e33..679916bf2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -92,5 +92,4 @@ tests-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } -kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -oss-licenses = { id = "com.google.android.gms.oss-licenses-plugin", version = "0.10.6" } \ No newline at end of file +kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..070cb702f 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexText.kt b/uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt similarity index 98% rename from uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexText.kt rename to uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt index f141d01a3..5bc70e15a 100644 --- a/uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexText.kt +++ b/uidesigner/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt @@ -27,7 +27,7 @@ import org.robolectric.RobolectricTestRunner /** @author Akash Yadav */ @RunWith(RobolectricTestRunner::class) -class AdapterIndexText { +class AdapterIndexTest { @Test fun `verify instances of adapters`() {