diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 473455496..b38ea905d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,16 +18,30 @@ - + + + + + + + + + + + + + + + @@ -101,31 +115,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,20 +199,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -169,6 +266,9 @@ + + + diff --git a/annotation-processors-ksp/.gitignore b/annotation/annotations/.gitignore similarity index 100% rename from annotation-processors-ksp/.gitignore rename to annotation/annotations/.gitignore diff --git a/annotations/build.gradle.kts b/annotation/annotations/build.gradle.kts similarity index 81% rename from annotations/build.gradle.kts rename to annotation/annotations/build.gradle.kts index de7f271cf..11f769077 100644 --- a/annotations/build.gradle.kts +++ b/annotation/annotations/build.gradle.kts @@ -1,3 +1,5 @@ +import com.itsaky.androidide.build.config.BuildConfig + /* * This file is part of AndroidIDE. * @@ -21,9 +23,13 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("annotations") +} + dependencies { implementation(libs.androidx.annotation) implementation(libs.common.jkotlin) - compileOnly(projects.shared) - compileOnly(projects.subprojects.frameworkStubs) + compileOnly(projects.utilities.shared) + compileOnly(projects.utilities.frameworkStubs) } \ No newline at end of file diff --git a/annotations/src/main/java/com/itsaky/androidide/annotations/inflater/ViewAdapter.kt b/annotation/annotations/src/main/java/com/itsaky/androidide/annotations/inflater/ViewAdapter.kt similarity index 100% rename from annotations/src/main/java/com/itsaky/androidide/annotations/inflater/ViewAdapter.kt rename to annotation/annotations/src/main/java/com/itsaky/androidide/annotations/inflater/ViewAdapter.kt diff --git a/annotations/src/main/java/com/itsaky/androidide/annotations/uidesigner/IncludeInDesigner.kt b/annotation/annotations/src/main/java/com/itsaky/androidide/annotations/uidesigner/IncludeInDesigner.kt similarity index 100% rename from annotations/src/main/java/com/itsaky/androidide/annotations/uidesigner/IncludeInDesigner.kt rename to annotation/annotations/src/main/java/com/itsaky/androidide/annotations/uidesigner/IncludeInDesigner.kt diff --git a/annotation-processors/.gitignore b/annotation/processors-ksp/.gitignore similarity index 100% rename from annotation-processors/.gitignore rename to annotation/processors-ksp/.gitignore diff --git a/annotation-processors-ksp/build.gradle.kts b/annotation/processors-ksp/build.gradle.kts similarity index 92% rename from annotation-processors-ksp/build.gradle.kts rename to annotation/processors-ksp/build.gradle.kts index 38471a135..342e9f382 100644 --- a/annotation-processors-ksp/build.gradle.kts +++ b/annotation/processors-ksp/build.gradle.kts @@ -23,7 +23,9 @@ plugins { kotlin("kapt") } -group = "${BuildConfig.packageName}.annotations" +groupConfig { + groupIdSuffix.set("annotations") +} dependencies { kapt(libs.google.auto.service) @@ -31,7 +33,7 @@ dependencies { implementation(kotlin("stdlib")) - implementation(projects.annotations) + implementation(projects.annotation.annotations) implementation(libs.androidx.annotation) implementation(libs.common.javapoet) diff --git a/annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterIndexGenerator.kt b/annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterIndexGenerator.kt similarity index 100% rename from annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterIndexGenerator.kt rename to annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterIndexGenerator.kt diff --git a/annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessor.kt b/annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessor.kt similarity index 100% rename from annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessor.kt rename to annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessor.kt diff --git a/annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessorProvider.kt b/annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessorProvider.kt similarity index 100% rename from annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessorProvider.kt rename to annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/ViewAdapterSymbolProcessorProvider.kt diff --git a/annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/utils.kt b/annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/utils.kt similarity index 100% rename from annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/utils.kt rename to annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/inflater/utils.kt diff --git a/annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/kspUtils.kt b/annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/kspUtils.kt similarity index 100% rename from annotation-processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/kspUtils.kt rename to annotation/processors-ksp/src/main/kotlin/com/itsaky/androidide/annotations/ksp/kspUtils.kt diff --git a/annotations/.gitignore b/annotation/processors/.gitignore similarity index 100% rename from annotations/.gitignore rename to annotation/processors/.gitignore diff --git a/annotation-processors/build.gradle.kts b/annotation/processors/build.gradle.kts similarity index 90% rename from annotation-processors/build.gradle.kts rename to annotation/processors/build.gradle.kts index f80a7adfc..6280bfac6 100644 --- a/annotation-processors/build.gradle.kts +++ b/annotation/processors/build.gradle.kts @@ -22,13 +22,15 @@ plugins { kotlin("jvm") } -group = "${BuildConfig.packageName}.annotations" +groupConfig { + groupIdSuffix.set("annotations") +} dependencies { implementation(kotlin("stdlib")) - implementation(projects.annotations) - implementation(projects.eventbus) + implementation(projects.annotation.annotations) + implementation(projects.event.eventbus) implementation(libs.androidx.annotation) implementation(libs.common.javapoet) diff --git a/annotation-processors/src/main/java/com/itsaky/androidide/annotations/EventBusAnnotationProcessor.java b/annotation/processors/src/main/java/com/itsaky/androidide/annotations/EventBusAnnotationProcessor.java similarity index 100% rename from annotation-processors/src/main/java/com/itsaky/androidide/annotations/EventBusAnnotationProcessor.java rename to annotation/processors/src/main/java/com/itsaky/androidide/annotations/EventBusAnnotationProcessor.java diff --git a/app/dictionary.txt b/app/dictionary.txt deleted file mode 100755 index 8c2a35a51..000000000 --- a/app/dictionary.txt +++ /dev/null @@ -1,4 +0,0 @@ -o0OoO0 -0oO00Oo0 -oO0o0O0O -0O0o00 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro deleted file mode 100755 index 49e642b83..000000000 --- a/app/proguard-rules.pro +++ /dev/null @@ -1,129 +0,0 @@ --ignorewarnings - --dontwarn ** --dontnote ** --dontobfuscate - --keep class javax.** { *; } --keep class jdkx.** { *; } - -# keep javac classes --keep class openjdk.** { *; } - -# Android builder model interfaces --keep class com.android.** { *; } - -# Tooling API classes --keep class com.itsaky.androidide.tooling.** { *; } - -# Builder model implementations --keep class com.itsaky.androidide.builder.model.** { *; } - -# Eclipse --keep class org.eclipse.** { *; } - -# JAXP --keep class jaxp.** { *; } --keep class org.w3c.** { *; } --keep class org.xml.** { *; } - -# Services --keep @com.google.auto.service.AutoService class ** { -} --keepclassmembers class ** { - @com.google.auto.service.AutoService ; -} - -# EventBus --keepclassmembers class ** { - @org.greenrobot.eventbus.Subscribe ; -} --keep enum org.greenrobot.eventbus.ThreadMode { *; } --keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { - (java.lang.Throwable); -} - -# Accessed reflectively --keep class io.github.rosemoe.sora.widget.component.EditorAutoCompletion { - io.github.rosemoe.sora.widget.component.EditorCompletionAdapter adapter; - int currentSelection; -} --keep class com.itsaky.androidide.projects.util.StringSearch { - packageName(java.nio.file.Path); -} --keep class * implements org.antlr.v4.runtime.Lexer { - (...); -} --keep class * extends com.itsaky.androidide.lsp.java.providers.completion.IJavaCompletionProvider { - (...); -} --keep class com.itsaky.androidide.editor.api.IEditor { *; } --keep class * extends com.itsaky.androidide.inflater.IViewAdapter { *; } --keep class * extends com.itsaky.androidide.inflater.drawable.IDrawableParser { - (...); - android.graphics.drawable.Drawable parse(); - android.graphics.drawable.Drawable parseDrawable(); -} --keep class com.itsaky.androidide.utils.DialogUtils { public ; } - -# APK Metadata --keep class com.itsaky.androidide.models.ApkMetadata { *; } --keep class com.itsaky.androidide.models.ArtifactType { *; } --keep class com.itsaky.androidide.models.MetadataElement { *; } - -# Parcelable --keepclassmembers class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator CREATOR; -} - -# Used in preferences --keep enum org.eclipse.lemminx.dom.builder.EmptyElements { *; } --keep enum com.itsaky.androidide.xml.permissions.Permission { *; } - -# Lots of native methods in tree-sitter -# There are some fields as well that are accessed from native field --keepclasseswithmembers class ** { - native ; -} - --keep class com.itsaky.androidide.treesitter.** { *; } - -# Retrofit 2 --dontwarn retrofit2.** --keep class retrofit2.** { *; } - --keepclasseswithmembers class * { - @retrofit2.http.* ; -} - -# OkHttp3 --keep class okhttp3.** { *; } --keep interface okhttp3.** { *; } --dontwarn okhttp3.** - -# Stat uploader --keep class com.itsaky.androidide.stats.** { *; } - -# Gson --keep class * extends com.google.gson.TypeAdapter --keep class * implements com.google.gson.TypeAdapterFactory --keep class * implements com.google.gson.JsonSerializer --keep class * implements com.google.gson.JsonDeserializer - --keepclassmembers,allowobfuscation class * { - @com.google.gson.annotations.SerializedName ; -} - -## Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. --keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken --keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken - -## Themes --keep enum com.itsaky.androidide.ui.themes.IDETheme { - *; -} - -## Contributor models - deserialized with GSON --keep class * implements com.itsaky.androidide.contributors.Contributor { - *; -} diff --git a/build.gradle.kts b/build.gradle.kts index f59c885fb..6303342a4 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,7 @@ import com.itsaky.androidide.build.config.BuildConfig import com.itsaky.androidide.build.config.FDroidConfig import com.itsaky.androidide.build.config.publishingVersion import com.itsaky.androidide.plugins.AndroidIDEPlugin +import com.itsaky.androidide.plugins.GroupConfigPlugin import com.itsaky.androidide.plugins.conf.configureAndroidModule import com.itsaky.androidide.plugins.conf.configureJavaModule import com.itsaky.androidide.plugins.conf.configureMavenPublish @@ -50,11 +51,11 @@ subprojects { // Always load the F-Droid config FDroidConfig.load(project) + apply { plugin(GroupConfigPlugin::class.java) } afterEvaluate { apply { plugin(AndroidIDEPlugin::class.java) } } - project.group = BuildConfig.packageName project.version = rootProject.version plugins.withId("com.android.application") { diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt index 360458ceb..5f7873532 100644 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt @@ -78,7 +78,10 @@ class AndroidIDEAssetsPlugin : Plugin { // Tooling API JAR copier val copyToolingApiJar = tasks.register("copy${variantNameCapitalized}ToolingApiJar", AddFileToAssetsTask::class.java) { - val toolingApi = rootProject.findProject(":subprojects:tooling-api-impl")!! + val implPath = ":tooling:impl" + val toolingApi = checkNotNull(rootProject.findProject(implPath)) { + "Cannot find the Tooling Impl module with project path: '$implPath'" + } dependsOn(toolingApi.tasks.getByName("copyJar")) val toolingApiJar = toolingApi.layout.buildDirectory.file("libs/tooling-api-all.jar") diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDECoreAppPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDECoreAppPlugin.kt new file mode 100644 index 000000000..b7072e7a8 --- /dev/null +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDECoreAppPlugin.kt @@ -0,0 +1,30 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.plugins + +import org.gradle.api.Plugin +import org.gradle.api.Project + +/** + * Marker plugin that is applied to the core application module project. + * + * @author Akash Yadav + */ +class AndroidIDECoreAppPlugin : Plugin { + override fun apply(target: Project) {} +} \ No newline at end of file diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt index 88fe965be..30aec9bb8 100644 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt @@ -30,43 +30,41 @@ import org.gradle.api.Project */ class AndroidIDEPlugin : Plugin { - override fun apply(target: Project) { - target.run { - if (project.path == rootProject.path) { - throw GradleException("Cannot apply ${AndroidIDEPlugin::class.simpleName} to root project") - } + override fun apply(target: Project) = target.run { + if (project.path == rootProject.path) { + throw GradleException("Cannot apply ${AndroidIDEPlugin::class.simpleName} to root project") + } - if (!project.buildFile.exists() || !project.buildFile.isFile) { - return@run - } + if (!project.buildFile.exists() || !project.buildFile.isFile) { + return@run + } - val isAndroidModule = plugins.hasPlugin("com.android.application") || - plugins.hasPlugin("com.android.library") + val isAndroidModule = plugins.hasPlugin("com.android.application") || + plugins.hasPlugin("com.android.library") - if (isAndroidModule && !isFDroidBuild) { - // setup signing configuration - plugins.apply(SigningConfigPlugin::class.java) - } + if (isAndroidModule && !isFDroidBuild) { + // setup signing configuration + plugins.apply(SigningConfigPlugin::class.java) + } - if (isFDroidBuild && project.path == ":app") { - val baseExtension = extensions.getByType(BaseExtension::class.java) - logger.warn("Building for F-Droid with configuration:") - logger.warn("applicationId = ${baseExtension.defaultConfig.applicationId}") - logger.warn("versionName = ${baseExtension.defaultConfig.versionName}") - logger.warn("versionCode = ${baseExtension.defaultConfig.versionCode}") - logger.warn("--- x --- x ---") - } + if (isFDroidBuild && project.plugins.hasPlugin(AndroidIDECoreAppPlugin::class.java)) { + val baseExtension = extensions.getByType(BaseExtension::class.java) + logger.warn("Building for F-Droid with configuration:") + logger.warn("applicationId = ${baseExtension.defaultConfig.applicationId}") + logger.warn("versionName = ${baseExtension.defaultConfig.versionName}") + logger.warn("versionCode = ${baseExtension.defaultConfig.versionCode}") + logger.warn("--- x --- x ---") + } - val taskName = when { - isAndroidModule -> "testDebugUnitTest" - else -> "test" - } + val taskName = when { + isAndroidModule -> "testDebugUnitTest" + else -> "test" + } - logger.info("${project.path} will run task '$taskName' for tests in CI") + logger.info("${project.path} will run task '$taskName' for tests in CI") - project.tasks.create("runTestsInCI") { - dependsOn(taskName) - } + project.tasks.create("runTestsInCI") { + dependsOn(taskName) } } } diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/GroupConfigPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/GroupConfigPlugin.kt new file mode 100644 index 000000000..2fed0fb94 --- /dev/null +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/GroupConfigPlugin.kt @@ -0,0 +1,42 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.plugins + +import com.itsaky.androidide.build.config.BuildConfig +import com.itsaky.androidide.plugins.exts.GroupConfigPluginExtension.Companion.groupConfigExtension +import org.gradle.api.Plugin +import org.gradle.api.Project + +/** + * @author Akash Yadav + */ +class GroupConfigPlugin : Plugin { + override fun apply(target: Project) = target.run { + val extension = groupConfigExtension() + extension.groupIdSuffix.convention("") + + afterEvaluate { + val suffix = extension.groupIdSuffix.get().let { + if (it.isNotEmpty()) ".${it}" else "" + } + + project.group = "${BuildConfig.packageName}${suffix}" + logger.info("Maven group ID set to : ${project.group}") + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/NoDesugarPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/NoDesugarPlugin.kt new file mode 100644 index 000000000..4d6684d91 --- /dev/null +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/NoDesugarPlugin.kt @@ -0,0 +1,30 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.plugins + +import org.gradle.api.Plugin +import org.gradle.api.Project + +/** + * Marker plugin to indicate that the desugaring plugin should not be applied to the project. + * + * @author Akash Yadav + */ +class NoDesugarPlugin : Plugin { + override fun apply(target: Project) {} +} \ No newline at end of file diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt index 9e77824f8..47f0ca456 100644 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt @@ -27,6 +27,8 @@ import com.itsaky.androidide.build.config.BuildConfig import com.itsaky.androidide.build.config.FDroidConfig import com.itsaky.androidide.build.config.isFDroidBuild import com.itsaky.androidide.build.config.projectVersionCode +import com.itsaky.androidide.plugins.AndroidIDECoreAppPlugin +import com.itsaky.androidide.plugins.NoDesugarPlugin import com.itsaky.androidide.plugins.util.SdkUtils.getAndroidJar import org.gradle.api.Project import org.gradle.api.artifacts.MinimalExternalModuleDependency @@ -42,19 +44,20 @@ import org.gradle.api.provider.Provider * flavor, the version code will be `100 * 270 + 1` i.e. `27001` */ internal val flavorsAbis = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86_64" to 3) -private val disableCoreLibDesugaringForModules = arrayOf(":logsender", ":logger") fun Project.configureAndroidModule( coreLibDesugDep: Provider ) { + val isAppModule = plugins.hasPlugin("com.android.application") assert( - plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) { + isAppModule || plugins.hasPlugin("com.android.library") + ) { "${javaClass.simpleName} can only be applied to Android projects" } val androidJar = extensions.getByType(AndroidComponentsExtension::class.java) .getAndroidJar(assertExists = true) - val frameworkStubsJar = findProject(":subprojects:framework-stubs")!!.file("libs/android.jar") + val frameworkStubsJar = findProject(":utilities:framework-stubs")!!.file("libs/android.jar") .also { it.parentFile.mkdirs() } if (!(frameworkStubsJar.exists() && frameworkStubsJar.isFile)) { @@ -116,20 +119,13 @@ fun Project.configureAndroidModule( configureCoreLibDesugaring(this, coreLibDesugDep) - if (":app" == project.path) { + if (project.plugins.hasPlugin(AndroidIDECoreAppPlugin::class.java)) { packagingOptions { jniLibs { useLegacyPackaging = true } } - flavorsAbis.forEach { (abi, _) -> - // the common defaultConfig, not the flavor-specific - defaultConfig.buildConfigField("String", - "ABI_${abi.replace('-', '_').uppercase()}", - "\"${abi}\"") - } - splits { abi { reset() @@ -149,7 +145,8 @@ fun Project.configureAndroidModule( // version code increment val verCodeIncr = flavorsAbis[output.getFilter( - FilterConfiguration.FilterType.ABI)?.identifier] + FilterConfiguration.FilterType.ABI + )?.identifier] ?: throw UnsupportedOperationException("Universal APKs are not supported!") output.versionCode.set(100 * projectVersionCode + verCodeIncr) @@ -167,7 +164,11 @@ fun Project.configureAndroidModule( buildTypes.getByName("debug") { isMinifyEnabled = false } buildTypes.getByName("release") { - isMinifyEnabled = true + + // from AGP 8.4.0 onwards, there are some behavioral changes in R8 + // enabling R8 on library projects results in missing class errors + // see https://issuetracker.google.com/issues/338411137#comment11 + isMinifyEnabled = isAppModule proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } @@ -177,7 +178,6 @@ fun Project.configureAndroidModule( // the build are faster for this build type as compared to 'release' buildTypes.register("dev") { initWith(buildTypes.getByName("release")) - isMinifyEnabled = false } @@ -188,9 +188,11 @@ fun Project.configureAndroidModule( } } -private fun Project.configureCoreLibDesugaring(baseExtension: BaseExtension, - coreLibDesugDep: Provider) { - val coreLibDesugaringEnabled = project.path !in disableCoreLibDesugaringForModules +private fun Project.configureCoreLibDesugaring( + baseExtension: BaseExtension, + coreLibDesugDep: Provider +) { + val coreLibDesugaringEnabled = !project.plugins.hasPlugin(NoDesugarPlugin::class.java) baseExtension.compileOptions.isCoreLibraryDesugaringEnabled = coreLibDesugaringEnabled diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt index 03293ed44..caf533adf 100644 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt @@ -35,7 +35,7 @@ import org.gradle.kotlin.dsl.withType import com.itsaky.androidide.build.config.publishingVersion import java.io.File -private val projectsRequiringMavenLocalForTests = arrayOf(":gradle-plugin") +private val projectsRequiringMavenLocalForTests = arrayOf(":tooling:plugin") private val mavenLocalRepos = hashMapOf() @Suppress("UnstableApiUsage") @@ -45,6 +45,11 @@ fun Project.configureMavenPublish() { } gradle.projectsEvaluated { + for (path in projectsRequiringMavenLocalForTests) { + checkNotNull(rootProject.findProject(path)) { + "Unable to configure maven local for project '$path' (project cannot be found)." + } + } rootProject.subprojects { if (project.path in projectsRequiringMavenLocalForTests) { tasks.withType { diff --git a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/exts/GroupConfigPluginExtension.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/exts/GroupConfigPluginExtension.kt new file mode 100644 index 000000000..bd317c6ab --- /dev/null +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/exts/GroupConfigPluginExtension.kt @@ -0,0 +1,47 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.plugins.exts + +import org.gradle.api.Project +import org.gradle.api.provider.Property +import org.gradle.kotlin.dsl.create + +/** + * @author Akash Yadav + */ +abstract class GroupConfigPluginExtension { + + /** + * The suffix for the maven group ID for the module. + * + * Example: + * If the [groupIdSuffix] is "core", then the maven group ID will be + * `${BuildConfig.packageName}.core`. + */ + abstract val groupIdSuffix: Property + + companion object { + + /** + * Create the [GroupConfigPluginExtension] for the project. + */ + fun Project.groupConfigExtension(): GroupConfigPluginExtension { + return extensions.create("groupConfig") + } + } +} \ No newline at end of file diff --git a/actions/.gitignore b/core/actions/.gitignore similarity index 100% rename from actions/.gitignore rename to core/actions/.gitignore diff --git a/actions/build.gradle.kts b/core/actions/build.gradle.kts similarity index 88% rename from actions/build.gradle.kts rename to core/actions/build.gradle.kts index 2aa2b43ad..221abdc13 100644 --- a/actions/build.gradle.kts +++ b/core/actions/build.gradle.kts @@ -23,6 +23,10 @@ plugins{ id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.actions" } @@ -33,8 +37,8 @@ dependencies { api(libs.androidx.nav.fragment) api(libs.androidx.nav.ui) - implementation(projects.common) - implementation(projects.resources) + implementation(projects.core.common) + implementation(projects.core.resources) implementation(libs.common.editor) implementation(libs.common.kotlin) implementation(libs.common.kotlin.coroutines.android) diff --git a/actions/consumer-rules.pro b/core/actions/consumer-rules.pro similarity index 100% rename from actions/consumer-rules.pro rename to core/actions/consumer-rules.pro diff --git a/actions/proguard-rules.pro b/core/actions/proguard-rules.pro similarity index 100% rename from actions/proguard-rules.pro rename to core/actions/proguard-rules.pro diff --git a/actions/src/main/AndroidManifest.xml b/core/actions/src/main/AndroidManifest.xml similarity index 100% rename from actions/src/main/AndroidManifest.xml rename to core/actions/src/main/AndroidManifest.xml diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionData.java b/core/actions/src/main/java/com/itsaky/androidide/actions/ActionData.java similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/ActionData.java rename to core/actions/src/main/java/com/itsaky/androidide/actions/ActionData.java diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionMenu.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/ActionMenu.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/ActionMenu.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/ActionMenu.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionsRegistry.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/ActionsRegistry.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/ActionsRegistry.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/ActionsRegistry.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/EditorActionItem.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/EditorActionItem.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/EditorActionItem.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/EditorActionItem.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/FillMenuParams.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/FillMenuParams.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/FillMenuParams.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/FillMenuParams.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/OnActionClickListener.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/OnActionClickListener.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/OnActionClickListener.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/OnActionClickListener.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/SidebarActionItem.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/SidebarActionItem.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/SidebarActionItem.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/SidebarActionItem.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/actionUtils.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/actionUtils.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/actionUtils.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/actionUtils.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt diff --git a/actions/src/main/java/com/itsaky/androidide/actions/locations/CodeActionsMenu.kt b/core/actions/src/main/java/com/itsaky/androidide/actions/locations/CodeActionsMenu.kt similarity index 100% rename from actions/src/main/java/com/itsaky/androidide/actions/locations/CodeActionsMenu.kt rename to core/actions/src/main/java/com/itsaky/androidide/actions/locations/CodeActionsMenu.kt diff --git a/app/.gitignore b/core/app/.gitignore similarity index 100% rename from app/.gitignore rename to core/app/.gitignore diff --git a/app/build.gradle.kts b/core/app/build.gradle.kts similarity index 63% rename from app/build.gradle.kts rename to core/app/build.gradle.kts index 5b23f28b4..f21cdc6ce 100755 --- a/app/build.gradle.kts +++ b/core/app/build.gradle.kts @@ -3,6 +3,7 @@ import com.itsaky.androidide.build.config.BuildConfig import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin +import com.itsaky.androidide.plugins.AndroidIDECoreAppPlugin plugins { id("com.android.application") @@ -16,6 +17,7 @@ plugins { apply { plugin(AndroidIDEAssetsPlugin::class.java) + plugin(AndroidIDECoreAppPlugin::class.java) } buildscript { @@ -25,6 +27,10 @@ buildscript { } } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = BuildConfig.packageName @@ -71,7 +77,7 @@ dependencies { // Annotation processors kapt(libs.common.glide.ap) kapt(libs.google.auto.service) - kapt(projects.annotationProcessors) + kapt(projects.annotation.processors) implementation(libs.common.editor) implementation(libs.common.utilcode) @@ -121,43 +127,43 @@ dependencies { implementation(libs.composite.javapoet) // Local projects here - implementation(projects.actions) - implementation(projects.buildInfo) - implementation(projects.common) - implementation(projects.editor) - implementation(projects.termux.termuxApp) - implementation(projects.termux.termuxView) - implementation(projects.termux.termuxEmulator) - implementation(projects.termux.termuxShared) - implementation(projects.eventbus) - implementation(projects.eventbusAndroid) - implementation(projects.eventbusEvents) - implementation(projects.gradlePluginConfig) - implementation(projects.idestats) - implementation(projects.subprojects.aaptcompiler) - implementation(projects.subprojects.indexing) - implementation(projects.subprojects.javacServices) - implementation(projects.subprojects.xmlUtils) - implementation(projects.subprojects.projects) - implementation(projects.subprojects.toolingApi) - implementation(projects.logsender) - implementation(projects.lsp.api) - implementation(projects.lsp.java) - implementation(projects.lsp.xml) - implementation(projects.lexers) - implementation(projects.lookup) - implementation(projects.preferences) - implementation(projects.resources) - implementation(projects.treeview) - implementation(projects.templatesApi) - implementation(projects.templatesImpl) - implementation(projects.uidesigner) - implementation(projects.xmlInflater) + implementation(projects.core.actions) + implementation(projects.core.common) + implementation(projects.core.indexing) + implementation(projects.core.lspApi) + implementation(projects.core.projects) + implementation(projects.core.resources) + implementation(projects.editor.impl) + implementation(projects.editor.lexers) + implementation(projects.event.eventbus) + implementation(projects.event.eventbusAndroid) + implementation(projects.event.eventbusEvents) + implementation(projects.java.javacServices) + implementation(projects.java.lsp) + implementation(projects.logging.idestats) + implementation(projects.logging.logsender) + implementation(projects.termux.application) + implementation(projects.termux.view) + implementation(projects.termux.emulator) + implementation(projects.termux.shared) + implementation(projects.tooling.api) + implementation(projects.tooling.pluginConfig) + implementation(projects.utilities.buildInfo) + implementation(projects.utilities.lookup) + implementation(projects.utilities.preferences) + implementation(projects.utilities.templatesApi) + implementation(projects.utilities.templatesImpl) + implementation(projects.utilities.treeview) + implementation(projects.utilities.uidesigner) + implementation(projects.utilities.xmlInflater) + implementation(projects.xml.aaptcompiler) + implementation(projects.xml.lsp) + implementation(projects.xml.utils) // This is to build the tooling-api-impl project before the app is built // So we always copy the latest JAR file to assets - compileOnly(projects.subprojects.toolingApiImpl) + compileOnly(projects.tooling.impl) - testImplementation(projects.subprojects.testingUnit) - androidTestImplementation(projects.subprojects.testingAndroid) + testImplementation(projects.testing.unitTest) + androidTestImplementation(projects.testing.androidTest) } diff --git a/app/dev.keystore b/core/app/dev.keystore similarity index 100% rename from app/dev.keystore rename to core/app/dev.keystore diff --git a/app/gradle.properties b/core/app/gradle.properties similarity index 100% rename from app/gradle.properties rename to core/app/gradle.properties diff --git a/app/src/main/AndroidManifest.xml b/core/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to core/app/src/main/AndroidManifest.xml diff --git a/app/src/main/assets/fonts/jetbrains-mono.ttf b/core/app/src/main/assets/fonts/jetbrains-mono.ttf similarity index 100% rename from app/src/main/assets/fonts/jetbrains-mono.ttf rename to core/app/src/main/assets/fonts/jetbrains-mono.ttf diff --git a/app/src/main/assets/fonts/josefin-sans.ttf b/core/app/src/main/assets/fonts/josefin-sans.ttf similarity index 100% rename from app/src/main/assets/fonts/josefin-sans.ttf rename to core/app/src/main/assets/fonts/josefin-sans.ttf diff --git a/app/src/main/assets/fonts/quicksand.ttf b/core/app/src/main/assets/fonts/quicksand.ttf similarity index 100% rename from app/src/main/assets/fonts/quicksand.ttf rename to core/app/src/main/assets/fonts/quicksand.ttf diff --git a/app/src/main/assets/templates/xml/drawable.xml b/core/app/src/main/assets/templates/xml/drawable.xml similarity index 100% rename from app/src/main/assets/templates/xml/drawable.xml rename to core/app/src/main/assets/templates/xml/drawable.xml diff --git a/app/src/main/assets/templates/xml/layout.xml b/core/app/src/main/assets/templates/xml/layout.xml similarity index 100% rename from app/src/main/assets/templates/xml/layout.xml rename to core/app/src/main/assets/templates/xml/layout.xml diff --git a/app/src/main/assets/templates/xml/menu.xml b/core/app/src/main/assets/templates/xml/menu.xml similarity index 100% rename from app/src/main/assets/templates/xml/menu.xml rename to core/app/src/main/assets/templates/xml/menu.xml diff --git a/app/src/main/googlePlay.png b/core/app/src/main/googlePlay.png similarity index 100% rename from app/src/main/googlePlay.png rename to core/app/src/main/googlePlay.png diff --git a/app/src/main/ic_launcher-playstore.png b/core/app/src/main/ic_launcher-playstore.png similarity index 100% rename from app/src/main/ic_launcher-playstore.png rename to core/app/src/main/ic_launcher-playstore.png diff --git a/app/src/main/java/com/itsaky/androidide/actions/BaseBuildAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/BaseBuildAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/BaseBuildAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/BaseBuildAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/BaseEditorAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/EditorActivityAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/EditorActivityAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/EditorActivityAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/EditorActivityAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/EditorRelatedAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/build/ProjectSyncAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/build/RunTasksAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/build/RunTasksAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/build/RunTasksAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/build/RunTasksAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/CopyAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/CopyAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/CopyAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/CopyAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/CutAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/CutAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/CutAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/CutAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/ExpandSelectionAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/ExpandSelectionAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/ExpandSelectionAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/ExpandSelectionAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/LongSelectAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/LongSelectAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/LongSelectAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/LongSelectAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/PasteAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/PasteAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/PasteAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/PasteAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/editor/SelectAllAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/editor/SelectAllAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/editor/SelectAllAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/editor/SelectAllAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/DisconnectLogSendersAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/DisconnectLogSendersAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/DisconnectLogSendersAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/DisconnectLogSendersAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/FindActionMenu.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/FindActionMenu.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/FindActionMenu.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/FindActionMenu.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/FindInFileAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/FindInFileAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/FindInFileAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/FindInFileAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/LaunchAppAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/LaunchAppAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/LaunchAppAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/LaunchAppAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/PreviewLayoutAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/PreviewLayoutAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/PreviewLayoutAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/PreviewLayoutAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/etc/ReloadColorSchemesAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/etc/ReloadColorSchemesAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/etc/ReloadColorSchemesAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/etc/ReloadColorSchemesAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/CloseAllFilesAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/CloseAllFilesAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/CloseAllFilesAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/CloseAllFilesAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/CloseFileAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/CloseFileAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/CloseFileAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/CloseFileAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/CloseOtherFilesAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/CloseOtherFilesAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/CloseOtherFilesAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/CloseOtherFilesAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/FileTabAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/FileTabAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/FileTabAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/FileTabAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/FormatCodeAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/FormatCodeAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/FormatCodeAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/FormatCodeAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/file/SaveFileAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseDirNodeAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseDirNodeAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/BaseDirNodeAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseDirNodeAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseFileTreeAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseFileTreeAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/BaseFileTreeAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/BaseFileTreeAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/CopyPathAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/CopyPathAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/CopyPathAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/CopyPathAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/DeleteAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/DeleteAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/DeleteAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/DeleteAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFolderAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/OpenWithAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/OpenWithAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/OpenWithAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/OpenWithAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/filetree/RenameAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/filetree/RenameAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/filetree/RenameAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/filetree/RenameAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt b/core/app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/internalActionUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/AbstractSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/AbstractSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/AbstractSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/AbstractSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/BuildVariantsSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/BuildVariantsSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/BuildVariantsSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/BuildVariantsSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/CloseProjectSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/CloseProjectSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/CloseProjectSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/CloseProjectSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/FileTreeSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/FileTreeSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/FileTreeSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/FileTreeSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/PreferencesSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/PreferencesSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/PreferencesSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/PreferencesSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/sidebar/TerminalSidebarAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/sidebar/TerminalSidebarAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/sidebar/TerminalSidebarAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/sidebar/TerminalSidebarAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/actions/text/UndoAction.kt b/core/app/src/main/java/com/itsaky/androidide/actions/text/UndoAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/actions/text/UndoAction.kt rename to core/app/src/main/java/com/itsaky/androidide/actions/text/UndoAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/AboutActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/AboutActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/AboutActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/AboutActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/ContributorsActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/ContributorsActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/ContributorsActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/ContributorsActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/CrashHandlerActivity.java b/core/app/src/main/java/com/itsaky/androidide/activities/CrashHandlerActivity.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/CrashHandlerActivity.java rename to core/app/src/main/java/com/itsaky/androidide/activities/CrashHandlerActivity.java diff --git a/app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/OnboardingActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/PreferencesActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/SplashActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/SplashActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/SplashActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/SplashActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorActivityKt.kt b/core/app/src/main/java/com/itsaky/androidide/activities/editor/EditorActivityKt.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/editor/EditorActivityKt.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/editor/EditorActivityKt.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/IDELogcatReader.kt b/core/app/src/main/java/com/itsaky/androidide/activities/editor/IDELogcatReader.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/editor/IDELogcatReader.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/editor/IDELogcatReader.kt diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt b/core/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/BuildVariantsAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/BuildVariantsAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/BuildVariantsAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/BuildVariantsAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/ContributorsGridAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/ContributorsGridAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/ContributorsGridAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/ContributorsGridAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java b/core/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticItemAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java b/core/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/DiagnosticsAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java b/core/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/EditorBottomSheetTabAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/adapters/FilterableRecyclerViewAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/FilterableRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/FilterableRecyclerViewAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/FilterableRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/MainActionsListAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/MainActionsListAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/MainActionsListAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/MainActionsListAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java b/core/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/OptionsSheetAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/adapters/RunTasksListAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/RunTasksListAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/RunTasksListAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/RunTasksListAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/SearchListAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java b/core/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/SymbolInputAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/adapters/TemplateListAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/TemplateListAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/TemplateListAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/TemplateListAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/TemplateWidgetsListAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/TemplateWidgetsListAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/TemplateWidgetsListAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/TemplateWidgetsListAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/onboarding/DefaultOnboardingItemAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/onboarding/DefaultOnboardingItemAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/onboarding/DefaultOnboardingItemAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/onboarding/DefaultOnboardingItemAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/onboarding/OnboardingPermissionsAdapter.kt b/core/app/src/main/java/com/itsaky/androidide/adapters/onboarding/OnboardingPermissionsAdapter.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/onboarding/OnboardingPermissionsAdapter.kt rename to core/app/src/main/java/com/itsaky/androidide/adapters/onboarding/OnboardingPermissionsAdapter.kt diff --git a/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java b/core/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java rename to core/app/src/main/java/com/itsaky/androidide/adapters/viewholders/FileTreeViewHolder.java diff --git a/app/src/main/java/com/itsaky/androidide/app/EdgeToEdgeIDEActivity.kt b/core/app/src/main/java/com/itsaky/androidide/app/EdgeToEdgeIDEActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/app/EdgeToEdgeIDEActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/app/EdgeToEdgeIDEActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/app/IDEActivity.kt b/core/app/src/main/java/com/itsaky/androidide/app/IDEActivity.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/app/IDEActivity.kt rename to core/app/src/main/java/com/itsaky/androidide/app/IDEActivity.kt diff --git a/app/src/main/java/com/itsaky/androidide/app/IDEActivityDelegate.kt b/core/app/src/main/java/com/itsaky/androidide/app/IDEActivityDelegate.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/app/IDEActivityDelegate.kt rename to core/app/src/main/java/com/itsaky/androidide/app/IDEActivityDelegate.kt diff --git a/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt b/core/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt rename to core/app/src/main/java/com/itsaky/androidide/app/IDEApplication.kt diff --git a/app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt b/core/app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt similarity index 87% rename from app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt rename to core/app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt index bb64e2bf9..16b8d7075 100644 --- a/app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt +++ b/core/app/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImpl.kt @@ -19,7 +19,6 @@ package com.itsaky.androidide.app.configuration import android.os.Build import com.google.auto.service.AutoService -import com.itsaky.androidide.BuildConfig import com.itsaky.androidide.app.IDEApplication /** @@ -34,8 +33,8 @@ open class IDEBuildConfigProviderImpl : IDEBuildConfigProvider { // transform to valid ABI names return@lazy when (val abi = applicationInfo.nativeLibraryDir!!.substringAfterLast('/')) { - "arm64" -> BuildConfig.ABI_ARM64_V8A - "arm" -> BuildConfig.ABI_ARMEABI_V7A + "arm64" -> CpuArch.AARCH64.abi + "arm" -> CpuArch.ARM.abi else -> abi } } @@ -47,6 +46,6 @@ open class IDEBuildConfigProviderImpl : IDEBuildConfigProvider { get() = CpuArch.forAbi(Build.SUPPORTED_ABIS[0])!! override val supportedAbis: Array by lazy { - arrayOf(BuildConfig.ABI_ARM64_V8A, BuildConfig.ABI_ARMEABI_V7A, BuildConfig.ABI_X86_64) + arrayOf(CpuArch.AARCH64.abi, CpuArch.ARM.abi, CpuArch.X86_64.abi) } } \ No newline at end of file diff --git a/app/src/main/java/com/itsaky/androidide/app/configuration/JdkDistributionProviderImpl.kt b/core/app/src/main/java/com/itsaky/androidide/app/configuration/JdkDistributionProviderImpl.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/app/configuration/JdkDistributionProviderImpl.kt rename to core/app/src/main/java/com/itsaky/androidide/app/configuration/JdkDistributionProviderImpl.kt diff --git a/app/src/main/java/com/itsaky/androidide/contributors/Contributor.kt b/core/app/src/main/java/com/itsaky/androidide/contributors/Contributor.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/contributors/Contributor.kt rename to core/app/src/main/java/com/itsaky/androidide/contributors/Contributor.kt diff --git a/app/src/main/java/com/itsaky/androidide/contributors/Contributors.kt b/core/app/src/main/java/com/itsaky/androidide/contributors/Contributors.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/contributors/Contributors.kt rename to core/app/src/main/java/com/itsaky/androidide/contributors/Contributors.kt diff --git a/app/src/main/java/com/itsaky/androidide/contributors/CrowdinTranslator.kt b/core/app/src/main/java/com/itsaky/androidide/contributors/CrowdinTranslator.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/contributors/CrowdinTranslator.kt rename to core/app/src/main/java/com/itsaky/androidide/contributors/CrowdinTranslator.kt diff --git a/app/src/main/java/com/itsaky/androidide/contributors/GitHubContributors.kt b/core/app/src/main/java/com/itsaky/androidide/contributors/GitHubContributors.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/contributors/GitHubContributors.kt rename to core/app/src/main/java/com/itsaky/androidide/contributors/GitHubContributors.kt diff --git a/app/src/main/java/com/itsaky/androidide/contributors/common.kt b/core/app/src/main/java/com/itsaky/androidide/contributors/common.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/contributors/common.kt rename to core/app/src/main/java/com/itsaky/androidide/contributors/common.kt diff --git a/app/src/main/java/com/itsaky/androidide/events/FileTree.kt b/core/app/src/main/java/com/itsaky/androidide/events/FileTree.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/events/FileTree.kt rename to core/app/src/main/java/com/itsaky/androidide/events/FileTree.kt diff --git a/app/src/main/java/com/itsaky/androidide/events/InstallationResultEvent.kt b/core/app/src/main/java/com/itsaky/androidide/events/InstallationResultEvent.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/events/InstallationResultEvent.kt rename to core/app/src/main/java/com/itsaky/androidide/events/InstallationResultEvent.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/BasePreferenceFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/BasePreferenceFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/BasePreferenceFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/BasePreferenceFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/CrashReportFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/DiagnosticsListFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/EmptyStateFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/EmptyStateFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/EmptyStateFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/EmptyStateFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/IDEPreferencesFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/IDEPreferencesFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/IDEPreferencesFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/IDEPreferencesFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/RecyclerViewFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/RecyclerViewFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/RecyclerViewFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/RecyclerViewFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/RunTasksDialogFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/SearchResultFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/TemplateListFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/TemplateListFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/TemplateListFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/TemplateListFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/GreetingFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/GreetingFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/GreetingFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/GreetingFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingInfoFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingInfoFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingInfoFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingInfoFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingMultiActionFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingMultiActionFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingMultiActionFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/OnboardingMultiActionFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/PermissionsFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/PermissionsFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/PermissionsFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/PermissionsFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/StatisticsFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/StatisticsFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/StatisticsFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/StatisticsFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/ideSetupConfig.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/ideSetupConfig.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/onboarding/ideSetupConfig.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/onboarding/ideSetupConfig.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/AppLogFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/output/AppLogFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/AppLogFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/AppLogFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/BuildOutputFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/output/BuildOutputFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/BuildOutputFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/BuildOutputFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/IDELogFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/output/IDELogFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/IDELogFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/IDELogFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/NonEditableEditorFragment.java b/core/app/src/main/java/com/itsaky/androidide/fragments/output/NonEditableEditorFragment.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/NonEditableEditorFragment.java rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/NonEditableEditorFragment.java diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/ShareableOutputFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/output/ShareableOutputFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/output/ShareableOutputFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/output/ShareableOutputFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java b/core/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java rename to core/app/src/main/java/com/itsaky/androidide/fragments/sheets/BaseBottomSheetFragment.java diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java b/core/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java rename to core/app/src/main/java/com/itsaky/androidide/fragments/sheets/OptionsListFragment.java diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java b/core/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java rename to core/app/src/main/java/com/itsaky/androidide/fragments/sheets/ProgressSheet.java diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sidebar/BuildVariantsFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/BuildVariantsFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sidebar/BuildVariantsFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/BuildVariantsFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sidebar/EditorSidebarFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/EditorSidebarFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sidebar/EditorSidebarFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/EditorSidebarFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/fragments/sidebar/FileTreeFragment.kt b/core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/FileTreeFragment.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/fragments/sidebar/FileTreeFragment.kt rename to core/app/src/main/java/com/itsaky/androidide/fragments/sidebar/FileTreeFragment.kt diff --git a/app/src/main/java/com/itsaky/androidide/handlers/BaseEventHandler.kt b/core/app/src/main/java/com/itsaky/androidide/handlers/BaseEventHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/handlers/BaseEventHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/handlers/BaseEventHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/handlers/EditorActivityLifecyclerObserver.kt b/core/app/src/main/java/com/itsaky/androidide/handlers/EditorActivityLifecyclerObserver.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/handlers/EditorActivityLifecyclerObserver.kt rename to core/app/src/main/java/com/itsaky/androidide/handlers/EditorActivityLifecyclerObserver.kt diff --git a/app/src/main/java/com/itsaky/androidide/handlers/EditorBuildEventListener.kt b/core/app/src/main/java/com/itsaky/androidide/handlers/EditorBuildEventListener.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/handlers/EditorBuildEventListener.kt rename to core/app/src/main/java/com/itsaky/androidide/handlers/EditorBuildEventListener.kt diff --git a/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt b/core/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/handlers/FileTreeActionHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/handlers/LspHandler.kt b/core/app/src/main/java/com/itsaky/androidide/handlers/LspHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/handlers/LspHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/handlers/LspHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java b/core/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java rename to core/app/src/main/java/com/itsaky/androidide/interfaces/DiagnosticClickListener.java diff --git a/app/src/main/java/com/itsaky/androidide/interfaces/IEditorHandler.kt b/core/app/src/main/java/com/itsaky/androidide/interfaces/IEditorHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/interfaces/IEditorHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/interfaces/IEditorHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/logging/IDELoggingConfigurator.kt b/core/app/src/main/java/com/itsaky/androidide/logging/IDELoggingConfigurator.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/logging/IDELoggingConfigurator.kt rename to core/app/src/main/java/com/itsaky/androidide/logging/IDELoggingConfigurator.kt diff --git a/app/src/main/java/com/itsaky/androidide/logging/LifecycleAwareAppender.kt b/core/app/src/main/java/com/itsaky/androidide/logging/LifecycleAwareAppender.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/logging/LifecycleAwareAppender.kt rename to core/app/src/main/java/com/itsaky/androidide/logging/LifecycleAwareAppender.kt diff --git a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java b/core/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java rename to core/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java diff --git a/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.kt b/core/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/ApkMetadata.kt rename to core/app/src/main/java/com/itsaky/androidide/models/ApkMetadata.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/ArtifactType.kt b/core/app/src/main/java/com/itsaky/androidide/models/ArtifactType.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/ArtifactType.kt rename to core/app/src/main/java/com/itsaky/androidide/models/ArtifactType.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/Checkable.kt b/core/app/src/main/java/com/itsaky/androidide/models/Checkable.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/Checkable.kt rename to core/app/src/main/java/com/itsaky/androidide/models/Checkable.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/DefaultOnboardingItem.kt b/core/app/src/main/java/com/itsaky/androidide/models/DefaultOnboardingItem.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/DefaultOnboardingItem.kt rename to core/app/src/main/java/com/itsaky/androidide/models/DefaultOnboardingItem.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java b/core/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java rename to core/app/src/main/java/com/itsaky/androidide/models/DiagnosticGroup.java diff --git a/app/src/main/java/com/itsaky/androidide/models/FileExtension.kt b/core/app/src/main/java/com/itsaky/androidide/models/FileExtension.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/FileExtension.kt rename to core/app/src/main/java/com/itsaky/androidide/models/FileExtension.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/HyperlinkedOnboardingItem.kt b/core/app/src/main/java/com/itsaky/androidide/models/HyperlinkedOnboardingItem.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/HyperlinkedOnboardingItem.kt rename to core/app/src/main/java/com/itsaky/androidide/models/HyperlinkedOnboardingItem.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt b/core/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt rename to core/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/MainScreenAction.kt b/core/app/src/main/java/com/itsaky/androidide/models/MainScreenAction.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/MainScreenAction.kt rename to core/app/src/main/java/com/itsaky/androidide/models/MainScreenAction.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/MetadataElement.kt b/core/app/src/main/java/com/itsaky/androidide/models/MetadataElement.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/MetadataElement.kt rename to core/app/src/main/java/com/itsaky/androidide/models/MetadataElement.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/NewProjectDetails.java b/core/app/src/main/java/com/itsaky/androidide/models/NewProjectDetails.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/NewProjectDetails.java rename to core/app/src/main/java/com/itsaky/androidide/models/NewProjectDetails.java diff --git a/app/src/main/java/com/itsaky/androidide/models/OnboardingItem.kt b/core/app/src/main/java/com/itsaky/androidide/models/OnboardingItem.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/OnboardingItem.kt rename to core/app/src/main/java/com/itsaky/androidide/models/OnboardingItem.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/OnboardingPermissionItem.kt b/core/app/src/main/java/com/itsaky/androidide/models/OnboardingPermissionItem.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/OnboardingPermissionItem.kt rename to core/app/src/main/java/com/itsaky/androidide/models/OnboardingPermissionItem.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/OpenedFile.kt b/core/app/src/main/java/com/itsaky/androidide/models/OpenedFile.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/OpenedFile.kt rename to core/app/src/main/java/com/itsaky/androidide/models/OpenedFile.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/OpenedFilesCache.kt b/core/app/src/main/java/com/itsaky/androidide/models/OpenedFilesCache.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/OpenedFilesCache.kt rename to core/app/src/main/java/com/itsaky/androidide/models/OpenedFilesCache.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java b/core/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java rename to core/app/src/main/java/com/itsaky/androidide/models/ProjectTemplate.java diff --git a/app/src/main/java/com/itsaky/androidide/models/RunTasksCategory.kt b/core/app/src/main/java/com/itsaky/androidide/models/RunTasksCategory.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/RunTasksCategory.kt rename to core/app/src/main/java/com/itsaky/androidide/models/RunTasksCategory.kt diff --git a/app/src/main/java/com/itsaky/androidide/models/SearchResult.java b/core/app/src/main/java/com/itsaky/androidide/models/SearchResult.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/SearchResult.java rename to core/app/src/main/java/com/itsaky/androidide/models/SearchResult.java diff --git a/app/src/main/java/com/itsaky/androidide/models/Symbol.kt b/core/app/src/main/java/com/itsaky/androidide/models/Symbol.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/models/Symbol.kt rename to core/app/src/main/java/com/itsaky/androidide/models/Symbol.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/aboutPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/aboutPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/aboutPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/aboutPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/buildAndRunPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/buildAndRunPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/buildAndRunPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/buildAndRunPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/commonPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/commonPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/commonPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/commonPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/developerOptionsPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/developerOptionsPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/developerOptionsPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/developerOptionsPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/editorPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/editorPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/editorPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/editorPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/generalPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/generalPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/generalPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/generalPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/javaPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/javaPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/javaPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/javaPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/rootPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/statPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/statPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/statPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/statPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/termuxPrefsExt.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/termuxPrefsExt.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/termuxPrefsExt.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/termuxPrefsExt.kt diff --git a/app/src/main/java/com/itsaky/androidide/preferences/xmlPrefExts.kt b/core/app/src/main/java/com/itsaky/androidide/preferences/xmlPrefExts.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/preferences/xmlPrefExts.kt rename to core/app/src/main/java/com/itsaky/androidide/preferences/xmlPrefExts.kt diff --git a/app/src/main/java/com/itsaky/androidide/provider/IDEDocumentsProvider.java b/core/app/src/main/java/com/itsaky/androidide/provider/IDEDocumentsProvider.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/provider/IDEDocumentsProvider.java rename to core/app/src/main/java/com/itsaky/androidide/provider/IDEDocumentsProvider.java diff --git a/app/src/main/java/com/itsaky/androidide/provider/IDEFileProvider.kt b/core/app/src/main/java/com/itsaky/androidide/provider/IDEFileProvider.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/provider/IDEFileProvider.kt rename to core/app/src/main/java/com/itsaky/androidide/provider/IDEFileProvider.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/InstallationResultReceiver.kt b/core/app/src/main/java/com/itsaky/androidide/services/InstallationResultReceiver.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/InstallationResultReceiver.kt rename to core/app/src/main/java/com/itsaky/androidide/services/InstallationResultReceiver.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/ToolingServerAlreadyStartedException.java b/core/app/src/main/java/com/itsaky/androidide/services/ToolingServerAlreadyStartedException.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/ToolingServerAlreadyStartedException.java rename to core/app/src/main/java/com/itsaky/androidide/services/ToolingServerAlreadyStartedException.java diff --git a/app/src/main/java/com/itsaky/androidide/services/ToolingServerNotStartedException.java b/core/app/src/main/java/com/itsaky/androidide/services/ToolingServerNotStartedException.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/ToolingServerNotStartedException.java rename to core/app/src/main/java/com/itsaky/androidide/services/ToolingServerNotStartedException.java diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/BuildInProgressException.java b/core/app/src/main/java/com/itsaky/androidide/services/builder/BuildInProgressException.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/BuildInProgressException.java rename to core/app/src/main/java/com/itsaky/androidide/services/builder/BuildInProgressException.java diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt b/core/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt rename to core/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildServiceConnnection.kt b/core/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildServiceConnnection.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildServiceConnnection.kt rename to core/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildServiceConnnection.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/GradleServiceBinder.kt b/core/app/src/main/java/com/itsaky/androidide/services/builder/GradleServiceBinder.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/GradleServiceBinder.kt rename to core/app/src/main/java/com/itsaky/androidide/services/builder/GradleServiceBinder.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt b/core/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt rename to core/app/src/main/java/com/itsaky/androidide/services/builder/ToolingServerRunner.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/util.kt b/core/app/src/main/java/com/itsaky/androidide/services/builder/util.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/builder/util.kt rename to core/app/src/main/java/com/itsaky/androidide/services/builder/util.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/CachingLogSender.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/CachingLogSender.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/CachingLogSender.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/CachingLogSender.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/ConnectionObserverParams.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/ConnectionObserverParams.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/ConnectionObserverParams.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/ConnectionObserverParams.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverImpl.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverImpl.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/LogReceiverImpl.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverImpl.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverService.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverService.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/LogReceiverService.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverService.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverServiceConnection.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverServiceConnection.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/LogReceiverServiceConnection.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/LogReceiverServiceConnection.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/LogSenderHandler.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/LogSenderHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/LogSenderHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/LogSenderHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/LogSendersRegistry.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/LogSendersRegistry.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/LogSendersRegistry.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/LogSendersRegistry.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/MultiLogSenderHandler.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/MultiLogSenderHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/MultiLogSenderHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/MultiLogSenderHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/services/log/utils.kt b/core/app/src/main/java/com/itsaky/androidide/services/log/utils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/services/log/utils.kt rename to core/app/src/main/java/com/itsaky/androidide/services/log/utils.kt diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java b/core/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java rename to core/app/src/main/java/com/itsaky/androidide/tasks/callables/FileTreeCallable.java diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java b/core/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java rename to core/app/src/main/java/com/itsaky/androidide/tasks/callables/ListDirectoryCallable.java diff --git a/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java b/core/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java rename to core/app/src/main/java/com/itsaky/androidide/tasks/callables/UnzipCallable.java diff --git a/app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt b/core/app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/ContributorsRecyclerView.kt b/core/app/src/main/java/com/itsaky/androidide/ui/ContributorsRecyclerView.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/ContributorsRecyclerView.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/ContributorsRecyclerView.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt b/core/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/EmptyView.java b/core/app/src/main/java/com/itsaky/androidide/ui/EmptyView.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/EmptyView.java rename to core/app/src/main/java/com/itsaky/androidide/ui/EmptyView.java diff --git a/app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt b/core/app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/ScalableTabLayout.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/SwipeRevealLayout.kt b/core/app/src/main/java/com/itsaky/androidide/ui/SwipeRevealLayout.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/SwipeRevealLayout.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/SwipeRevealLayout.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java b/core/app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java rename to core/app/src/main/java/com/itsaky/androidide/ui/SymbolInputView.java diff --git a/app/src/main/java/com/itsaky/androidide/ui/themes/ThemeManager.kt b/core/app/src/main/java/com/itsaky/androidide/ui/themes/ThemeManager.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/themes/ThemeManager.kt rename to core/app/src/main/java/com/itsaky/androidide/ui/themes/ThemeManager.kt diff --git a/app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java b/core/app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java rename to core/app/src/main/java/com/itsaky/androidide/ui/transition/ArcMotionPlus.java diff --git a/app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java b/core/app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java rename to core/app/src/main/java/com/itsaky/androidide/ui/transition/CubicBezierArc.java diff --git a/app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java b/core/app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java rename to core/app/src/main/java/com/itsaky/androidide/ui/transition/ProgressTransition.java diff --git a/app/src/main/java/com/itsaky/androidide/utils/ActionMenuUtils.kt b/core/app/src/main/java/com/itsaky/androidide/utils/ActionMenuUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ActionMenuUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/ActionMenuUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/ApkInstallationSessionCallback.kt b/core/app/src/main/java/com/itsaky/androidide/utils/ApkInstallationSessionCallback.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ApkInstallationSessionCallback.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/ApkInstallationSessionCallback.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/BuildInfoUtils.kt b/core/app/src/main/java/com/itsaky/androidide/utils/BuildInfoUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/BuildInfoUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/BuildInfoUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt b/core/app/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/ClassBuilder.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt b/core/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/EditorActivityActions.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt b/core/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/EditorSidebarActions.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/FlexboxUtils.kt b/core/app/src/main/java/com/itsaky/androidide/utils/FlexboxUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/FlexboxUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/FlexboxUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt b/core/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/InstallationResultHandler.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/IntentUtils.kt b/core/app/src/main/java/com/itsaky/androidide/utils/IntentUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/IntentUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/IntentUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/JSONUtility.java b/core/app/src/main/java/com/itsaky/androidide/utils/JSONUtility.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/JSONUtility.java rename to core/app/src/main/java/com/itsaky/androidide/utils/JSONUtility.java diff --git a/app/src/main/java/com/itsaky/androidide/utils/JdkUtils.kt b/core/app/src/main/java/com/itsaky/androidide/utils/JdkUtils.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/JdkUtils.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/JdkUtils.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/ListingFileRedirect.kt b/core/app/src/main/java/com/itsaky/androidide/utils/ListingFileRedirect.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ListingFileRedirect.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/ListingFileRedirect.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/MemoryUsageWatcher.kt b/core/app/src/main/java/com/itsaky/androidide/utils/MemoryUsageWatcher.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/MemoryUsageWatcher.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/MemoryUsageWatcher.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/MutableShiftedLongArray.kt b/core/app/src/main/java/com/itsaky/androidide/utils/MutableShiftedLongArray.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/MutableShiftedLongArray.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/MutableShiftedLongArray.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/NoOpServiceConnection.kt b/core/app/src/main/java/com/itsaky/androidide/utils/NoOpServiceConnection.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/NoOpServiceConnection.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/NoOpServiceConnection.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java b/core/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java rename to core/app/src/main/java/com/itsaky/androidide/utils/ProjectWriter.java diff --git a/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java b/core/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java rename to core/app/src/main/java/com/itsaky/androidide/utils/RecursiveFileSearcher.java diff --git a/app/src/main/java/com/itsaky/androidide/utils/ShiftedLongArray.kt b/core/app/src/main/java/com/itsaky/androidide/utils/ShiftedLongArray.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/ShiftedLongArray.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/ShiftedLongArray.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/SingleBottomSheetCallback.kt b/core/app/src/main/java/com/itsaky/androidide/utils/SingleBottomSheetCallback.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/SingleBottomSheetCallback.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/SingleBottomSheetCallback.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt b/core/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/Symbols.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/Symbols.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt b/core/app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt rename to core/app/src/main/java/com/itsaky/androidide/utils/TemplateRecipeExecutor.kt diff --git a/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java b/core/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java similarity index 100% rename from app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java rename to core/app/src/main/java/com/itsaky/androidide/utils/TextWatcherAdapter.java diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/BuildVariantsViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/BuildVariantsViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/BuildVariantsViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/BuildVariantsViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/ContributorsViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/ContributorsViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/ContributorsViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/ContributorsViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/EditorViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/EmptyStateFragmentViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/EmptyStateFragmentViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/EmptyStateFragmentViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/EmptyStateFragmentViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/FileTreeViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/FileTreeViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/FileTreeViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/FileTreeViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/MainViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/MainViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/MainViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/MainViewModel.kt diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/RunTasksViewModel.kt b/core/app/src/main/java/com/itsaky/androidide/viewmodel/RunTasksViewModel.kt similarity index 100% rename from app/src/main/java/com/itsaky/androidide/viewmodel/RunTasksViewModel.kt rename to core/app/src/main/java/com/itsaky/androidide/viewmodel/RunTasksViewModel.kt diff --git a/app/src/main/res/layout-land/activity_about.xml b/core/app/src/main/res/layout-land/activity_about.xml similarity index 100% rename from app/src/main/res/layout-land/activity_about.xml rename to core/app/src/main/res/layout-land/activity_about.xml diff --git a/app/src/main/res/layout-land/fragment_main.xml b/core/app/src/main/res/layout-land/fragment_main.xml similarity index 100% rename from app/src/main/res/layout-land/fragment_main.xml rename to core/app/src/main/res/layout-land/fragment_main.xml diff --git a/app/src/main/res/layout-land/fragment_onboarding.xml b/core/app/src/main/res/layout-land/fragment_onboarding.xml similarity index 100% rename from app/src/main/res/layout-land/fragment_onboarding.xml rename to core/app/src/main/res/layout-land/fragment_onboarding.xml diff --git a/app/src/main/res/layout-land/fragment_onboarding_greeting.xml b/core/app/src/main/res/layout-land/fragment_onboarding_greeting.xml similarity index 100% rename from app/src/main/res/layout-land/fragment_onboarding_greeting.xml rename to core/app/src/main/res/layout-land/fragment_onboarding_greeting.xml diff --git a/app/src/main/res/layout-land/fragment_onboarding_info.xml b/core/app/src/main/res/layout-land/fragment_onboarding_info.xml similarity index 100% rename from app/src/main/res/layout-land/fragment_onboarding_info.xml rename to core/app/src/main/res/layout-land/fragment_onboarding_info.xml diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/core/app/src/main/res/layout-sw600dp/activity_about.xml similarity index 100% rename from app/src/main/res/layout-sw600dp/activity_about.xml rename to core/app/src/main/res/layout-sw600dp/activity_about.xml diff --git a/app/src/main/res/layout-sw600dp/fragment_onboarding.xml b/core/app/src/main/res/layout-sw600dp/fragment_onboarding.xml similarity index 100% rename from app/src/main/res/layout-sw600dp/fragment_onboarding.xml rename to core/app/src/main/res/layout-sw600dp/fragment_onboarding.xml diff --git a/app/src/main/res/layout-sw600dp/fragment_onboarding_greeting.xml b/core/app/src/main/res/layout-sw600dp/fragment_onboarding_greeting.xml similarity index 100% rename from app/src/main/res/layout-sw600dp/fragment_onboarding_greeting.xml rename to core/app/src/main/res/layout-sw600dp/fragment_onboarding_greeting.xml diff --git a/app/src/main/res/layout-sw600dp/fragment_onboarding_info.xml b/core/app/src/main/res/layout-sw600dp/fragment_onboarding_info.xml similarity index 100% rename from app/src/main/res/layout-sw600dp/fragment_onboarding_info.xml rename to core/app/src/main/res/layout-sw600dp/fragment_onboarding_info.xml diff --git a/app/src/main/res/layout/activity_about.xml b/core/app/src/main/res/layout/activity_about.xml similarity index 100% rename from app/src/main/res/layout/activity_about.xml rename to core/app/src/main/res/layout/activity_about.xml diff --git a/app/src/main/res/layout/activity_contributors.xml b/core/app/src/main/res/layout/activity_contributors.xml similarity index 100% rename from app/src/main/res/layout/activity_contributors.xml rename to core/app/src/main/res/layout/activity_contributors.xml diff --git a/app/src/main/res/layout/activity_crash_handler.xml b/core/app/src/main/res/layout/activity_crash_handler.xml similarity index 100% rename from app/src/main/res/layout/activity_crash_handler.xml rename to core/app/src/main/res/layout/activity_crash_handler.xml diff --git a/app/src/main/res/layout/activity_editor.xml b/core/app/src/main/res/layout/activity_editor.xml similarity index 100% rename from app/src/main/res/layout/activity_editor.xml rename to core/app/src/main/res/layout/activity_editor.xml diff --git a/app/src/main/res/layout/activity_main.xml b/core/app/src/main/res/layout/activity_main.xml similarity index 100% rename from app/src/main/res/layout/activity_main.xml rename to core/app/src/main/res/layout/activity_main.xml diff --git a/app/src/main/res/layout/activity_preferences.xml b/core/app/src/main/res/layout/activity_preferences.xml similarity index 100% rename from app/src/main/res/layout/activity_preferences.xml rename to core/app/src/main/res/layout/activity_preferences.xml diff --git a/app/src/main/res/layout/content_editor.xml b/core/app/src/main/res/layout/content_editor.xml similarity index 100% rename from app/src/main/res/layout/content_editor.xml rename to core/app/src/main/res/layout/content_editor.xml diff --git a/app/src/main/res/layout/fragment_build_variants.xml b/core/app/src/main/res/layout/fragment_build_variants.xml similarity index 100% rename from app/src/main/res/layout/fragment_build_variants.xml rename to core/app/src/main/res/layout/fragment_build_variants.xml diff --git a/app/src/main/res/layout/fragment_editor_sidebar.xml b/core/app/src/main/res/layout/fragment_editor_sidebar.xml similarity index 100% rename from app/src/main/res/layout/fragment_editor_sidebar.xml rename to core/app/src/main/res/layout/fragment_editor_sidebar.xml diff --git a/app/src/main/res/layout/fragment_empty_state.xml b/core/app/src/main/res/layout/fragment_empty_state.xml similarity index 100% rename from app/src/main/res/layout/fragment_empty_state.xml rename to core/app/src/main/res/layout/fragment_empty_state.xml diff --git a/app/src/main/res/layout/fragment_log.xml b/core/app/src/main/res/layout/fragment_log.xml similarity index 100% rename from app/src/main/res/layout/fragment_log.xml rename to core/app/src/main/res/layout/fragment_log.xml diff --git a/app/src/main/res/layout/fragment_main.xml b/core/app/src/main/res/layout/fragment_main.xml similarity index 100% rename from app/src/main/res/layout/fragment_main.xml rename to core/app/src/main/res/layout/fragment_main.xml diff --git a/app/src/main/res/layout/fragment_non_editable_editor.xml b/core/app/src/main/res/layout/fragment_non_editable_editor.xml similarity index 100% rename from app/src/main/res/layout/fragment_non_editable_editor.xml rename to core/app/src/main/res/layout/fragment_non_editable_editor.xml diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/core/app/src/main/res/layout/fragment_onboarding.xml similarity index 100% rename from app/src/main/res/layout/fragment_onboarding.xml rename to core/app/src/main/res/layout/fragment_onboarding.xml diff --git a/app/src/main/res/layout/fragment_onboarding_greeting.xml b/core/app/src/main/res/layout/fragment_onboarding_greeting.xml similarity index 100% rename from app/src/main/res/layout/fragment_onboarding_greeting.xml rename to core/app/src/main/res/layout/fragment_onboarding_greeting.xml diff --git a/app/src/main/res/layout/fragment_onboarding_info.xml b/core/app/src/main/res/layout/fragment_onboarding_info.xml similarity index 100% rename from app/src/main/res/layout/fragment_onboarding_info.xml rename to core/app/src/main/res/layout/fragment_onboarding_info.xml diff --git a/app/src/main/res/layout/fragment_recyclerview.xml b/core/app/src/main/res/layout/fragment_recyclerview.xml similarity index 100% rename from app/src/main/res/layout/fragment_recyclerview.xml rename to core/app/src/main/res/layout/fragment_recyclerview.xml diff --git a/app/src/main/res/layout/fragment_template_details.xml b/core/app/src/main/res/layout/fragment_template_details.xml similarity index 100% rename from app/src/main/res/layout/fragment_template_details.xml rename to core/app/src/main/res/layout/fragment_template_details.xml diff --git a/app/src/main/res/layout/fragment_template_list.xml b/core/app/src/main/res/layout/fragment_template_list.xml similarity index 100% rename from app/src/main/res/layout/fragment_template_list.xml rename to core/app/src/main/res/layout/fragment_template_list.xml diff --git a/app/src/main/res/layout/layout_about_header.xml b/core/app/src/main/res/layout/layout_about_header.xml similarity index 100% rename from app/src/main/res/layout/layout_about_header.xml rename to core/app/src/main/res/layout/layout_about_header.xml diff --git a/app/src/main/res/layout/layout_about_list_section.xml b/core/app/src/main/res/layout/layout_about_list_section.xml similarity index 100% rename from app/src/main/res/layout/layout_about_list_section.xml rename to core/app/src/main/res/layout/layout_about_list_section.xml diff --git a/app/src/main/res/layout/layout_build_variant_item.xml b/core/app/src/main/res/layout/layout_build_variant_item.xml similarity index 100% rename from app/src/main/res/layout/layout_build_variant_item.xml rename to core/app/src/main/res/layout/layout_build_variant_item.xml diff --git a/app/src/main/res/layout/layout_chip_error.xml b/core/app/src/main/res/layout/layout_chip_error.xml similarity index 100% rename from app/src/main/res/layout/layout_chip_error.xml rename to core/app/src/main/res/layout/layout_chip_error.xml diff --git a/app/src/main/res/layout/layout_chip_warning.xml b/core/app/src/main/res/layout/layout_chip_warning.xml similarity index 100% rename from app/src/main/res/layout/layout_chip_warning.xml rename to core/app/src/main/res/layout/layout_chip_warning.xml diff --git a/app/src/main/res/layout/layout_contributors_item.xml b/core/app/src/main/res/layout/layout_contributors_item.xml similarity index 100% rename from app/src/main/res/layout/layout_contributors_item.xml rename to core/app/src/main/res/layout/layout_contributors_item.xml diff --git a/app/src/main/res/layout/layout_contributors_list_section.xml b/core/app/src/main/res/layout/layout_contributors_list_section.xml similarity index 100% rename from app/src/main/res/layout/layout_contributors_list_section.xml rename to core/app/src/main/res/layout/layout_contributors_list_section.xml diff --git a/app/src/main/res/layout/layout_crash_report.xml b/core/app/src/main/res/layout/layout_crash_report.xml similarity index 100% rename from app/src/main/res/layout/layout_crash_report.xml rename to core/app/src/main/res/layout/layout_crash_report.xml diff --git a/app/src/main/res/layout/layout_create_file_java.xml b/core/app/src/main/res/layout/layout_create_file_java.xml similarity index 100% rename from app/src/main/res/layout/layout_create_file_java.xml rename to core/app/src/main/res/layout/layout_create_file_java.xml diff --git a/app/src/main/res/layout/layout_diagnostic_group.xml b/core/app/src/main/res/layout/layout_diagnostic_group.xml similarity index 100% rename from app/src/main/res/layout/layout_diagnostic_group.xml rename to core/app/src/main/res/layout/layout_diagnostic_group.xml diff --git a/app/src/main/res/layout/layout_diagnostic_info.xml b/core/app/src/main/res/layout/layout_diagnostic_info.xml similarity index 100% rename from app/src/main/res/layout/layout_diagnostic_info.xml rename to core/app/src/main/res/layout/layout_diagnostic_info.xml diff --git a/app/src/main/res/layout/layout_diagnostic_item.xml b/core/app/src/main/res/layout/layout_diagnostic_item.xml similarity index 100% rename from app/src/main/res/layout/layout_diagnostic_item.xml rename to core/app/src/main/res/layout/layout_diagnostic_item.xml diff --git a/app/src/main/res/layout/layout_editor_bottom_action.xml b/core/app/src/main/res/layout/layout_editor_bottom_action.xml similarity index 100% rename from app/src/main/res/layout/layout_editor_bottom_action.xml rename to core/app/src/main/res/layout/layout_editor_bottom_action.xml diff --git a/app/src/main/res/layout/layout_editor_bottom_sheet.xml b/core/app/src/main/res/layout/layout_editor_bottom_sheet.xml similarity index 100% rename from app/src/main/res/layout/layout_editor_bottom_sheet.xml rename to core/app/src/main/res/layout/layout_editor_bottom_sheet.xml diff --git a/app/src/main/res/layout/layout_editor_build_status.xml b/core/app/src/main/res/layout/layout_editor_build_status.xml similarity index 100% rename from app/src/main/res/layout/layout_editor_build_status.xml rename to core/app/src/main/res/layout/layout_editor_build_status.xml diff --git a/app/src/main/res/layout/layout_editor_file_tree.xml b/core/app/src/main/res/layout/layout_editor_file_tree.xml similarity index 100% rename from app/src/main/res/layout/layout_editor_file_tree.xml rename to core/app/src/main/res/layout/layout_editor_file_tree.xml diff --git a/app/src/main/res/layout/layout_editor_sidebar_header.xml b/core/app/src/main/res/layout/layout_editor_sidebar_header.xml similarity index 100% rename from app/src/main/res/layout/layout_editor_sidebar_header.xml rename to core/app/src/main/res/layout/layout_editor_sidebar_header.xml diff --git a/app/src/main/res/layout/layout_filetree_item.xml b/core/app/src/main/res/layout/layout_filetree_item.xml similarity index 100% rename from app/src/main/res/layout/layout_filetree_item.xml rename to core/app/src/main/res/layout/layout_filetree_item.xml diff --git a/app/src/main/res/layout/layout_main_action_item.xml b/core/app/src/main/res/layout/layout_main_action_item.xml similarity index 100% rename from app/src/main/res/layout/layout_main_action_item.xml rename to core/app/src/main/res/layout/layout_main_action_item.xml diff --git a/app/src/main/res/layout/layout_mem_usage.xml b/core/app/src/main/res/layout/layout_mem_usage.xml similarity index 100% rename from app/src/main/res/layout/layout_mem_usage.xml rename to core/app/src/main/res/layout/layout_mem_usage.xml diff --git a/app/src/main/res/layout/layout_onboarding_item.xml b/core/app/src/main/res/layout/layout_onboarding_item.xml similarity index 100% rename from app/src/main/res/layout/layout_onboarding_item.xml rename to core/app/src/main/res/layout/layout_onboarding_item.xml diff --git a/app/src/main/res/layout/layout_onboarding_multiaction.xml b/core/app/src/main/res/layout/layout_onboarding_multiaction.xml similarity index 100% rename from app/src/main/res/layout/layout_onboarding_multiaction.xml rename to core/app/src/main/res/layout/layout_onboarding_multiaction.xml diff --git a/app/src/main/res/layout/layout_onboarding_permission_item.xml b/core/app/src/main/res/layout/layout_onboarding_permission_item.xml similarity index 100% rename from app/src/main/res/layout/layout_onboarding_permission_item.xml rename to core/app/src/main/res/layout/layout_onboarding_permission_item.xml diff --git a/app/src/main/res/layout/layout_onboarding_statistics.xml b/core/app/src/main/res/layout/layout_onboarding_statistics.xml similarity index 100% rename from app/src/main/res/layout/layout_onboarding_statistics.xml rename to core/app/src/main/res/layout/layout_onboarding_statistics.xml diff --git a/app/src/main/res/layout/layout_onboardng_setup_config.xml b/core/app/src/main/res/layout/layout_onboardng_setup_config.xml similarity index 100% rename from app/src/main/res/layout/layout_onboardng_setup_config.xml rename to core/app/src/main/res/layout/layout_onboardng_setup_config.xml diff --git a/app/src/main/res/layout/layout_optionssheet_item.xml b/core/app/src/main/res/layout/layout_optionssheet_item.xml similarity index 100% rename from app/src/main/res/layout/layout_optionssheet_item.xml rename to core/app/src/main/res/layout/layout_optionssheet_item.xml diff --git a/app/src/main/res/layout/layout_progress_sheet.xml b/core/app/src/main/res/layout/layout_progress_sheet.xml similarity index 100% rename from app/src/main/res/layout/layout_progress_sheet.xml rename to core/app/src/main/res/layout/layout_progress_sheet.xml diff --git a/app/src/main/res/layout/layout_project_not_initialized.xml b/core/app/src/main/res/layout/layout_project_not_initialized.xml similarity index 100% rename from app/src/main/res/layout/layout_project_not_initialized.xml rename to core/app/src/main/res/layout/layout_project_not_initialized.xml diff --git a/app/src/main/res/layout/layout_run_task.xml b/core/app/src/main/res/layout/layout_run_task.xml similarity index 100% rename from app/src/main/res/layout/layout_run_task.xml rename to core/app/src/main/res/layout/layout_run_task.xml diff --git a/app/src/main/res/layout/layout_run_task_dialog.xml b/core/app/src/main/res/layout/layout_run_task_dialog.xml similarity index 100% rename from app/src/main/res/layout/layout_run_task_dialog.xml rename to core/app/src/main/res/layout/layout_run_task_dialog.xml diff --git a/app/src/main/res/layout/layout_run_task_item.xml b/core/app/src/main/res/layout/layout_run_task_item.xml similarity index 100% rename from app/src/main/res/layout/layout_run_task_item.xml rename to core/app/src/main/res/layout/layout_run_task_item.xml diff --git a/app/src/main/res/layout/layout_run_tasks_confirmation.xml b/core/app/src/main/res/layout/layout_run_tasks_confirmation.xml similarity index 100% rename from app/src/main/res/layout/layout_run_tasks_confirmation.xml rename to core/app/src/main/res/layout/layout_run_tasks_confirmation.xml diff --git a/app/src/main/res/layout/layout_search_project.xml b/core/app/src/main/res/layout/layout_search_project.xml similarity index 100% rename from app/src/main/res/layout/layout_search_project.xml rename to core/app/src/main/res/layout/layout_search_project.xml diff --git a/app/src/main/res/layout/layout_search_result_group.xml b/core/app/src/main/res/layout/layout_search_result_group.xml similarity index 100% rename from app/src/main/res/layout/layout_search_result_group.xml rename to core/app/src/main/res/layout/layout_search_result_group.xml diff --git a/app/src/main/res/layout/layout_search_result_item.xml b/core/app/src/main/res/layout/layout_search_result_item.xml similarity index 100% rename from app/src/main/res/layout/layout_search_result_item.xml rename to core/app/src/main/res/layout/layout_search_result_item.xml diff --git a/app/src/main/res/layout/layout_symbol_item.xml b/core/app/src/main/res/layout/layout_symbol_item.xml similarity index 100% rename from app/src/main/res/layout/layout_symbol_item.xml rename to core/app/src/main/res/layout/layout_symbol_item.xml diff --git a/app/src/main/res/layout/layout_template_list_item.xml b/core/app/src/main/res/layout/layout_template_list_item.xml similarity index 100% rename from app/src/main/res/layout/layout_template_list_item.xml rename to core/app/src/main/res/layout/layout_template_list_item.xml diff --git a/app/src/main/res/layout/layout_template_widgetlist_item.xml b/core/app/src/main/res/layout/layout_template_widgetlist_item.xml similarity index 100% rename from app/src/main/res/layout/layout_template_widgetlist_item.xml rename to core/app/src/main/res/layout/layout_template_widgetlist_item.xml diff --git a/app/src/main/res/layout/layout_text_size_slider.xml b/core/app/src/main/res/layout/layout_text_size_slider.xml similarity index 100% rename from app/src/main/res/layout/layout_text_size_slider.xml rename to core/app/src/main/res/layout/layout_text_size_slider.xml diff --git a/app/src/main/res/resources.properties b/core/app/src/main/res/resources.properties similarity index 100% rename from app/src/main/res/resources.properties rename to core/app/src/main/res/resources.properties diff --git a/app/src/main/res/values/bools.xml b/core/app/src/main/res/values/bools.xml similarity index 100% rename from app/src/main/res/values/bools.xml rename to core/app/src/main/res/values/bools.xml diff --git a/app/src/main/res/values/dimens.xml b/core/app/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to core/app/src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/strings.xml b/core/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to core/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/core/app/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to core/app/src/main/res/values/styles.xml diff --git a/app/src/main/res/xml/ide_file_provider_paths.xml b/core/app/src/main/res/xml/ide_file_provider_paths.xml similarity index 100% rename from app/src/main/res/xml/ide_file_provider_paths.xml rename to core/app/src/main/res/xml/ide_file_provider_paths.xml diff --git a/app/src/main/res/xml/ide_prefs.xml b/core/app/src/main/res/xml/ide_prefs.xml similarity index 100% rename from app/src/main/res/xml/ide_prefs.xml rename to core/app/src/main/res/xml/ide_prefs.xml diff --git a/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt b/core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt similarity index 100% rename from app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt rename to core/app/src/test/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProviderImplTest.kt diff --git a/app/src/test/java/com/itsaky/androidide/utils/JdkUtilsTest.kt b/core/app/src/test/java/com/itsaky/androidide/utils/JdkUtilsTest.kt similarity index 100% rename from app/src/test/java/com/itsaky/androidide/utils/JdkUtilsTest.kt rename to core/app/src/test/java/com/itsaky/androidide/utils/JdkUtilsTest.kt diff --git a/app/src/test/java/com/itsaky/androidide/utils/ShiftedArrayTest.kt b/core/app/src/test/java/com/itsaky/androidide/utils/ShiftedArrayTest.kt similarity index 100% rename from app/src/test/java/com/itsaky/androidide/utils/ShiftedArrayTest.kt rename to core/app/src/test/java/com/itsaky/androidide/utils/ShiftedArrayTest.kt diff --git a/common/.gitignore b/core/common/.gitignore similarity index 100% rename from common/.gitignore rename to core/common/.gitignore diff --git a/common/build.gradle.kts b/core/common/build.gradle.kts similarity index 78% rename from common/build.gradle.kts rename to core/common/build.gradle.kts index 46a2bfc45..442e2a364 100755 --- a/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -22,6 +22,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.common" } @@ -41,17 +45,15 @@ dependencies { api(libs.androidx.core.ktx) api(libs.common.kotlin) - - api(projects.buildInfo) - api(projects.eventbusAndroid) - api(projects.eventbusEvents) - api(projects.lexers) - api(projects.resources) - - api(projects.shared) - api(projects.logger) - api(projects.resources) - api(projects.subprojects.flashbar) + + api(projects.core.resources) + api(projects.editor.lexers) + api(projects.event.eventbusAndroid) + api(projects.event.eventbusEvents) + api(projects.logging.logger) + api(projects.utilities.buildInfo) + api(projects.utilities.flashbar) + api(projects.utilities.shared) testImplementation(libs.tests.junit) testImplementation(libs.tests.google.truth) diff --git a/common/proguard-rules.pro b/core/common/proguard-rules.pro similarity index 100% rename from common/proguard-rules.pro rename to core/common/proguard-rules.pro diff --git a/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml similarity index 100% rename from common/src/main/AndroidManifest.xml rename to core/common/src/main/AndroidManifest.xml diff --git a/common/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java b/core/common/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java rename to core/common/src/main/java/com/itsaky/androidide/adapters/IconTextAdapter.java diff --git a/common/src/main/java/com/itsaky/androidide/adapters/IconTitleDescriptionAdapter.kt b/core/common/src/main/java/com/itsaky/androidide/adapters/IconTitleDescriptionAdapter.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/adapters/IconTitleDescriptionAdapter.kt rename to core/common/src/main/java/com/itsaky/androidide/adapters/IconTitleDescriptionAdapter.kt diff --git a/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java b/core/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java rename to core/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTextAdapter.java diff --git a/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTitleDescriptionAdapter.kt b/core/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTitleDescriptionAdapter.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTitleDescriptionAdapter.kt rename to core/common/src/main/java/com/itsaky/androidide/adapters/SimpleIconTitleDescriptionAdapter.kt diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java b/core/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/app/BaseApplication.java rename to core/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt b/core/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt rename to core/common/src/main/java/com/itsaky/androidide/app/BaseIDEActivity.kt diff --git a/common/src/main/java/com/itsaky/androidide/app/configuration/CpuArch.kt b/core/common/src/main/java/com/itsaky/androidide/app/configuration/CpuArch.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/app/configuration/CpuArch.kt rename to core/common/src/main/java/com/itsaky/androidide/app/configuration/CpuArch.kt diff --git a/common/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProvider.kt b/core/common/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProvider.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProvider.kt rename to core/common/src/main/java/com/itsaky/androidide/app/configuration/IDEBuildConfigProvider.kt diff --git a/common/src/main/java/com/itsaky/androidide/app/configuration/IJdkDistributionProvider.kt b/core/common/src/main/java/com/itsaky/androidide/app/configuration/IJdkDistributionProvider.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/app/configuration/IJdkDistributionProvider.kt rename to core/common/src/main/java/com/itsaky/androidide/app/configuration/IJdkDistributionProvider.kt diff --git a/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java b/core/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java rename to core/common/src/main/java/com/itsaky/androidide/colorpicker/ColorPickerView.java diff --git a/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt b/core/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt rename to core/common/src/main/java/com/itsaky/androidide/fragments/BaseFragment.kt diff --git a/common/src/main/java/com/itsaky/androidide/fragments/FragmentWithBinding.kt b/core/common/src/main/java/com/itsaky/androidide/fragments/FragmentWithBinding.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/fragments/FragmentWithBinding.kt rename to core/common/src/main/java/com/itsaky/androidide/fragments/FragmentWithBinding.kt diff --git a/common/src/main/java/com/itsaky/androidide/interfaces/Filter.java b/core/common/src/main/java/com/itsaky/androidide/interfaces/Filter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/interfaces/Filter.java rename to core/common/src/main/java/com/itsaky/androidide/interfaces/Filter.java diff --git a/common/src/main/java/com/itsaky/androidide/interfaces/ProjectWriterCallback.java b/core/common/src/main/java/com/itsaky/androidide/interfaces/ProjectWriterCallback.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/interfaces/ProjectWriterCallback.java rename to core/common/src/main/java/com/itsaky/androidide/interfaces/ProjectWriterCallback.java diff --git a/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java b/core/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java rename to core/common/src/main/java/com/itsaky/androidide/managers/PreferenceManager.java diff --git a/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java b/core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java rename to core/common/src/main/java/com/itsaky/androidide/managers/ToolsManager.java diff --git a/common/src/main/java/com/itsaky/androidide/models/Constants.java b/core/common/src/main/java/com/itsaky/androidide/models/Constants.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/Constants.java rename to core/common/src/main/java/com/itsaky/androidide/models/Constants.java diff --git a/common/src/main/java/com/itsaky/androidide/models/IconTextListItem.java b/core/common/src/main/java/com/itsaky/androidide/models/IconTextListItem.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/IconTextListItem.java rename to core/common/src/main/java/com/itsaky/androidide/models/IconTextListItem.java diff --git a/common/src/main/java/com/itsaky/androidide/models/IconTitleDescriptionItem.kt b/core/common/src/main/java/com/itsaky/androidide/models/IconTitleDescriptionItem.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/IconTitleDescriptionItem.kt rename to core/common/src/main/java/com/itsaky/androidide/models/IconTitleDescriptionItem.kt diff --git a/common/src/main/java/com/itsaky/androidide/models/JdkDistribution.kt b/core/common/src/main/java/com/itsaky/androidide/models/JdkDistribution.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/JdkDistribution.kt rename to core/common/src/main/java/com/itsaky/androidide/models/JdkDistribution.kt diff --git a/common/src/main/java/com/itsaky/androidide/models/SaveResult.java b/core/common/src/main/java/com/itsaky/androidide/models/SaveResult.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/SaveResult.java rename to core/common/src/main/java/com/itsaky/androidide/models/SaveResult.java diff --git a/common/src/main/java/com/itsaky/androidide/models/SheetOption.java b/core/common/src/main/java/com/itsaky/androidide/models/SheetOption.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/SheetOption.java rename to core/common/src/main/java/com/itsaky/androidide/models/SheetOption.java diff --git a/common/src/main/java/com/itsaky/androidide/models/SimpleIconTitleDescriptionItem.kt b/core/common/src/main/java/com/itsaky/androidide/models/SimpleIconTitleDescriptionItem.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/models/SimpleIconTitleDescriptionItem.kt rename to core/common/src/main/java/com/itsaky/androidide/models/SimpleIconTitleDescriptionItem.kt diff --git a/common/src/main/java/com/itsaky/androidide/shell/IProcessBuilder.kt b/core/common/src/main/java/com/itsaky/androidide/shell/IProcessBuilder.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/shell/IProcessBuilder.kt rename to core/common/src/main/java/com/itsaky/androidide/shell/IProcessBuilder.kt diff --git a/common/src/main/java/com/itsaky/androidide/shell/ProcessBuilderImpl.kt b/core/common/src/main/java/com/itsaky/androidide/shell/ProcessBuilderImpl.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/shell/ProcessBuilderImpl.kt rename to core/common/src/main/java/com/itsaky/androidide/shell/ProcessBuilderImpl.kt diff --git a/common/src/main/java/com/itsaky/androidide/shell/shellUtils.kt b/core/common/src/main/java/com/itsaky/androidide/shell/shellUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/shell/shellUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/shell/shellUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/DynamicColorScheme.kt b/core/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/DynamicColorScheme.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/syntax/colorschemes/DynamicColorScheme.kt rename to core/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/DynamicColorScheme.kt diff --git a/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java b/core/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java rename to core/common/src/main/java/com/itsaky/androidide/syntax/colorschemes/SchemeAndroidIDE.java diff --git a/common/src/main/java/com/itsaky/androidide/syntax/highlighters/Highlighter.java b/core/common/src/main/java/com/itsaky/androidide/syntax/highlighters/Highlighter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/syntax/highlighters/Highlighter.java rename to core/common/src/main/java/com/itsaky/androidide/syntax/highlighters/Highlighter.java diff --git a/common/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java b/core/common/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java rename to core/common/src/main/java/com/itsaky/androidide/syntax/highlighters/JavaHighlighter.java diff --git a/common/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.kt b/core/common/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.kt rename to core/common/src/main/java/com/itsaky/androidide/tasks/TaskExecutor.kt diff --git a/common/src/main/java/com/itsaky/androidide/tasks/coroutineUtils.kt b/core/common/src/main/java/com/itsaky/androidide/tasks/coroutineUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/tasks/coroutineUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/tasks/coroutineUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/BottomInsetHeightDistributor.kt b/core/common/src/main/java/com/itsaky/androidide/ui/BottomInsetHeightDistributor.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/BottomInsetHeightDistributor.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/BottomInsetHeightDistributor.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt b/core/common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/ContentTranslatingDrawerLayout.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/ExtendedMenuToolbar.kt b/core/common/src/main/java/com/itsaky/androidide/ui/ExtendedMenuToolbar.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/ExtendedMenuToolbar.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/ExtendedMenuToolbar.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt b/core/common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/InterceptableDrawerLayout.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/themes/IDETheme.kt b/core/common/src/main/java/com/itsaky/androidide/ui/themes/IDETheme.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/themes/IDETheme.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/themes/IDETheme.kt diff --git a/common/src/main/java/com/itsaky/androidide/ui/themes/IThemeManager.kt b/core/common/src/main/java/com/itsaky/androidide/ui/themes/IThemeManager.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/ui/themes/IThemeManager.kt rename to core/common/src/main/java/com/itsaky/androidide/ui/themes/IThemeManager.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/AndroidUtils.java b/core/common/src/main/java/com/itsaky/androidide/utils/AndroidUtils.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/AndroidUtils.java rename to core/common/src/main/java/com/itsaky/androidide/utils/AndroidUtils.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/ApkInstaller.kt b/core/common/src/main/java/com/itsaky/androidide/utils/ApkInstaller.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/ApkInstaller.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/ApkInstaller.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/CharSequenceInputStream.java b/core/common/src/main/java/com/itsaky/androidide/utils/CharSequenceInputStream.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/CharSequenceInputStream.java rename to core/common/src/main/java/com/itsaky/androidide/utils/CharSequenceInputStream.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java b/core/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java rename to core/common/src/main/java/com/itsaky/androidide/utils/CharSequenceReader.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/ColorUtil.kt b/core/common/src/main/java/com/itsaky/androidide/utils/ColorUtil.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/ColorUtil.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/ColorUtil.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/DialogUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/DialogUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/DialogUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/DialogUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/EdgeToEdgeUtils.java b/core/common/src/main/java/com/itsaky/androidide/utils/EdgeToEdgeUtils.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/EdgeToEdgeUtils.java rename to core/common/src/main/java/com/itsaky/androidide/utils/EdgeToEdgeUtils.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/Environment.java b/core/common/src/main/java/com/itsaky/androidide/utils/Environment.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/Environment.java rename to core/common/src/main/java/com/itsaky/androidide/utils/Environment.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java b/core/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/FileUtil.java rename to core/common/src/main/java/com/itsaky/androidide/utils/FileUtil.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/FlashbarActivityUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/FlashbarActivityUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/FlashbarActivityUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/FlashbarActivityUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/FlashbarUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/FlashbarUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/FlashbarUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/FlashbarUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/InsetUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/InsetUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/InsetUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/InsetUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/IntProperty.java b/core/common/src/main/java/com/itsaky/androidide/utils/IntProperty.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/IntProperty.java rename to core/common/src/main/java/com/itsaky/androidide/utils/IntProperty.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/JavaCharacter.java b/core/common/src/main/java/com/itsaky/androidide/utils/JavaCharacter.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/JavaCharacter.java rename to core/common/src/main/java/com/itsaky/androidide/utils/JavaCharacter.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/KeyboardUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/KeyboardUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/KeyboardUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/KeyboardUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/LSPUtils.java b/core/common/src/main/java/com/itsaky/androidide/utils/LSPUtils.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/LSPUtils.java rename to core/common/src/main/java/com/itsaky/androidide/utils/LSPUtils.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/ManufacturerUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/ManufacturerUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/ManufacturerUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/ManufacturerUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/NavigationBar.kt b/core/common/src/main/java/com/itsaky/androidide/utils/NavigationBar.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/NavigationBar.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/NavigationBar.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/ResourceUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/ResourceUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/ResourceUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/ResourceUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/SingleSessionCallback.kt b/core/common/src/main/java/com/itsaky/androidide/utils/SingleSessionCallback.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/SingleSessionCallback.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/SingleSessionCallback.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/SingleTextWatcher.java b/core/common/src/main/java/com/itsaky/androidide/utils/SingleTextWatcher.java similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/SingleTextWatcher.java rename to core/common/src/main/java/com/itsaky/androidide/utils/SingleTextWatcher.java diff --git a/common/src/main/java/com/itsaky/androidide/utils/SparseArrayUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/SparseArrayUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/SparseArrayUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/SparseArrayUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/TypefaceUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/WindowInsetExtensions.kt b/core/common/src/main/java/com/itsaky/androidide/utils/WindowInsetExtensions.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/WindowInsetExtensions.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/WindowInsetExtensions.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/WindowUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/WindowUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/WindowUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/WindowUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/buildVersionExt.kt b/core/common/src/main/java/com/itsaky/androidide/utils/buildVersionExt.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/buildVersionExt.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/buildVersionExt.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/connectionUtilExt.kt b/core/common/src/main/java/com/itsaky/androidide/utils/connectionUtilExt.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/connectionUtilExt.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/connectionUtilExt.kt diff --git a/common/src/main/java/com/itsaky/androidide/utils/ioUtils.kt b/core/common/src/main/java/com/itsaky/androidide/utils/ioUtils.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/utils/ioUtils.kt rename to core/common/src/main/java/com/itsaky/androidide/utils/ioUtils.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/ActivityCompatHelper.kt b/core/common/src/main/java/com/itsaky/androidide/window/ActivityCompatHelper.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/ActivityCompatHelper.kt rename to core/common/src/main/java/com/itsaky/androidide/window/ActivityCompatHelper.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/Bounds.kt b/core/common/src/main/java/com/itsaky/androidide/window/Bounds.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/Bounds.kt rename to core/common/src/main/java/com/itsaky/androidide/window/Bounds.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/DisplayCompatHelper.kt b/core/common/src/main/java/com/itsaky/androidide/window/DisplayCompatHelper.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/DisplayCompatHelper.kt rename to core/common/src/main/java/com/itsaky/androidide/window/DisplayCompatHelper.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/WindowManager.kt b/core/common/src/main/java/com/itsaky/androidide/window/WindowManager.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/WindowManager.kt rename to core/common/src/main/java/com/itsaky/androidide/window/WindowManager.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/WindowMetrics.kt b/core/common/src/main/java/com/itsaky/androidide/window/WindowMetrics.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/WindowMetrics.kt rename to core/common/src/main/java/com/itsaky/androidide/window/WindowMetrics.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculator.kt b/core/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculator.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculator.kt rename to core/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculator.kt diff --git a/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculatorCompat.kt b/core/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculatorCompat.kt similarity index 100% rename from common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculatorCompat.kt rename to core/common/src/main/java/com/itsaky/androidide/window/WindowMetricsCalculatorCompat.kt diff --git a/common/src/main/res/layout/layout_color_picker.xml b/core/common/src/main/res/layout/layout_color_picker.xml similarity index 100% rename from common/src/main/res/layout/layout_color_picker.xml rename to core/common/src/main/res/layout/layout_color_picker.xml diff --git a/common/src/main/res/layout/layout_dialog_progress.xml b/core/common/src/main/res/layout/layout_dialog_progress.xml similarity index 100% rename from common/src/main/res/layout/layout_dialog_progress.xml rename to core/common/src/main/res/layout/layout_dialog_progress.xml diff --git a/common/src/main/res/layout/layout_divider_horizontal.xml b/core/common/src/main/res/layout/layout_divider_horizontal.xml similarity index 100% rename from common/src/main/res/layout/layout_divider_horizontal.xml rename to core/common/src/main/res/layout/layout_divider_horizontal.xml diff --git a/common/src/main/res/layout/layout_icon_title_description.xml b/core/common/src/main/res/layout/layout_icon_title_description.xml similarity index 100% rename from common/src/main/res/layout/layout_icon_title_description.xml rename to core/common/src/main/res/layout/layout_icon_title_description.xml diff --git a/common/src/main/res/layout/layout_nav_header.xml b/core/common/src/main/res/layout/layout_nav_header.xml similarity index 100% rename from common/src/main/res/layout/layout_nav_header.xml rename to core/common/src/main/res/layout/layout_nav_header.xml diff --git a/common/src/main/res/layout/layout_simple_icon_text.xml b/core/common/src/main/res/layout/layout_simple_icon_text.xml similarity index 100% rename from common/src/main/res/layout/layout_simple_icon_text.xml rename to core/common/src/main/res/layout/layout_simple_icon_text.xml diff --git a/common/src/main/res/layout/layout_title_subtitle.xml b/core/common/src/main/res/layout/layout_title_subtitle.xml similarity index 100% rename from common/src/main/res/layout/layout_title_subtitle.xml rename to core/common/src/main/res/layout/layout_title_subtitle.xml diff --git a/build-info/.gitignore b/core/database/.gitignore similarity index 100% rename from build-info/.gitignore rename to core/database/.gitignore diff --git a/subprojects/database/build.gradle.kts b/core/database/build.gradle.kts similarity index 85% rename from subprojects/database/build.gradle.kts rename to core/database/build.gradle.kts index 4d89bdc3e..a3f7f010d 100644 --- a/subprojects/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -24,6 +24,10 @@ plugins { id("realm-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.database" } @@ -32,7 +36,7 @@ dependencies { kapt(libs.google.auto.service) implementation(libs.google.auto.service.annotations) - implementation(projects.logger) - implementation(projects.common) - implementation(projects.shared) + implementation(projects.core.common) + implementation(projects.logging.logger) + implementation(projects.utilities.shared) } \ No newline at end of file diff --git a/editor-api/consumer-rules.pro b/core/database/consumer-rules.pro similarity index 100% rename from editor-api/consumer-rules.pro rename to core/database/consumer-rules.pro diff --git a/editor-api/proguard-rules.pro b/core/database/proguard-rules.pro similarity index 100% rename from editor-api/proguard-rules.pro rename to core/database/proguard-rules.pro diff --git a/subprojects/database/src/main/java/com/itsaky/androidide/db/IRealmProvider.kt b/core/database/src/main/java/com/itsaky/androidide/db/IRealmProvider.kt similarity index 100% rename from subprojects/database/src/main/java/com/itsaky/androidide/db/IRealmProvider.kt rename to core/database/src/main/java/com/itsaky/androidide/db/IRealmProvider.kt diff --git a/subprojects/database/src/main/java/com/itsaky/androidide/db/internal/DatabaseEntity.kt b/core/database/src/main/java/com/itsaky/androidide/db/internal/DatabaseEntity.kt similarity index 100% rename from subprojects/database/src/main/java/com/itsaky/androidide/db/internal/DatabaseEntity.kt rename to core/database/src/main/java/com/itsaky/androidide/db/internal/DatabaseEntity.kt diff --git a/subprojects/database/src/main/java/com/itsaky/androidide/db/internal/InternalDBRealmModule.kt b/core/database/src/main/java/com/itsaky/androidide/db/internal/InternalDBRealmModule.kt similarity index 100% rename from subprojects/database/src/main/java/com/itsaky/androidide/db/internal/InternalDBRealmModule.kt rename to core/database/src/main/java/com/itsaky/androidide/db/internal/InternalDBRealmModule.kt diff --git a/subprojects/database/src/main/java/com/itsaky/androidide/db/internal/RealmProviderImpl.kt b/core/database/src/main/java/com/itsaky/androidide/db/internal/RealmProviderImpl.kt similarity index 100% rename from subprojects/database/src/main/java/com/itsaky/androidide/db/internal/RealmProviderImpl.kt rename to core/database/src/main/java/com/itsaky/androidide/db/internal/RealmProviderImpl.kt diff --git a/subprojects/database/src/main/java/com/itsaky/androidide/db/utils/realmDictionaryExts.kt b/core/database/src/main/java/com/itsaky/androidide/db/utils/realmDictionaryExts.kt similarity index 100% rename from subprojects/database/src/main/java/com/itsaky/androidide/db/utils/realmDictionaryExts.kt rename to core/database/src/main/java/com/itsaky/androidide/db/utils/realmDictionaryExts.kt diff --git a/editor-api/.gitignore b/core/indexing/.gitignore similarity index 100% rename from editor-api/.gitignore rename to core/indexing/.gitignore diff --git a/subprojects/indexing/build.gradle.kts b/core/indexing/build.gradle.kts similarity index 86% rename from subprojects/indexing/build.gradle.kts rename to core/indexing/build.gradle.kts index 519172d8f..705f6d522 100644 --- a/subprojects/indexing/build.gradle.kts +++ b/core/indexing/build.gradle.kts @@ -24,6 +24,10 @@ plugins { id("realm-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.indexing" } @@ -32,8 +36,8 @@ dependencies { kapt(libs.google.auto.service) implementation(libs.google.auto.service.annotations) - api(projects.logger) - api(projects.common) - api(projects.shared) - api(projects.subprojects.database) + api(projects.core.common) + api(projects.core.database) + api(projects.logging.logger) + api(projects.utilities.shared) } \ No newline at end of file diff --git a/subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndex.kt b/core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndex.kt similarity index 100% rename from subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndex.kt rename to core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndex.kt diff --git a/subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexable.kt b/core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexable.kt similarity index 100% rename from subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexable.kt rename to core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexable.kt diff --git a/subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexer.kt b/core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexer.kt similarity index 100% rename from subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexer.kt rename to core/indexing/src/main/java/com/itsaky/androidide/indexing/IIndexer.kt diff --git a/subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IndexProvider.kt b/core/indexing/src/main/java/com/itsaky/androidide/indexing/IndexProvider.kt similarity index 100% rename from subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/IndexProvider.kt rename to core/indexing/src/main/java/com/itsaky/androidide/indexing/IndexProvider.kt diff --git a/subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/internal/DefaultIndex.kt b/core/indexing/src/main/java/com/itsaky/androidide/indexing/internal/DefaultIndex.kt similarity index 100% rename from subprojects/indexing/src/main/java/com/itsaky/androidide/indexing/internal/DefaultIndex.kt rename to core/indexing/src/main/java/com/itsaky/androidide/indexing/internal/DefaultIndex.kt diff --git a/editor-treesitter/.gitignore b/core/lsp-api/.gitignore similarity index 100% rename from editor-treesitter/.gitignore rename to core/lsp-api/.gitignore diff --git a/lsp/api/build.gradle.kts b/core/lsp-api/build.gradle.kts similarity index 75% rename from lsp/api/build.gradle.kts rename to core/lsp-api/build.gradle.kts index 352be9866..33222ce16 100644 --- a/lsp/api/build.gradle.kts +++ b/core/lsp-api/build.gradle.kts @@ -23,6 +23,10 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.lsp.api" } @@ -35,12 +39,12 @@ kapt { dependencies { - kapt(projects.annotationProcessors) + kapt(projects.annotation.processors) implementation(libs.composite.fuzzysearch) implementation(libs.common.editor) - implementation(projects.eventbusEvents) + implementation(projects.event.eventbusEvents) implementation(libs.androidx.appcompat) implementation(libs.androidx.core.ktx) @@ -48,12 +52,12 @@ dependencies { implementation(libs.common.utilcode) implementation(libs.google.material) - api(projects.subprojects.projects) - api(projects.subprojects.xmlUtils) - api(projects.lookup) - api(projects.lsp.models) - api(projects.preferences) - - compileOnly(projects.actions) - compileOnly(projects.common) + api(projects.core.projects) + api(projects.core.lspModels) + api(projects.utilities.lookup) + api(projects.utilities.preferences) + api(projects.xml.utils) + + compileOnly(projects.core.actions) + compileOnly(projects.core.common) } \ No newline at end of file diff --git a/editor-treesitter/consumer-rules.pro b/core/lsp-api/consumer-rules.pro similarity index 100% rename from editor-treesitter/consumer-rules.pro rename to core/lsp-api/consumer-rules.pro diff --git a/editor-treesitter/proguard-rules.pro b/core/lsp-api/proguard-rules.pro similarity index 100% rename from editor-treesitter/proguard-rules.pro rename to core/lsp-api/proguard-rules.pro diff --git a/lsp/api/src/main/AndroidManifest.xml b/core/lsp-api/src/main/AndroidManifest.xml similarity index 100% rename from lsp/api/src/main/AndroidManifest.xml rename to core/lsp-api/src/main/AndroidManifest.xml diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/actions/IActionsMenuProvider.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/actions/IActionsMenuProvider.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/actions/IActionsMenuProvider.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/actions/IActionsMenuProvider.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/AbstractServiceProvider.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/AbstractServiceProvider.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/AbstractServiceProvider.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/AbstractServiceProvider.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ConfigurableServiceProvider.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ConfigurableServiceProvider.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ConfigurableServiceProvider.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ConfigurableServiceProvider.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/DefaultLanguageServerRegistry.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/DefaultLanguageServerRegistry.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/DefaultLanguageServerRegistry.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/DefaultLanguageServerRegistry.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ICompletionProvider.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ICompletionProvider.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ICompletionProvider.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ICompletionProvider.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageClient.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageClient.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageClient.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageClient.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServer.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServer.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServer.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServer.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServerRegistry.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServerRegistry.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServerRegistry.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/ILanguageServerRegistry.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/IServerSettings.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/IServerSettings.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/IServerSettings.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/IServerSettings.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/api/helpers.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/helpers.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/api/helpers.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/api/helpers.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/internal/model/CachedCompletion.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/internal/model/CachedCompletion.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/internal/model/CachedCompletion.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/internal/model/CachedCompletion.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/DefaultSnippet.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/DefaultSnippet.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/DefaultSnippet.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/DefaultSnippet.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippet.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippet.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippet.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippet.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippetScope.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippetScope.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippetScope.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/ISnippetScope.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetParser.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetParser.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetParser.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetParser.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DefaultServerSettings.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DefaultServerSettings.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DefaultServerSettings.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DefaultServerSettings.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DiagnosticUtil.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DiagnosticUtil.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DiagnosticUtil.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DiagnosticUtil.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DocumentationReferenceProvider.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DocumentationReferenceProvider.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/DocumentationReferenceProvider.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/DocumentationReferenceProvider.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/LSPEditorActions.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/LSPEditorActions.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/LSPEditorActions.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/LSPEditorActions.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/NoCompletionsProvider.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/NoCompletionsProvider.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/NoCompletionsProvider.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/NoCompletionsProvider.kt diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/PrefBasedServerSettings.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/PrefBasedServerSettings.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/PrefBasedServerSettings.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/PrefBasedServerSettings.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/StringUtils.java b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/StringUtils.java similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/StringUtils.java rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/StringUtils.java diff --git a/lsp/api/src/main/java/com/itsaky/androidide/lsp/util/commonCompletionUtils.kt b/core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/commonCompletionUtils.kt similarity index 100% rename from lsp/api/src/main/java/com/itsaky/androidide/lsp/util/commonCompletionUtils.kt rename to core/lsp-api/src/main/java/com/itsaky/androidide/lsp/util/commonCompletionUtils.kt diff --git a/editor/.gitignore b/core/lsp-models/.gitignore similarity index 100% rename from editor/.gitignore rename to core/lsp-models/.gitignore diff --git a/lsp/models/build.gradle.kts b/core/lsp-models/build.gradle.kts similarity index 84% rename from lsp/models/build.gradle.kts rename to core/lsp-models/build.gradle.kts index d51d779fb..b65ab9aae 100644 --- a/lsp/models/build.gradle.kts +++ b/core/lsp-models/build.gradle.kts @@ -5,6 +5,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.lsp.models" } @@ -12,7 +16,7 @@ android { dependencies { implementation(libs.composite.fuzzysearch) - implementation(projects.common) + implementation(projects.core.common) implementation(libs.common.editor) implementation(libs.androidx.appcompat) diff --git a/editor/consumer-rules.pro b/core/lsp-models/consumer-rules.pro similarity index 100% rename from editor/consumer-rules.pro rename to core/lsp-models/consumer-rules.pro diff --git a/gradle-plugin/src/test/resources/sample-project/app/proguard-rules.pro b/core/lsp-models/proguard-rules.pro old mode 100755 new mode 100644 similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/proguard-rules.pro rename to core/lsp-models/proguard-rules.pro diff --git a/lsp/models/src/main/AndroidManifest.xml b/core/lsp-models/src/main/AndroidManifest.xml similarity index 100% rename from lsp/models/src/main/AndroidManifest.xml rename to core/lsp-models/src/main/AndroidManifest.xml diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/CancellableRequestParams.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/CancellableRequestParams.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/CancellableRequestParams.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/CancellableRequestParams.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/LspParams.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/LspParams.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/LspParams.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/LspParams.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/edits/DefaultEditHandler.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/edits/DefaultEditHandler.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/edits/DefaultEditHandler.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/edits/DefaultEditHandler.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/edits/IEditHandler.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/edits/IEditHandler.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/edits/IEditHandler.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/edits/IEditHandler.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CodeActions.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CodeActions.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CodeActions.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CodeActions.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CodeFormatting.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CodeFormatting.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CodeFormatting.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CodeFormatting.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CompletionData.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CompletionData.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CompletionData.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CompletionData.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CompletionItemComparator.java b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CompletionItemComparator.java similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/CompletionItemComparator.java rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/CompletionItemComparator.java diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Completions.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Completions.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Completions.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Completions.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Definitions.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Definitions.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Definitions.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Definitions.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Diagnostics.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Diagnostics.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Diagnostics.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Diagnostics.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Edits.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Edits.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Edits.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Edits.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/ExpandSelectionParams.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/ExpandSelectionParams.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/ExpandSelectionParams.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/ExpandSelectionParams.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/HighlightToken.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/HighlightToken.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/HighlightToken.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/HighlightToken.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Initialization.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Initialization.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Initialization.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Initialization.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/LSPFailure.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/LSPFailure.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/LSPFailure.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/LSPFailure.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Markups.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Markups.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Markups.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Markups.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/References.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/References.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/References.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/References.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Signatures.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Signatures.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Signatures.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/Signatures.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/models/TextDocument.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/TextDocument.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/models/TextDocument.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/models/TextDocument.kt diff --git a/lsp/models/src/main/java/com/itsaky/androidide/lsp/util/RewriteHelper.kt b/core/lsp-models/src/main/java/com/itsaky/androidide/lsp/util/RewriteHelper.kt similarity index 100% rename from lsp/models/src/main/java/com/itsaky/androidide/lsp/util/RewriteHelper.kt rename to core/lsp-models/src/main/java/com/itsaky/androidide/lsp/util/RewriteHelper.kt diff --git a/eventbus-android/.gitignore b/core/projects/.gitignore similarity index 100% rename from eventbus-android/.gitignore rename to core/projects/.gitignore diff --git a/subprojects/projects/build.gradle.kts b/core/projects/build.gradle.kts similarity index 54% rename from subprojects/projects/build.gradle.kts rename to core/projects/build.gradle.kts index a13190ed7..293ec9291 100644 --- a/subprojects/projects/build.gradle.kts +++ b/core/projects/build.gradle.kts @@ -7,6 +7,10 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.projects" } @@ -19,24 +23,24 @@ kapt { dependencies { - kapt(projects.annotationProcessors) + kapt(projects.annotation.processors) kapt(libs.google.auto.service) - api(projects.eventbus) - api(projects.eventbusEvents) - api(projects.subprojects.toolingApi) + api(projects.event.eventbus) + api(projects.event.eventbusEvents) + api(projects.tooling.api) - implementation(projects.common) - implementation(projects.logger) - implementation(projects.lookup) - implementation(projects.shared) - implementation(projects.subprojects.javacServices) - implementation(projects.subprojects.xmlUtils) + implementation(projects.core.common) + implementation(projects.java.javacServices) + implementation(projects.logging.logger) + implementation(projects.utilities.lookup) + implementation(projects.utilities.shared) + implementation(projects.xml.utils) implementation(libs.common.io) implementation(libs.common.kotlin.coroutines.android) implementation(libs.google.auto.service.annotations) implementation(libs.google.guava) - testImplementation(projects.subprojects.testingTooling) + testImplementation(projects.testing.gradleToolingTest) } \ No newline at end of file diff --git a/eventbus-android/consumer-rules.pro b/core/projects/consumer-rules.pro similarity index 100% rename from eventbus-android/consumer-rules.pro rename to core/projects/consumer-rules.pro diff --git a/gradle-plugin/src/test/resources/sample-project/nested/app/proguard-rules.pro b/core/projects/proguard-rules.pro old mode 100755 new mode 100644 similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/nested/app/proguard-rules.pro rename to core/projects/proguard-rules.pro diff --git a/editor/src/main/AndroidManifest.xml b/core/projects/src/main/AndroidManifest.xml similarity index 100% rename from editor/src/main/AndroidManifest.xml rename to core/projects/src/main/AndroidManifest.xml diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/CachingProject.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/CachingProject.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/CachingProject.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/CachingProject.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/FileManager.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/FileManager.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/FileManager.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/FileManager.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/IProjectManager.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/IProjectManager.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/IProjectManager.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/IProjectManager.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/ProjectManagerImpl.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/GradleProject.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/api/GradleProject.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/GradleProject.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/api/GradleProject.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/Project.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/api/Project.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/Project.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/api/Project.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/builder/BuildService.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/builder/BuildService.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/builder/BuildService.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/builder/BuildService.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/classpath/ClassInfo.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/IClasspathReader.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/classpath/IClasspathReader.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/IClasspathReader.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/classpath/IClasspathReader.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/classpath/JarFsClasspathReader.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReader.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveDocument.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveDocument.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveDocument.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveDocument.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveJavaDocument.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveJavaDocument.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveJavaDocument.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveJavaDocument.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/BootClasspathProvider.java b/core/projects/src/main/java/com/itsaky/androidide/projects/util/BootClasspathProvider.java similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/BootClasspathProvider.java rename to core/projects/src/main/java/com/itsaky/androidide/projects/util/BootClasspathProvider.java diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/util/ProjectTransformer.kt diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/StringSearch.java b/core/projects/src/main/java/com/itsaky/androidide/projects/util/StringSearch.java similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/StringSearch.java rename to core/projects/src/main/java/com/itsaky/androidide/projects/util/StringSearch.java diff --git a/subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/projects.kt b/core/projects/src/main/java/com/itsaky/androidide/projects/util/projects.kt similarity index 100% rename from subprojects/projects/src/main/java/com/itsaky/androidide/projects/util/projects.kt rename to core/projects/src/main/java/com/itsaky/androidide/projects/util/projects.kt diff --git a/subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt b/core/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt similarity index 100% rename from subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt rename to core/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt diff --git a/subprojects/projects/src/test/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReaderTest.kt b/core/projects/src/test/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReaderTest.kt similarity index 100% rename from subprojects/projects/src/test/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReaderTest.kt rename to core/projects/src/test/java/com/itsaky/androidide/projects/classpath/ZipFileClasspathReaderTest.kt diff --git a/subprojects/projects/src/test/java/com/itsaky/androidide/projects/util/ClassTrieTest.kt b/core/projects/src/test/java/com/itsaky/androidide/projects/util/ClassTrieTest.kt similarity index 100% rename from subprojects/projects/src/test/java/com/itsaky/androidide/projects/util/ClassTrieTest.kt rename to core/projects/src/test/java/com/itsaky/androidide/projects/util/ClassTrieTest.kt diff --git a/eventbus-events/.gitignore b/core/resources/.gitignore similarity index 100% rename from eventbus-events/.gitignore rename to core/resources/.gitignore diff --git a/resources/build.gradle.kts b/core/resources/build.gradle.kts similarity index 95% rename from resources/build.gradle.kts rename to core/resources/build.gradle.kts index 601ed3e11..12db8bd4a 100644 --- a/resources/build.gradle.kts +++ b/core/resources/build.gradle.kts @@ -21,6 +21,10 @@ plugins { id("com.android.library") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.resources" } diff --git a/idestats/consumer-rules.pro b/core/resources/consumer-rules.pro similarity index 100% rename from idestats/consumer-rules.pro rename to core/resources/consumer-rules.pro diff --git a/logsender-sample/proguard-rules.pro b/core/resources/proguard-rules.pro similarity index 100% rename from logsender-sample/proguard-rules.pro rename to core/resources/proguard-rules.pro diff --git a/resources/src/main/AndroidManifest.xml b/core/resources/src/main/AndroidManifest.xml similarity index 100% rename from resources/src/main/AndroidManifest.xml rename to core/resources/src/main/AndroidManifest.xml diff --git a/resources/src/main/java/com/itsaky/androidide/resources/localization/LocaleProvider.java b/core/resources/src/main/java/com/itsaky/androidide/resources/localization/LocaleProvider.java similarity index 100% rename from resources/src/main/java/com/itsaky/androidide/resources/localization/LocaleProvider.java rename to core/resources/src/main/java/com/itsaky/androidide/resources/localization/LocaleProvider.java diff --git a/resources/src/main/res/anim/popup_in.xml b/core/resources/src/main/res/anim/popup_in.xml similarity index 100% rename from resources/src/main/res/anim/popup_in.xml rename to core/resources/src/main/res/anim/popup_in.xml diff --git a/resources/src/main/res/anim/popup_out.xml b/core/resources/src/main/res/anim/popup_out.xml similarity index 100% rename from resources/src/main/res/anim/popup_out.xml rename to core/resources/src/main/res/anim/popup_out.xml diff --git a/resources/src/main/res/animator/dialog_in.xml b/core/resources/src/main/res/animator/dialog_in.xml similarity index 100% rename from resources/src/main/res/animator/dialog_in.xml rename to core/resources/src/main/res/animator/dialog_in.xml diff --git a/resources/src/main/res/animator/dialog_out.xml b/core/resources/src/main/res/animator/dialog_out.xml similarity index 100% rename from resources/src/main/res/animator/dialog_out.xml rename to core/resources/src/main/res/animator/dialog_out.xml diff --git a/resources/src/main/res/drawable-hdpi/ic_launcher_notification.png b/core/resources/src/main/res/drawable-hdpi/ic_launcher_notification.png similarity index 100% rename from resources/src/main/res/drawable-hdpi/ic_launcher_notification.png rename to core/resources/src/main/res/drawable-hdpi/ic_launcher_notification.png diff --git a/resources/src/main/res/drawable-mdpi/ic_launcher_notification.png b/core/resources/src/main/res/drawable-mdpi/ic_launcher_notification.png similarity index 100% rename from resources/src/main/res/drawable-mdpi/ic_launcher_notification.png rename to core/resources/src/main/res/drawable-mdpi/ic_launcher_notification.png diff --git a/resources/src/main/res/drawable-xhdpi/ic_launcher_notification.png b/core/resources/src/main/res/drawable-xhdpi/ic_launcher_notification.png similarity index 100% rename from resources/src/main/res/drawable-xhdpi/ic_launcher_notification.png rename to core/resources/src/main/res/drawable-xhdpi/ic_launcher_notification.png diff --git a/resources/src/main/res/drawable-xxhdpi/ic_launcher_notification.png b/core/resources/src/main/res/drawable-xxhdpi/ic_launcher_notification.png similarity index 100% rename from resources/src/main/res/drawable-xxhdpi/ic_launcher_notification.png rename to core/resources/src/main/res/drawable-xxhdpi/ic_launcher_notification.png diff --git a/resources/src/main/res/drawable-xxxhdpi/ic_launcher_notification.png b/core/resources/src/main/res/drawable-xxxhdpi/ic_launcher_notification.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/ic_launcher_notification.png rename to core/resources/src/main/res/drawable-xxxhdpi/ic_launcher_notification.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_basic_activity.png b/core/resources/src/main/res/drawable-xxxhdpi/template_basic_activity.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_basic_activity.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_basic_activity.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_drawer.png b/core/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_drawer.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_blank_activity_drawer.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_drawer.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_tabs.png b/core/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_tabs.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_blank_activity_tabs.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_blank_activity_tabs.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_bottom_navigation_activity.png b/core/resources/src/main/res/drawable-xxxhdpi/template_bottom_navigation_activity.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_bottom_navigation_activity.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_bottom_navigation_activity.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_compose_empty_activity.png b/core/resources/src/main/res/drawable-xxxhdpi/template_compose_empty_activity.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_compose_empty_activity.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_compose_empty_activity.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_empty_activity.png b/core/resources/src/main/res/drawable-xxxhdpi/template_empty_activity.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_empty_activity.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_empty_activity.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_empty_noandroidx.png b/core/resources/src/main/res/drawable-xxxhdpi/template_empty_noandroidx.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_empty_noandroidx.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_empty_noandroidx.png diff --git a/resources/src/main/res/drawable-xxxhdpi/template_no_activity.png b/core/resources/src/main/res/drawable-xxxhdpi/template_no_activity.png similarity index 100% rename from resources/src/main/res/drawable-xxxhdpi/template_no_activity.png rename to core/resources/src/main/res/drawable-xxxhdpi/template_no_activity.png diff --git a/resources/src/main/res/drawable/androidide_header.xml b/core/resources/src/main/res/drawable/androidide_header.xml similarity index 100% rename from resources/src/main/res/drawable/androidide_header.xml rename to core/resources/src/main/res/drawable/androidide_header.xml diff --git a/resources/src/main/res/drawable/androidide_header_compact.xml b/core/resources/src/main/res/drawable/androidide_header_compact.xml similarity index 100% rename from resources/src/main/res/drawable/androidide_header_compact.xml rename to core/resources/src/main/res/drawable/androidide_header_compact.xml diff --git a/resources/src/main/res/drawable/bg_designer_view.xml b/core/resources/src/main/res/drawable/bg_designer_view.xml similarity index 100% rename from resources/src/main/res/drawable/bg_designer_view.xml rename to core/resources/src/main/res/drawable/bg_designer_view.xml diff --git a/resources/src/main/res/drawable/bg_ripple.xml b/core/resources/src/main/res/drawable/bg_ripple.xml similarity index 100% rename from resources/src/main/res/drawable/bg_ripple.xml rename to core/resources/src/main/res/drawable/bg_ripple.xml diff --git a/resources/src/main/res/drawable/bg_ripple_disabled.xml b/core/resources/src/main/res/drawable/bg_ripple_disabled.xml similarity index 100% rename from resources/src/main/res/drawable/bg_ripple_disabled.xml rename to core/resources/src/main/res/drawable/bg_ripple_disabled.xml diff --git a/resources/src/main/res/drawable/bg_ripple_pressed.xml b/core/resources/src/main/res/drawable/bg_ripple_pressed.xml similarity index 100% rename from resources/src/main/res/drawable/bg_ripple_pressed.xml rename to core/resources/src/main/res/drawable/bg_ripple_pressed.xml diff --git a/resources/src/main/res/drawable/bg_widget_drag_placeholder.xml b/core/resources/src/main/res/drawable/bg_widget_drag_placeholder.xml similarity index 100% rename from resources/src/main/res/drawable/bg_widget_drag_placeholder.xml rename to core/resources/src/main/res/drawable/bg_widget_drag_placeholder.xml diff --git a/resources/src/main/res/drawable/ic_account.xml b/core/resources/src/main/res/drawable/ic_account.xml similarity index 100% rename from resources/src/main/res/drawable/ic_account.xml rename to core/resources/src/main/res/drawable/ic_account.xml diff --git a/resources/src/main/res/drawable/ic_add.xml b/core/resources/src/main/res/drawable/ic_add.xml similarity index 100% rename from resources/src/main/res/drawable/ic_add.xml rename to core/resources/src/main/res/drawable/ic_add.xml diff --git a/resources/src/main/res/drawable/ic_alert.xml b/core/resources/src/main/res/drawable/ic_alert.xml similarity index 100% rename from resources/src/main/res/drawable/ic_alert.xml rename to core/resources/src/main/res/drawable/ic_alert.xml diff --git a/resources/src/main/res/drawable/ic_android.xml b/core/resources/src/main/res/drawable/ic_android.xml similarity index 100% rename from resources/src/main/res/drawable/ic_android.xml rename to core/resources/src/main/res/drawable/ic_android.xml diff --git a/resources/src/main/res/drawable/ic_backspace.xml b/core/resources/src/main/res/drawable/ic_backspace.xml similarity index 100% rename from resources/src/main/res/drawable/ic_backspace.xml rename to core/resources/src/main/res/drawable/ic_backspace.xml diff --git a/resources/src/main/res/drawable/ic_bash_commands.xml b/core/resources/src/main/res/drawable/ic_bash_commands.xml similarity index 100% rename from resources/src/main/res/drawable/ic_bash_commands.xml rename to core/resources/src/main/res/drawable/ic_bash_commands.xml diff --git a/resources/src/main/res/drawable/ic_bell.xml b/core/resources/src/main/res/drawable/ic_bell.xml similarity index 100% rename from resources/src/main/res/drawable/ic_bell.xml rename to core/resources/src/main/res/drawable/ic_bell.xml diff --git a/resources/src/main/res/drawable/ic_bug.xml b/core/resources/src/main/res/drawable/ic_bug.xml similarity index 100% rename from resources/src/main/res/drawable/ic_bug.xml rename to core/resources/src/main/res/drawable/ic_bug.xml diff --git a/resources/src/main/res/drawable/ic_chevron_down.xml b/core/resources/src/main/res/drawable/ic_chevron_down.xml similarity index 100% rename from resources/src/main/res/drawable/ic_chevron_down.xml rename to core/resources/src/main/res/drawable/ic_chevron_down.xml diff --git a/resources/src/main/res/drawable/ic_chevron_right.xml b/core/resources/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from resources/src/main/res/drawable/ic_chevron_right.xml rename to core/resources/src/main/res/drawable/ic_chevron_right.xml diff --git a/resources/src/main/res/drawable/ic_close.xml b/core/resources/src/main/res/drawable/ic_close.xml similarity index 100% rename from resources/src/main/res/drawable/ic_close.xml rename to core/resources/src/main/res/drawable/ic_close.xml diff --git a/resources/src/main/res/drawable/ic_close_all.xml b/core/resources/src/main/res/drawable/ic_close_all.xml similarity index 100% rename from resources/src/main/res/drawable/ic_close_all.xml rename to core/resources/src/main/res/drawable/ic_close_all.xml diff --git a/resources/src/main/res/drawable/ic_close_others.xml b/core/resources/src/main/res/drawable/ic_close_others.xml similarity index 100% rename from resources/src/main/res/drawable/ic_close_others.xml rename to core/resources/src/main/res/drawable/ic_close_others.xml diff --git a/resources/src/main/res/drawable/ic_close_this.xml b/core/resources/src/main/res/drawable/ic_close_this.xml similarity index 100% rename from resources/src/main/res/drawable/ic_close_this.xml rename to core/resources/src/main/res/drawable/ic_close_this.xml diff --git a/resources/src/main/res/drawable/ic_code.xml b/core/resources/src/main/res/drawable/ic_code.xml similarity index 100% rename from resources/src/main/res/drawable/ic_code.xml rename to core/resources/src/main/res/drawable/ic_code.xml diff --git a/resources/src/main/res/drawable/ic_color_scheme.xml b/core/resources/src/main/res/drawable/ic_color_scheme.xml similarity index 100% rename from resources/src/main/res/drawable/ic_color_scheme.xml rename to core/resources/src/main/res/drawable/ic_color_scheme.xml diff --git a/resources/src/main/res/drawable/ic_compilation_error.xml b/core/resources/src/main/res/drawable/ic_compilation_error.xml similarity index 100% rename from resources/src/main/res/drawable/ic_compilation_error.xml rename to core/resources/src/main/res/drawable/ic_compilation_error.xml diff --git a/resources/src/main/res/drawable/ic_copy.xml b/core/resources/src/main/res/drawable/ic_copy.xml similarity index 100% rename from resources/src/main/res/drawable/ic_copy.xml rename to core/resources/src/main/res/drawable/ic_copy.xml diff --git a/resources/src/main/res/drawable/ic_custom_font.xml b/core/resources/src/main/res/drawable/ic_custom_font.xml similarity index 100% rename from resources/src/main/res/drawable/ic_custom_font.xml rename to core/resources/src/main/res/drawable/ic_custom_font.xml diff --git a/resources/src/main/res/drawable/ic_delete.xml b/core/resources/src/main/res/drawable/ic_delete.xml similarity index 100% rename from resources/src/main/res/drawable/ic_delete.xml rename to core/resources/src/main/res/drawable/ic_delete.xml diff --git a/resources/src/main/res/drawable/ic_docs.xml b/core/resources/src/main/res/drawable/ic_docs.xml similarity index 100% rename from resources/src/main/res/drawable/ic_docs.xml rename to core/resources/src/main/res/drawable/ic_docs.xml diff --git a/resources/src/main/res/drawable/ic_drawing.xml b/core/resources/src/main/res/drawable/ic_drawing.xml similarity index 100% rename from resources/src/main/res/drawable/ic_drawing.xml rename to core/resources/src/main/res/drawable/ic_drawing.xml diff --git a/resources/src/main/res/drawable/ic_email.xml b/core/resources/src/main/res/drawable/ic_email.xml similarity index 100% rename from resources/src/main/res/drawable/ic_email.xml rename to core/resources/src/main/res/drawable/ic_email.xml diff --git a/resources/src/main/res/drawable/ic_error.xml b/core/resources/src/main/res/drawable/ic_error.xml similarity index 100% rename from resources/src/main/res/drawable/ic_error.xml rename to core/resources/src/main/res/drawable/ic_error.xml diff --git a/resources/src/main/res/drawable/ic_expand_selection.xml b/core/resources/src/main/res/drawable/ic_expand_selection.xml similarity index 100% rename from resources/src/main/res/drawable/ic_expand_selection.xml rename to core/resources/src/main/res/drawable/ic_expand_selection.xml diff --git a/resources/src/main/res/drawable/ic_file_apk.xml b/core/resources/src/main/res/drawable/ic_file_apk.xml similarity index 100% rename from resources/src/main/res/drawable/ic_file_apk.xml rename to core/resources/src/main/res/drawable/ic_file_apk.xml diff --git a/resources/src/main/res/drawable/ic_file_image.xml b/core/resources/src/main/res/drawable/ic_file_image.xml similarity index 100% rename from resources/src/main/res/drawable/ic_file_image.xml rename to core/resources/src/main/res/drawable/ic_file_image.xml diff --git a/resources/src/main/res/drawable/ic_file_rename.xml b/core/resources/src/main/res/drawable/ic_file_rename.xml similarity index 100% rename from resources/src/main/res/drawable/ic_file_rename.xml rename to core/resources/src/main/res/drawable/ic_file_rename.xml diff --git a/resources/src/main/res/drawable/ic_file_txt.xml b/core/resources/src/main/res/drawable/ic_file_txt.xml similarity index 100% rename from resources/src/main/res/drawable/ic_file_txt.xml rename to core/resources/src/main/res/drawable/ic_file_txt.xml diff --git a/resources/src/main/res/drawable/ic_file_unknown.xml b/core/resources/src/main/res/drawable/ic_file_unknown.xml similarity index 100% rename from resources/src/main/res/drawable/ic_file_unknown.xml rename to core/resources/src/main/res/drawable/ic_file_unknown.xml diff --git a/resources/src/main/res/drawable/ic_filetype_activity.xml b/core/resources/src/main/res/drawable/ic_filetype_activity.xml similarity index 100% rename from resources/src/main/res/drawable/ic_filetype_activity.xml rename to core/resources/src/main/res/drawable/ic_filetype_activity.xml diff --git a/resources/src/main/res/drawable/ic_filetype_enum.xml b/core/resources/src/main/res/drawable/ic_filetype_enum.xml similarity index 100% rename from resources/src/main/res/drawable/ic_filetype_enum.xml rename to core/resources/src/main/res/drawable/ic_filetype_enum.xml diff --git a/resources/src/main/res/drawable/ic_filetype_interface.xml b/core/resources/src/main/res/drawable/ic_filetype_interface.xml similarity index 100% rename from resources/src/main/res/drawable/ic_filetype_interface.xml rename to core/resources/src/main/res/drawable/ic_filetype_interface.xml diff --git a/resources/src/main/res/drawable/ic_filter.xml b/core/resources/src/main/res/drawable/ic_filter.xml similarity index 100% rename from resources/src/main/res/drawable/ic_filter.xml rename to core/resources/src/main/res/drawable/ic_filter.xml diff --git a/resources/src/main/res/drawable/ic_folder.xml b/core/resources/src/main/res/drawable/ic_folder.xml similarity index 100% rename from resources/src/main/res/drawable/ic_folder.xml rename to core/resources/src/main/res/drawable/ic_folder.xml diff --git a/resources/src/main/res/drawable/ic_folder_close.xml b/core/resources/src/main/res/drawable/ic_folder_close.xml similarity index 100% rename from resources/src/main/res/drawable/ic_folder_close.xml rename to core/resources/src/main/res/drawable/ic_folder_close.xml diff --git a/resources/src/main/res/drawable/ic_font_ligatures.xml b/core/resources/src/main/res/drawable/ic_font_ligatures.xml similarity index 100% rename from resources/src/main/res/drawable/ic_font_ligatures.xml rename to core/resources/src/main/res/drawable/ic_font_ligatures.xml diff --git a/resources/src/main/res/drawable/ic_format_code.xml b/core/resources/src/main/res/drawable/ic_format_code.xml similarity index 100% rename from resources/src/main/res/drawable/ic_format_code.xml rename to core/resources/src/main/res/drawable/ic_format_code.xml diff --git a/resources/src/main/res/drawable/ic_git.xml b/core/resources/src/main/res/drawable/ic_git.xml similarity index 100% rename from resources/src/main/res/drawable/ic_git.xml rename to core/resources/src/main/res/drawable/ic_git.xml diff --git a/resources/src/main/res/drawable/ic_github.xml b/core/resources/src/main/res/drawable/ic_github.xml similarity index 100% rename from resources/src/main/res/drawable/ic_github.xml rename to core/resources/src/main/res/drawable/ic_github.xml diff --git a/resources/src/main/res/drawable/ic_gradle.xml b/core/resources/src/main/res/drawable/ic_gradle.xml similarity index 100% rename from resources/src/main/res/drawable/ic_gradle.xml rename to core/resources/src/main/res/drawable/ic_gradle.xml diff --git a/resources/src/main/res/drawable/ic_heart.xml b/core/resources/src/main/res/drawable/ic_heart.xml similarity index 100% rename from resources/src/main/res/drawable/ic_heart.xml rename to core/resources/src/main/res/drawable/ic_heart.xml diff --git a/resources/src/main/res/drawable/ic_heart_outline.xml b/core/resources/src/main/res/drawable/ic_heart_outline.xml similarity index 100% rename from resources/src/main/res/drawable/ic_heart_outline.xml rename to core/resources/src/main/res/drawable/ic_heart_outline.xml diff --git a/resources/src/main/res/drawable/ic_hex_icon.xml b/core/resources/src/main/res/drawable/ic_hex_icon.xml similarity index 100% rename from resources/src/main/res/drawable/ic_hex_icon.xml rename to core/resources/src/main/res/drawable/ic_hex_icon.xml diff --git a/resources/src/main/res/drawable/ic_info.xml b/core/resources/src/main/res/drawable/ic_info.xml similarity index 100% rename from resources/src/main/res/drawable/ic_info.xml rename to core/resources/src/main/res/drawable/ic_info.xml diff --git a/resources/src/main/res/drawable/ic_keyboard.xml b/core/resources/src/main/res/drawable/ic_keyboard.xml similarity index 100% rename from resources/src/main/res/drawable/ic_keyboard.xml rename to core/resources/src/main/res/drawable/ic_keyboard.xml diff --git a/resources/src/main/res/drawable/ic_keyboard_soft.xml b/core/resources/src/main/res/drawable/ic_keyboard_soft.xml similarity index 100% rename from resources/src/main/res/drawable/ic_keyboard_soft.xml rename to core/resources/src/main/res/drawable/ic_keyboard_soft.xml diff --git a/resources/src/main/res/drawable/ic_language_cpp.xml b/core/resources/src/main/res/drawable/ic_language_cpp.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_cpp.xml rename to core/resources/src/main/res/drawable/ic_language_cpp.xml diff --git a/resources/src/main/res/drawable/ic_language_java.xml b/core/resources/src/main/res/drawable/ic_language_java.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_java.xml rename to core/resources/src/main/res/drawable/ic_language_java.xml diff --git a/resources/src/main/res/drawable/ic_language_json.xml b/core/resources/src/main/res/drawable/ic_language_json.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_json.xml rename to core/resources/src/main/res/drawable/ic_language_json.xml diff --git a/resources/src/main/res/drawable/ic_language_kotlin.xml b/core/resources/src/main/res/drawable/ic_language_kotlin.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_kotlin.xml rename to core/resources/src/main/res/drawable/ic_language_kotlin.xml diff --git a/resources/src/main/res/drawable/ic_language_kts.xml b/core/resources/src/main/res/drawable/ic_language_kts.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_kts.xml rename to core/resources/src/main/res/drawable/ic_language_kts.xml diff --git a/resources/src/main/res/drawable/ic_language_properties.xml b/core/resources/src/main/res/drawable/ic_language_properties.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_properties.xml rename to core/resources/src/main/res/drawable/ic_language_properties.xml diff --git a/resources/src/main/res/drawable/ic_language_xml.xml b/core/resources/src/main/res/drawable/ic_language_xml.xml similarity index 100% rename from resources/src/main/res/drawable/ic_language_xml.xml rename to core/resources/src/main/res/drawable/ic_language_xml.xml diff --git a/resources/src/main/res/drawable/ic_launcher_animated.xml b/core/resources/src/main/res/drawable/ic_launcher_animated.xml similarity index 100% rename from resources/src/main/res/drawable/ic_launcher_animated.xml rename to core/resources/src/main/res/drawable/ic_launcher_animated.xml diff --git a/resources/src/main/res/drawable/ic_launcher_animated_dark.xml b/core/resources/src/main/res/drawable/ic_launcher_animated_dark.xml similarity index 100% rename from resources/src/main/res/drawable/ic_launcher_animated_dark.xml rename to core/resources/src/main/res/drawable/ic_launcher_animated_dark.xml diff --git a/resources/src/main/res/drawable/ic_launcher_fg_vector.xml b/core/resources/src/main/res/drawable/ic_launcher_fg_vector.xml similarity index 100% rename from resources/src/main/res/drawable/ic_launcher_fg_vector.xml rename to core/resources/src/main/res/drawable/ic_launcher_fg_vector.xml diff --git a/resources/src/main/res/drawable/ic_launcher_main.xml b/core/resources/src/main/res/drawable/ic_launcher_main.xml similarity index 100% rename from resources/src/main/res/drawable/ic_launcher_main.xml rename to core/resources/src/main/res/drawable/ic_launcher_main.xml diff --git a/resources/src/main/res/drawable/ic_licenses.xml b/core/resources/src/main/res/drawable/ic_licenses.xml similarity index 100% rename from resources/src/main/res/drawable/ic_licenses.xml rename to core/resources/src/main/res/drawable/ic_licenses.xml diff --git a/resources/src/main/res/drawable/ic_logs_disconnect.xml b/core/resources/src/main/res/drawable/ic_logs_disconnect.xml similarity index 100% rename from resources/src/main/res/drawable/ic_logs_disconnect.xml rename to core/resources/src/main/res/drawable/ic_logs_disconnect.xml diff --git a/resources/src/main/res/drawable/ic_loupe.xml b/core/resources/src/main/res/drawable/ic_loupe.xml similarity index 100% rename from resources/src/main/res/drawable/ic_loupe.xml rename to core/resources/src/main/res/drawable/ic_loupe.xml diff --git a/resources/src/main/res/drawable/ic_min_sdk.xml b/core/resources/src/main/res/drawable/ic_min_sdk.xml similarity index 100% rename from resources/src/main/res/drawable/ic_min_sdk.xml rename to core/resources/src/main/res/drawable/ic_min_sdk.xml diff --git a/resources/src/main/res/drawable/ic_new_file.xml b/core/resources/src/main/res/drawable/ic_new_file.xml similarity index 100% rename from resources/src/main/res/drawable/ic_new_file.xml rename to core/resources/src/main/res/drawable/ic_new_file.xml diff --git a/resources/src/main/res/drawable/ic_new_folder.xml b/core/resources/src/main/res/drawable/ic_new_folder.xml similarity index 100% rename from resources/src/main/res/drawable/ic_new_folder.xml rename to core/resources/src/main/res/drawable/ic_new_folder.xml diff --git a/resources/src/main/res/drawable/ic_ok.xml b/core/resources/src/main/res/drawable/ic_ok.xml similarity index 100% rename from resources/src/main/res/drawable/ic_ok.xml rename to core/resources/src/main/res/drawable/ic_ok.xml diff --git a/resources/src/main/res/drawable/ic_open_external.xml b/core/resources/src/main/res/drawable/ic_open_external.xml similarity index 100% rename from resources/src/main/res/drawable/ic_open_external.xml rename to core/resources/src/main/res/drawable/ic_open_external.xml diff --git a/resources/src/main/res/drawable/ic_open_project.xml b/core/resources/src/main/res/drawable/ic_open_project.xml similarity index 100% rename from resources/src/main/res/drawable/ic_open_project.xml rename to core/resources/src/main/res/drawable/ic_open_project.xml diff --git a/resources/src/main/res/drawable/ic_open_with.xml b/core/resources/src/main/res/drawable/ic_open_with.xml similarity index 100% rename from resources/src/main/res/drawable/ic_open_with.xml rename to core/resources/src/main/res/drawable/ic_open_with.xml diff --git a/resources/src/main/res/drawable/ic_package.xml b/core/resources/src/main/res/drawable/ic_package.xml similarity index 100% rename from resources/src/main/res/drawable/ic_package.xml rename to core/resources/src/main/res/drawable/ic_package.xml diff --git a/resources/src/main/res/drawable/ic_password_input.xml b/core/resources/src/main/res/drawable/ic_password_input.xml similarity index 100% rename from resources/src/main/res/drawable/ic_password_input.xml rename to core/resources/src/main/res/drawable/ic_password_input.xml diff --git a/resources/src/main/res/drawable/ic_pin.xml b/core/resources/src/main/res/drawable/ic_pin.xml similarity index 100% rename from resources/src/main/res/drawable/ic_pin.xml rename to core/resources/src/main/res/drawable/ic_pin.xml diff --git a/resources/src/main/res/drawable/ic_preview_layout.xml b/core/resources/src/main/res/drawable/ic_preview_layout.xml similarity index 100% rename from resources/src/main/res/drawable/ic_preview_layout.xml rename to core/resources/src/main/res/drawable/ic_preview_layout.xml diff --git a/resources/src/main/res/drawable/ic_redo.xml b/core/resources/src/main/res/drawable/ic_redo.xml similarity index 100% rename from resources/src/main/res/drawable/ic_redo.xml rename to core/resources/src/main/res/drawable/ic_redo.xml diff --git a/resources/src/main/res/drawable/ic_reload.xml b/core/resources/src/main/res/drawable/ic_reload.xml similarity index 100% rename from resources/src/main/res/drawable/ic_reload.xml rename to core/resources/src/main/res/drawable/ic_reload.xml diff --git a/resources/src/main/res/drawable/ic_rounded_square.xml b/core/resources/src/main/res/drawable/ic_rounded_square.xml similarity index 100% rename from resources/src/main/res/drawable/ic_rounded_square.xml rename to core/resources/src/main/res/drawable/ic_rounded_square.xml diff --git a/resources/src/main/res/drawable/ic_run.xml b/core/resources/src/main/res/drawable/ic_run.xml similarity index 100% rename from resources/src/main/res/drawable/ic_run.xml rename to core/resources/src/main/res/drawable/ic_run.xml diff --git a/resources/src/main/res/drawable/ic_run_outline.xml b/core/resources/src/main/res/drawable/ic_run_outline.xml similarity index 100% rename from resources/src/main/res/drawable/ic_run_outline.xml rename to core/resources/src/main/res/drawable/ic_run_outline.xml diff --git a/resources/src/main/res/drawable/ic_run_tasks.xml b/core/resources/src/main/res/drawable/ic_run_tasks.xml similarity index 100% rename from resources/src/main/res/drawable/ic_run_tasks.xml rename to core/resources/src/main/res/drawable/ic_run_tasks.xml diff --git a/resources/src/main/res/drawable/ic_save.xml b/core/resources/src/main/res/drawable/ic_save.xml similarity index 100% rename from resources/src/main/res/drawable/ic_save.xml rename to core/resources/src/main/res/drawable/ic_save.xml diff --git a/resources/src/main/res/drawable/ic_search.xml b/core/resources/src/main/res/drawable/ic_search.xml similarity index 100% rename from resources/src/main/res/drawable/ic_search.xml rename to core/resources/src/main/res/drawable/ic_search.xml diff --git a/resources/src/main/res/drawable/ic_search_file.xml b/core/resources/src/main/res/drawable/ic_search_file.xml similarity index 100% rename from resources/src/main/res/drawable/ic_search_file.xml rename to core/resources/src/main/res/drawable/ic_search_file.xml diff --git a/resources/src/main/res/drawable/ic_search_project.xml b/core/resources/src/main/res/drawable/ic_search_project.xml similarity index 100% rename from resources/src/main/res/drawable/ic_search_project.xml rename to core/resources/src/main/res/drawable/ic_search_project.xml diff --git a/resources/src/main/res/drawable/ic_search_replace.xml b/core/resources/src/main/res/drawable/ic_search_replace.xml similarity index 100% rename from resources/src/main/res/drawable/ic_search_replace.xml rename to core/resources/src/main/res/drawable/ic_search_replace.xml diff --git a/resources/src/main/res/drawable/ic_settings.xml b/core/resources/src/main/res/drawable/ic_settings.xml similarity index 100% rename from resources/src/main/res/drawable/ic_settings.xml rename to core/resources/src/main/res/drawable/ic_settings.xml diff --git a/resources/src/main/res/drawable/ic_share.xml b/core/resources/src/main/res/drawable/ic_share.xml similarity index 100% rename from resources/src/main/res/drawable/ic_share.xml rename to core/resources/src/main/res/drawable/ic_share.xml diff --git a/resources/src/main/res/drawable/ic_space.xml b/core/resources/src/main/res/drawable/ic_space.xml similarity index 100% rename from resources/src/main/res/drawable/ic_space.xml rename to core/resources/src/main/res/drawable/ic_space.xml diff --git a/resources/src/main/res/drawable/ic_sticky_scroll.xml b/core/resources/src/main/res/drawable/ic_sticky_scroll.xml similarity index 100% rename from resources/src/main/res/drawable/ic_sticky_scroll.xml rename to core/resources/src/main/res/drawable/ic_sticky_scroll.xml diff --git a/resources/src/main/res/drawable/ic_stop_daemons.xml b/core/resources/src/main/res/drawable/ic_stop_daemons.xml similarity index 100% rename from resources/src/main/res/drawable/ic_stop_daemons.xml rename to core/resources/src/main/res/drawable/ic_stop_daemons.xml diff --git a/resources/src/main/res/drawable/ic_sweep_delete.xml b/core/resources/src/main/res/drawable/ic_sweep_delete.xml similarity index 100% rename from resources/src/main/res/drawable/ic_sweep_delete.xml rename to core/resources/src/main/res/drawable/ic_sweep_delete.xml diff --git a/resources/src/main/res/drawable/ic_sync.xml b/core/resources/src/main/res/drawable/ic_sync.xml similarity index 100% rename from resources/src/main/res/drawable/ic_sync.xml rename to core/resources/src/main/res/drawable/ic_sync.xml diff --git a/resources/src/main/res/drawable/ic_tab.xml b/core/resources/src/main/res/drawable/ic_tab.xml similarity index 100% rename from resources/src/main/res/drawable/ic_tab.xml rename to core/resources/src/main/res/drawable/ic_tab.xml diff --git a/resources/src/main/res/drawable/ic_telegram.xml b/core/resources/src/main/res/drawable/ic_telegram.xml similarity index 100% rename from resources/src/main/res/drawable/ic_telegram.xml rename to core/resources/src/main/res/drawable/ic_telegram.xml diff --git a/resources/src/main/res/drawable/ic_terminal.xml b/core/resources/src/main/res/drawable/ic_terminal.xml similarity index 100% rename from resources/src/main/res/drawable/ic_terminal.xml rename to core/resources/src/main/res/drawable/ic_terminal.xml diff --git a/resources/src/main/res/drawable/ic_text_lower.xml b/core/resources/src/main/res/drawable/ic_text_lower.xml similarity index 100% rename from resources/src/main/res/drawable/ic_text_lower.xml rename to core/resources/src/main/res/drawable/ic_text_lower.xml diff --git a/resources/src/main/res/drawable/ic_text_size.xml b/core/resources/src/main/res/drawable/ic_text_size.xml similarity index 100% rename from resources/src/main/res/drawable/ic_text_size.xml rename to core/resources/src/main/res/drawable/ic_text_size.xml diff --git a/resources/src/main/res/drawable/ic_translate.xml b/core/resources/src/main/res/drawable/ic_translate.xml similarity index 100% rename from resources/src/main/res/drawable/ic_translate.xml rename to core/resources/src/main/res/drawable/ic_translate.xml diff --git a/resources/src/main/res/drawable/ic_tree.xml b/core/resources/src/main/res/drawable/ic_tree.xml similarity index 100% rename from resources/src/main/res/drawable/ic_tree.xml rename to core/resources/src/main/res/drawable/ic_tree.xml diff --git a/resources/src/main/res/drawable/ic_ui_mode.xml b/core/resources/src/main/res/drawable/ic_ui_mode.xml similarity index 100% rename from resources/src/main/res/drawable/ic_ui_mode.xml rename to core/resources/src/main/res/drawable/ic_ui_mode.xml diff --git a/resources/src/main/res/drawable/ic_undo.xml b/core/resources/src/main/res/drawable/ic_undo.xml similarity index 100% rename from resources/src/main/res/drawable/ic_undo.xml rename to core/resources/src/main/res/drawable/ic_undo.xml diff --git a/resources/src/main/res/drawable/ic_website.xml b/core/resources/src/main/res/drawable/ic_website.xml similarity index 100% rename from resources/src/main/res/drawable/ic_website.xml rename to core/resources/src/main/res/drawable/ic_website.xml diff --git a/resources/src/main/res/drawable/ic_widget_analog_clock.xml b/core/resources/src/main/res/drawable/ic_widget_analog_clock.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_analog_clock.xml rename to core/resources/src/main/res/drawable/ic_widget_analog_clock.xml diff --git a/resources/src/main/res/drawable/ic_widget_auto_complete_textview.xml b/core/resources/src/main/res/drawable/ic_widget_auto_complete_textview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_auto_complete_textview.xml rename to core/resources/src/main/res/drawable/ic_widget_auto_complete_textview.xml diff --git a/resources/src/main/res/drawable/ic_widget_button.xml b/core/resources/src/main/res/drawable/ic_widget_button.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_button.xml rename to core/resources/src/main/res/drawable/ic_widget_button.xml diff --git a/resources/src/main/res/drawable/ic_widget_calendar_view.xml b/core/resources/src/main/res/drawable/ic_widget_calendar_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_calendar_view.xml rename to core/resources/src/main/res/drawable/ic_widget_calendar_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_checkbox.xml b/core/resources/src/main/res/drawable/ic_widget_checkbox.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_checkbox.xml rename to core/resources/src/main/res/drawable/ic_widget_checkbox.xml diff --git a/resources/src/main/res/drawable/ic_widget_checked_textview.xml b/core/resources/src/main/res/drawable/ic_widget_checked_textview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_checked_textview.xml rename to core/resources/src/main/res/drawable/ic_widget_checked_textview.xml diff --git a/resources/src/main/res/drawable/ic_widget_chronometer.xml b/core/resources/src/main/res/drawable/ic_widget_chronometer.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_chronometer.xml rename to core/resources/src/main/res/drawable/ic_widget_chronometer.xml diff --git a/resources/src/main/res/drawable/ic_widget_edittext.xml b/core/resources/src/main/res/drawable/ic_widget_edittext.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_edittext.xml rename to core/resources/src/main/res/drawable/ic_widget_edittext.xml diff --git a/resources/src/main/res/drawable/ic_widget_frame_layout.xml b/core/resources/src/main/res/drawable/ic_widget_frame_layout.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_frame_layout.xml rename to core/resources/src/main/res/drawable/ic_widget_frame_layout.xml diff --git a/resources/src/main/res/drawable/ic_widget_grid_layout.xml b/core/resources/src/main/res/drawable/ic_widget_grid_layout.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_grid_layout.xml rename to core/resources/src/main/res/drawable/ic_widget_grid_layout.xml diff --git a/resources/src/main/res/drawable/ic_widget_grid_view.xml b/core/resources/src/main/res/drawable/ic_widget_grid_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_grid_view.xml rename to core/resources/src/main/res/drawable/ic_widget_grid_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_horizontal_scroll_view.xml b/core/resources/src/main/res/drawable/ic_widget_horizontal_scroll_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_horizontal_scroll_view.xml rename to core/resources/src/main/res/drawable/ic_widget_horizontal_scroll_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_imagebutton.xml b/core/resources/src/main/res/drawable/ic_widget_imagebutton.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_imagebutton.xml rename to core/resources/src/main/res/drawable/ic_widget_imagebutton.xml diff --git a/resources/src/main/res/drawable/ic_widget_imageswitcher.xml b/core/resources/src/main/res/drawable/ic_widget_imageswitcher.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_imageswitcher.xml rename to core/resources/src/main/res/drawable/ic_widget_imageswitcher.xml diff --git a/resources/src/main/res/drawable/ic_widget_imageview.xml b/core/resources/src/main/res/drawable/ic_widget_imageview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_imageview.xml rename to core/resources/src/main/res/drawable/ic_widget_imageview.xml diff --git a/resources/src/main/res/drawable/ic_widget_linear_layout_horz.xml b/core/resources/src/main/res/drawable/ic_widget_linear_layout_horz.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_linear_layout_horz.xml rename to core/resources/src/main/res/drawable/ic_widget_linear_layout_horz.xml diff --git a/resources/src/main/res/drawable/ic_widget_linear_layout_vert.xml b/core/resources/src/main/res/drawable/ic_widget_linear_layout_vert.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_linear_layout_vert.xml rename to core/resources/src/main/res/drawable/ic_widget_linear_layout_vert.xml diff --git a/resources/src/main/res/drawable/ic_widget_list_view.xml b/core/resources/src/main/res/drawable/ic_widget_list_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_list_view.xml rename to core/resources/src/main/res/drawable/ic_widget_list_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_multi_auto_complete_textview.xml b/core/resources/src/main/res/drawable/ic_widget_multi_auto_complete_textview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_multi_auto_complete_textview.xml rename to core/resources/src/main/res/drawable/ic_widget_multi_auto_complete_textview.xml diff --git a/resources/src/main/res/drawable/ic_widget_number_picker.xml b/core/resources/src/main/res/drawable/ic_widget_number_picker.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_number_picker.xml rename to core/resources/src/main/res/drawable/ic_widget_number_picker.xml diff --git a/resources/src/main/res/drawable/ic_widget_progress_bar.xml b/core/resources/src/main/res/drawable/ic_widget_progress_bar.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_progress_bar.xml rename to core/resources/src/main/res/drawable/ic_widget_progress_bar.xml diff --git a/resources/src/main/res/drawable/ic_widget_quick_contact_badge.xml b/core/resources/src/main/res/drawable/ic_widget_quick_contact_badge.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_quick_contact_badge.xml rename to core/resources/src/main/res/drawable/ic_widget_quick_contact_badge.xml diff --git a/resources/src/main/res/drawable/ic_widget_radio_button.xml b/core/resources/src/main/res/drawable/ic_widget_radio_button.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_radio_button.xml rename to core/resources/src/main/res/drawable/ic_widget_radio_button.xml diff --git a/resources/src/main/res/drawable/ic_widget_radio_group.xml b/core/resources/src/main/res/drawable/ic_widget_radio_group.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_radio_group.xml rename to core/resources/src/main/res/drawable/ic_widget_radio_group.xml diff --git a/resources/src/main/res/drawable/ic_widget_rating_bar.xml b/core/resources/src/main/res/drawable/ic_widget_rating_bar.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_rating_bar.xml rename to core/resources/src/main/res/drawable/ic_widget_rating_bar.xml diff --git a/resources/src/main/res/drawable/ic_widget_relative_layout.xml b/core/resources/src/main/res/drawable/ic_widget_relative_layout.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_relative_layout.xml rename to core/resources/src/main/res/drawable/ic_widget_relative_layout.xml diff --git a/resources/src/main/res/drawable/ic_widget_scroll_view.xml b/core/resources/src/main/res/drawable/ic_widget_scroll_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_scroll_view.xml rename to core/resources/src/main/res/drawable/ic_widget_scroll_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_seek_bar.xml b/core/resources/src/main/res/drawable/ic_widget_seek_bar.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_seek_bar.xml rename to core/resources/src/main/res/drawable/ic_widget_seek_bar.xml diff --git a/resources/src/main/res/drawable/ic_widget_space.xml b/core/resources/src/main/res/drawable/ic_widget_space.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_space.xml rename to core/resources/src/main/res/drawable/ic_widget_space.xml diff --git a/resources/src/main/res/drawable/ic_widget_spinner.xml b/core/resources/src/main/res/drawable/ic_widget_spinner.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_spinner.xml rename to core/resources/src/main/res/drawable/ic_widget_spinner.xml diff --git a/resources/src/main/res/drawable/ic_widget_surface_view.xml b/core/resources/src/main/res/drawable/ic_widget_surface_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_surface_view.xml rename to core/resources/src/main/res/drawable/ic_widget_surface_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_switch.xml b/core/resources/src/main/res/drawable/ic_widget_switch.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_switch.xml rename to core/resources/src/main/res/drawable/ic_widget_switch.xml diff --git a/resources/src/main/res/drawable/ic_widget_text_clock.xml b/core/resources/src/main/res/drawable/ic_widget_text_clock.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_text_clock.xml rename to core/resources/src/main/res/drawable/ic_widget_text_clock.xml diff --git a/resources/src/main/res/drawable/ic_widget_textswitcher.xml b/core/resources/src/main/res/drawable/ic_widget_textswitcher.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_textswitcher.xml rename to core/resources/src/main/res/drawable/ic_widget_textswitcher.xml diff --git a/resources/src/main/res/drawable/ic_widget_textureview.xml b/core/resources/src/main/res/drawable/ic_widget_textureview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_textureview.xml rename to core/resources/src/main/res/drawable/ic_widget_textureview.xml diff --git a/resources/src/main/res/drawable/ic_widget_textview.xml b/core/resources/src/main/res/drawable/ic_widget_textview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_textview.xml rename to core/resources/src/main/res/drawable/ic_widget_textview.xml diff --git a/resources/src/main/res/drawable/ic_widget_toggle_button.xml b/core/resources/src/main/res/drawable/ic_widget_toggle_button.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_toggle_button.xml rename to core/resources/src/main/res/drawable/ic_widget_toggle_button.xml diff --git a/resources/src/main/res/drawable/ic_widget_videoview.xml b/core/resources/src/main/res/drawable/ic_widget_videoview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_videoview.xml rename to core/resources/src/main/res/drawable/ic_widget_videoview.xml diff --git a/resources/src/main/res/drawable/ic_widget_view.xml b/core/resources/src/main/res/drawable/ic_widget_view.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_view.xml rename to core/resources/src/main/res/drawable/ic_widget_view.xml diff --git a/resources/src/main/res/drawable/ic_widget_viewanimator.xml b/core/resources/src/main/res/drawable/ic_widget_viewanimator.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_viewanimator.xml rename to core/resources/src/main/res/drawable/ic_widget_viewanimator.xml diff --git a/resources/src/main/res/drawable/ic_widget_viewflipper.xml b/core/resources/src/main/res/drawable/ic_widget_viewflipper.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_viewflipper.xml rename to core/resources/src/main/res/drawable/ic_widget_viewflipper.xml diff --git a/resources/src/main/res/drawable/ic_widget_viewswitcher.xml b/core/resources/src/main/res/drawable/ic_widget_viewswitcher.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_viewswitcher.xml rename to core/resources/src/main/res/drawable/ic_widget_viewswitcher.xml diff --git a/resources/src/main/res/drawable/ic_widget_webview.xml b/core/resources/src/main/res/drawable/ic_widget_webview.xml similarity index 100% rename from resources/src/main/res/drawable/ic_widget_webview.xml rename to core/resources/src/main/res/drawable/ic_widget_webview.xml diff --git a/resources/src/main/res/drawable/ic_wrap_text.xml b/core/resources/src/main/res/drawable/ic_wrap_text.xml similarity index 100% rename from resources/src/main/res/drawable/ic_wrap_text.xml rename to core/resources/src/main/res/drawable/ic_wrap_text.xml diff --git a/resources/src/main/res/drawable/text_select_handle_left_material.xml b/core/resources/src/main/res/drawable/text_select_handle_left_material.xml similarity index 100% rename from resources/src/main/res/drawable/text_select_handle_left_material.xml rename to core/resources/src/main/res/drawable/text_select_handle_left_material.xml diff --git a/resources/src/main/res/drawable/text_select_handle_right_material.xml b/core/resources/src/main/res/drawable/text_select_handle_right_material.xml similarity index 100% rename from resources/src/main/res/drawable/text_select_handle_right_material.xml rename to core/resources/src/main/res/drawable/text_select_handle_right_material.xml diff --git a/resources/src/main/res/drawable/textfield_cursor.xml b/core/resources/src/main/res/drawable/textfield_cursor.xml similarity index 100% rename from resources/src/main/res/drawable/textfield_cursor.xml rename to core/resources/src/main/res/drawable/textfield_cursor.xml diff --git a/resources/src/main/res/font/josefin_sans.ttf b/core/resources/src/main/res/font/josefin_sans.ttf similarity index 100% rename from resources/src/main/res/font/josefin_sans.ttf rename to core/resources/src/main/res/font/josefin_sans.ttf diff --git a/resources/src/main/res/font/quicksand.ttf b/core/resources/src/main/res/font/quicksand.ttf similarity index 100% rename from resources/src/main/res/font/quicksand.ttf rename to core/resources/src/main/res/font/quicksand.ttf diff --git a/resources/src/main/res/layout/preference_widget_materialswitch.xml b/core/resources/src/main/res/layout/preference_widget_materialswitch.xml similarity index 100% rename from resources/src/main/res/layout/preference_widget_materialswitch.xml rename to core/resources/src/main/res/layout/preference_widget_materialswitch.xml diff --git a/resources/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/resources/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from resources/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to core/resources/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/resources/src/main/res/mipmap-hdpi/ic_launcher.png b/core/resources/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from resources/src/main/res/mipmap-hdpi/ic_launcher.png rename to core/resources/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/resources/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/core/resources/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from resources/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to core/resources/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/resources/src/main/res/mipmap-hdpi/ic_launcher_round.png b/core/resources/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from resources/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to core/resources/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/resources/src/main/res/mipmap-mdpi/ic_launcher.png b/core/resources/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from resources/src/main/res/mipmap-mdpi/ic_launcher.png rename to core/resources/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/resources/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/core/resources/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from resources/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to core/resources/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/resources/src/main/res/mipmap-mdpi/ic_launcher_round.png b/core/resources/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from resources/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to core/resources/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/resources/src/main/res/mipmap-xhdpi/ic_launcher.png b/core/resources/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from resources/src/main/res/mipmap-xhdpi/ic_launcher.png rename to core/resources/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/resources/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/resources/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from resources/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to core/resources/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/resources/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/core/resources/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from resources/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to core/resources/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/resources/src/main/res/mipmap-xxhdpi/ic_launcher.png b/core/resources/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from resources/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to core/resources/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/resources/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/resources/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from resources/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to core/resources/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/resources/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/core/resources/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from resources/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to core/resources/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/resources/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from resources/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from resources/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from resources/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to core/resources/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/resources/src/main/res/values-ar-rSA/strings.xml b/core/resources/src/main/res/values-ar-rSA/strings.xml similarity index 100% rename from resources/src/main/res/values-ar-rSA/strings.xml rename to core/resources/src/main/res/values-ar-rSA/strings.xml diff --git a/resources/src/main/res/values-ar-rSA/termux_app_strings.xml b/core/resources/src/main/res/values-ar-rSA/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-ar-rSA/termux_app_strings.xml rename to core/resources/src/main/res/values-ar-rSA/termux_app_strings.xml diff --git a/resources/src/main/res/values-ar-rSA/termux_shared_strings.xml b/core/resources/src/main/res/values-ar-rSA/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-ar-rSA/termux_shared_strings.xml rename to core/resources/src/main/res/values-ar-rSA/termux_shared_strings.xml diff --git a/resources/src/main/res/values-bn-rIN/strings.xml b/core/resources/src/main/res/values-bn-rIN/strings.xml similarity index 100% rename from resources/src/main/res/values-bn-rIN/strings.xml rename to core/resources/src/main/res/values-bn-rIN/strings.xml diff --git a/resources/src/main/res/values-bn-rIN/termux_app_strings.xml b/core/resources/src/main/res/values-bn-rIN/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-bn-rIN/termux_app_strings.xml rename to core/resources/src/main/res/values-bn-rIN/termux_app_strings.xml diff --git a/resources/src/main/res/values-bn-rIN/termux_shared_strings.xml b/core/resources/src/main/res/values-bn-rIN/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-bn-rIN/termux_shared_strings.xml rename to core/resources/src/main/res/values-bn-rIN/termux_shared_strings.xml diff --git a/resources/src/main/res/values-de-rDE/strings.xml b/core/resources/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from resources/src/main/res/values-de-rDE/strings.xml rename to core/resources/src/main/res/values-de-rDE/strings.xml diff --git a/resources/src/main/res/values-de-rDE/termux_app_strings.xml b/core/resources/src/main/res/values-de-rDE/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-de-rDE/termux_app_strings.xml rename to core/resources/src/main/res/values-de-rDE/termux_app_strings.xml diff --git a/resources/src/main/res/values-de-rDE/termux_shared_strings.xml b/core/resources/src/main/res/values-de-rDE/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-de-rDE/termux_shared_strings.xml rename to core/resources/src/main/res/values-de-rDE/termux_shared_strings.xml diff --git a/resources/src/main/res/values-es-rES/strings.xml b/core/resources/src/main/res/values-es-rES/strings.xml similarity index 100% rename from resources/src/main/res/values-es-rES/strings.xml rename to core/resources/src/main/res/values-es-rES/strings.xml diff --git a/resources/src/main/res/values-es-rES/termux_app_strings.xml b/core/resources/src/main/res/values-es-rES/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-es-rES/termux_app_strings.xml rename to core/resources/src/main/res/values-es-rES/termux_app_strings.xml diff --git a/resources/src/main/res/values-es-rES/termux_shared_strings.xml b/core/resources/src/main/res/values-es-rES/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-es-rES/termux_shared_strings.xml rename to core/resources/src/main/res/values-es-rES/termux_shared_strings.xml diff --git a/resources/src/main/res/values-fr-rFR/strings.xml b/core/resources/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from resources/src/main/res/values-fr-rFR/strings.xml rename to core/resources/src/main/res/values-fr-rFR/strings.xml diff --git a/resources/src/main/res/values-fr-rFR/termux_app_strings.xml b/core/resources/src/main/res/values-fr-rFR/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-fr-rFR/termux_app_strings.xml rename to core/resources/src/main/res/values-fr-rFR/termux_app_strings.xml diff --git a/resources/src/main/res/values-fr-rFR/termux_shared_strings.xml b/core/resources/src/main/res/values-fr-rFR/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-fr-rFR/termux_shared_strings.xml rename to core/resources/src/main/res/values-fr-rFR/termux_shared_strings.xml diff --git a/resources/src/main/res/values-hi-rIN/strings.xml b/core/resources/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from resources/src/main/res/values-hi-rIN/strings.xml rename to core/resources/src/main/res/values-hi-rIN/strings.xml diff --git a/resources/src/main/res/values-hi-rIN/termux_app_strings.xml b/core/resources/src/main/res/values-hi-rIN/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-hi-rIN/termux_app_strings.xml rename to core/resources/src/main/res/values-hi-rIN/termux_app_strings.xml diff --git a/resources/src/main/res/values-hi-rIN/termux_shared_strings.xml b/core/resources/src/main/res/values-hi-rIN/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-hi-rIN/termux_shared_strings.xml rename to core/resources/src/main/res/values-hi-rIN/termux_shared_strings.xml diff --git a/resources/src/main/res/values-in-rID/strings.xml b/core/resources/src/main/res/values-in-rID/strings.xml similarity index 100% rename from resources/src/main/res/values-in-rID/strings.xml rename to core/resources/src/main/res/values-in-rID/strings.xml diff --git a/resources/src/main/res/values-in-rID/termux_app_strings.xml b/core/resources/src/main/res/values-in-rID/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-in-rID/termux_app_strings.xml rename to core/resources/src/main/res/values-in-rID/termux_app_strings.xml diff --git a/resources/src/main/res/values-in-rID/termux_shared_strings.xml b/core/resources/src/main/res/values-in-rID/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-in-rID/termux_shared_strings.xml rename to core/resources/src/main/res/values-in-rID/termux_shared_strings.xml diff --git a/resources/src/main/res/values-night/colors.xml b/core/resources/src/main/res/values-night/colors.xml similarity index 100% rename from resources/src/main/res/values-night/colors.xml rename to core/resources/src/main/res/values-night/colors.xml diff --git a/resources/src/main/res/values-night/styles.xml b/core/resources/src/main/res/values-night/styles.xml similarity index 100% rename from resources/src/main/res/values-night/styles.xml rename to core/resources/src/main/res/values-night/styles.xml diff --git a/resources/src/main/res/values-pt-rBR/strings.xml b/core/resources/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from resources/src/main/res/values-pt-rBR/strings.xml rename to core/resources/src/main/res/values-pt-rBR/strings.xml diff --git a/resources/src/main/res/values-pt-rBR/termux_app_strings.xml b/core/resources/src/main/res/values-pt-rBR/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-pt-rBR/termux_app_strings.xml rename to core/resources/src/main/res/values-pt-rBR/termux_app_strings.xml diff --git a/resources/src/main/res/values-pt-rBR/termux_shared_strings.xml b/core/resources/src/main/res/values-pt-rBR/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-pt-rBR/termux_shared_strings.xml rename to core/resources/src/main/res/values-pt-rBR/termux_shared_strings.xml diff --git a/resources/src/main/res/values-ro-rRO/strings.xml b/core/resources/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from resources/src/main/res/values-ro-rRO/strings.xml rename to core/resources/src/main/res/values-ro-rRO/strings.xml diff --git a/resources/src/main/res/values-ro-rRO/termux_app_strings.xml b/core/resources/src/main/res/values-ro-rRO/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-ro-rRO/termux_app_strings.xml rename to core/resources/src/main/res/values-ro-rRO/termux_app_strings.xml diff --git a/resources/src/main/res/values-ro-rRO/termux_shared_strings.xml b/core/resources/src/main/res/values-ro-rRO/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-ro-rRO/termux_shared_strings.xml rename to core/resources/src/main/res/values-ro-rRO/termux_shared_strings.xml diff --git a/resources/src/main/res/values-ru-rRU/strings.xml b/core/resources/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from resources/src/main/res/values-ru-rRU/strings.xml rename to core/resources/src/main/res/values-ru-rRU/strings.xml diff --git a/resources/src/main/res/values-ru-rRU/termux_app_strings.xml b/core/resources/src/main/res/values-ru-rRU/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-ru-rRU/termux_app_strings.xml rename to core/resources/src/main/res/values-ru-rRU/termux_app_strings.xml diff --git a/resources/src/main/res/values-ru-rRU/termux_shared_strings.xml b/core/resources/src/main/res/values-ru-rRU/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-ru-rRU/termux_shared_strings.xml rename to core/resources/src/main/res/values-ru-rRU/termux_shared_strings.xml diff --git a/resources/src/main/res/values-tr-rTR/strings.xml b/core/resources/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from resources/src/main/res/values-tr-rTR/strings.xml rename to core/resources/src/main/res/values-tr-rTR/strings.xml diff --git a/resources/src/main/res/values-tr-rTR/termux_app_strings.xml b/core/resources/src/main/res/values-tr-rTR/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-tr-rTR/termux_app_strings.xml rename to core/resources/src/main/res/values-tr-rTR/termux_app_strings.xml diff --git a/resources/src/main/res/values-tr-rTR/termux_shared_strings.xml b/core/resources/src/main/res/values-tr-rTR/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-tr-rTR/termux_shared_strings.xml rename to core/resources/src/main/res/values-tr-rTR/termux_shared_strings.xml diff --git a/resources/src/main/res/values-zh-rCN/strings.xml b/core/resources/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from resources/src/main/res/values-zh-rCN/strings.xml rename to core/resources/src/main/res/values-zh-rCN/strings.xml diff --git a/resources/src/main/res/values-zh-rCN/termux_app_strings.xml b/core/resources/src/main/res/values-zh-rCN/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values-zh-rCN/termux_app_strings.xml rename to core/resources/src/main/res/values-zh-rCN/termux_app_strings.xml diff --git a/resources/src/main/res/values-zh-rCN/termux_shared_strings.xml b/core/resources/src/main/res/values-zh-rCN/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values-zh-rCN/termux_shared_strings.xml rename to core/resources/src/main/res/values-zh-rCN/termux_shared_strings.xml diff --git a/resources/src/main/res/values/attrs.xml b/core/resources/src/main/res/values/attrs.xml similarity index 100% rename from resources/src/main/res/values/attrs.xml rename to core/resources/src/main/res/values/attrs.xml diff --git a/resources/src/main/res/values/colors.xml b/core/resources/src/main/res/values/colors.xml similarity index 100% rename from resources/src/main/res/values/colors.xml rename to core/resources/src/main/res/values/colors.xml diff --git a/resources/src/main/res/values/dimens.xml b/core/resources/src/main/res/values/dimens.xml similarity index 100% rename from resources/src/main/res/values/dimens.xml rename to core/resources/src/main/res/values/dimens.xml diff --git a/resources/src/main/res/values/ic_launcher_background.xml b/core/resources/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from resources/src/main/res/values/ic_launcher_background.xml rename to core/resources/src/main/res/values/ic_launcher_background.xml diff --git a/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml similarity index 100% rename from resources/src/main/res/values/strings.xml rename to core/resources/src/main/res/values/strings.xml diff --git a/resources/src/main/res/values/styles.xml b/core/resources/src/main/res/values/styles.xml similarity index 100% rename from resources/src/main/res/values/styles.xml rename to core/resources/src/main/res/values/styles.xml diff --git a/resources/src/main/res/values/termux_app_strings.xml b/core/resources/src/main/res/values/termux_app_strings.xml similarity index 100% rename from resources/src/main/res/values/termux_app_strings.xml rename to core/resources/src/main/res/values/termux_app_strings.xml diff --git a/resources/src/main/res/values/termux_attrs.xml b/core/resources/src/main/res/values/termux_attrs.xml similarity index 100% rename from resources/src/main/res/values/termux_attrs.xml rename to core/resources/src/main/res/values/termux_attrs.xml diff --git a/resources/src/main/res/values/termux_colors.xml b/core/resources/src/main/res/values/termux_colors.xml similarity index 100% rename from resources/src/main/res/values/termux_colors.xml rename to core/resources/src/main/res/values/termux_colors.xml diff --git a/resources/src/main/res/values/termux_shared_strings.xml b/core/resources/src/main/res/values/termux_shared_strings.xml similarity index 100% rename from resources/src/main/res/values/termux_shared_strings.xml rename to core/resources/src/main/res/values/termux_shared_strings.xml diff --git a/resources/src/main/res/values/termux_styles.xml b/core/resources/src/main/res/values/termux_styles.xml similarity index 100% rename from resources/src/main/res/values/termux_styles.xml rename to core/resources/src/main/res/values/termux_styles.xml diff --git a/resources/src/main/res/values/theme_blue_wave.xml b/core/resources/src/main/res/values/theme_blue_wave.xml similarity index 100% rename from resources/src/main/res/values/theme_blue_wave.xml rename to core/resources/src/main/res/values/theme_blue_wave.xml diff --git a/resources/src/main/res/values/theme_sunny_glow.xml b/core/resources/src/main/res/values/theme_sunny_glow.xml similarity index 100% rename from resources/src/main/res/values/theme_sunny_glow.xml rename to core/resources/src/main/res/values/theme_sunny_glow.xml diff --git a/eventbus/.gitignore b/editor/api/.gitignore similarity index 100% rename from eventbus/.gitignore rename to editor/api/.gitignore diff --git a/editor-api/build.gradle.kts b/editor/api/build.gradle.kts similarity index 83% rename from editor-api/build.gradle.kts rename to editor/api/build.gradle.kts index 18290e85a..36d7c82f2 100644 --- a/editor-api/build.gradle.kts +++ b/editor/api/build.gradle.kts @@ -22,15 +22,20 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.editor.api" } dependencies { api(libs.androidide.ts) - api(projects.lsp.api) - api(projects.lsp.models) + + api(projects.core.lspApi) + api(projects.core.lspModels) - implementation(projects.common) - implementation(projects.logger) + implementation(projects.core.common) + implementation(projects.logging.logger) } \ No newline at end of file diff --git a/logsender/consumer-rules.pro b/editor/api/consumer-rules.pro similarity index 100% rename from logsender/consumer-rules.pro rename to editor/api/consumer-rules.pro diff --git a/logsender/proguard-rules.pro b/editor/api/proguard-rules.pro similarity index 100% rename from logsender/proguard-rules.pro rename to editor/api/proguard-rules.pro diff --git a/editor-api/src/main/AndroidManifest.xml b/editor/api/src/main/AndroidManifest.xml similarity index 100% rename from editor-api/src/main/AndroidManifest.xml rename to editor/api/src/main/AndroidManifest.xml diff --git a/editor-api/src/main/java/com/itsaky/androidide/editor/api/IEditor.java b/editor/api/src/main/java/com/itsaky/androidide/editor/api/IEditor.java similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/editor/api/IEditor.java rename to editor/api/src/main/java/com/itsaky/androidide/editor/api/IEditor.java diff --git a/editor-api/src/main/java/com/itsaky/androidide/editor/api/ILspEditor.kt b/editor/api/src/main/java/com/itsaky/androidide/editor/api/ILspEditor.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/editor/api/ILspEditor.kt rename to editor/api/src/main/java/com/itsaky/androidide/editor/api/ILspEditor.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterInputEdit.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterInputEdit.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterInputEdit.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterInputEdit.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterLookaheadIterator.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterLookaheadIterator.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterLookaheadIterator.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterLookaheadIterator.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNativeLanguage.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNativeLanguage.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNativeLanguage.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNativeLanguage.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNode.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNode.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNode.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterNode.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectFactory.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectFactory.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectFactory.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectFactory.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectPoolProvider.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectPoolProvider.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectPoolProvider.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterObjectPoolProvider.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterParser.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterParser.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterParser.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterParser.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterPoint.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterPoint.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterPoint.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterPoint.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQuery.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQuery.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQuery.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQuery.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCapture.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCapture.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCapture.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCapture.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCursor.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCursor.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCursor.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryCursor.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryMatch.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryMatch.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryMatch.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryMatch.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryPredicateStep.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryPredicateStep.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryPredicateStep.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterQueryPredicateStep.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterRange.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterRange.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterRange.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterRange.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTree.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTree.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTree.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTree.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursor.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursor.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursor.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursor.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursorNode.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursorNode.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursorNode.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/TreeSitterTreeCursorNode.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsRecyclableUtils.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/tsRecyclableUtils.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsRecyclableUtils.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/tsRecyclableUtils.kt diff --git a/editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt b/editor/api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt similarity index 100% rename from editor-api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt rename to editor/api/src/main/java/com/itsaky/androidide/treesitter/api/tsUtils.kt diff --git a/gradle-plugin-config/.gitignore b/editor/impl/.gitignore similarity index 100% rename from gradle-plugin-config/.gitignore rename to editor/impl/.gitignore diff --git a/editor/build.gradle.kts b/editor/impl/build.gradle.kts similarity index 62% rename from editor/build.gradle.kts rename to editor/impl/build.gradle.kts index 309d7ec16..095a5c73d 100644 --- a/editor/build.gradle.kts +++ b/editor/impl/build.gradle.kts @@ -7,6 +7,10 @@ plugins { id("com.google.devtools.ksp") version libs.versions.ksp } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "${BuildConfig.packageName}.editor" } @@ -18,8 +22,8 @@ kapt { } dependencies { - ksp(projects.annotationProcessorsKsp) - kapt(projects.annotationProcessors) + ksp(projects.annotation.processorsKsp) + kapt(projects.annotation.processors) api(libs.androidide.ts) api(libs.androidide.ts.java) @@ -30,8 +34,8 @@ dependencies { api(libs.androidx.collection) api(libs.common.editor) - api(projects.editorApi) - api(projects.editorTreesitter) + api(projects.editor.api) + api(projects.editor.treesitter) implementation(libs.androidx.annotation) implementation(libs.androidx.appcompat) @@ -42,20 +46,19 @@ dependencies { implementation(libs.common.utilcode) implementation(libs.google.material) - - implementation(projects.actions) - implementation(projects.annotations) - implementation(projects.common) - implementation(projects.eventbusAndroid) - implementation(projects.eventbusEvents) - implementation(projects.lexers) - implementation(projects.shared) - implementation(projects.resources) - - implementation(projects.lsp.api) - implementation(projects.lsp.java) - implementation(projects.lsp.xml) - + + implementation(projects.annotation.annotations) + implementation(projects.core.actions) + implementation(projects.core.common) + implementation(projects.core.lspApi) + implementation(projects.core.resources) + implementation(projects.editor.lexers) + implementation(projects.event.eventbusAndroid) + implementation(projects.event.eventbusEvents) + implementation(projects.java.lsp) + implementation(projects.utilities.shared) + implementation(projects.xml.lsp) + testImplementation(libs.tests.junit) testImplementation(libs.tests.google.truth) testImplementation(libs.tests.robolectric) diff --git a/lsp/api/consumer-rules.pro b/editor/impl/consumer-rules.pro similarity index 100% rename from lsp/api/consumer-rules.pro rename to editor/impl/consumer-rules.pro diff --git a/editor/proguard-rules.pro b/editor/impl/proguard-rules.pro similarity index 100% rename from editor/proguard-rules.pro rename to editor/impl/proguard-rules.pro diff --git a/shared/src/main/AndroidManifest.xml b/editor/impl/src/main/AndroidManifest.xml similarity index 100% rename from shared/src/main/AndroidManifest.xml rename to editor/impl/src/main/AndroidManifest.xml diff --git a/editor/src/main/assets/editor/schemes/default-dark/default-dark.json b/editor/impl/src/main/assets/editor/schemes/default-dark/default-dark.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/default-dark.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/default-dark.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/editor.json b/editor/impl/src/main/assets/editor/schemes/default-dark/editor.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/editor.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/editor.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/java.json b/editor/impl/src/main/assets/editor/schemes/default-dark/java.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/java.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/java.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/json.json b/editor/impl/src/main/assets/editor/schemes/default-dark/json.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/json.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/json.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/kotlin.json b/editor/impl/src/main/assets/editor/schemes/default-dark/kotlin.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/kotlin.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/kotlin.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/log.json b/editor/impl/src/main/assets/editor/schemes/default-dark/log.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/log.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/log.json diff --git a/editor/src/main/assets/editor/schemes/default-dark/scheme.prop b/editor/impl/src/main/assets/editor/schemes/default-dark/scheme.prop similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/scheme.prop rename to editor/impl/src/main/assets/editor/schemes/default-dark/scheme.prop diff --git a/editor/src/main/assets/editor/schemes/default-dark/xml.json b/editor/impl/src/main/assets/editor/schemes/default-dark/xml.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default-dark/xml.json rename to editor/impl/src/main/assets/editor/schemes/default-dark/xml.json diff --git a/editor/src/main/assets/editor/schemes/default/default.json b/editor/impl/src/main/assets/editor/schemes/default/default.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/default.json rename to editor/impl/src/main/assets/editor/schemes/default/default.json diff --git a/editor/src/main/assets/editor/schemes/default/editor.json b/editor/impl/src/main/assets/editor/schemes/default/editor.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/editor.json rename to editor/impl/src/main/assets/editor/schemes/default/editor.json diff --git a/editor/src/main/assets/editor/schemes/default/java.json b/editor/impl/src/main/assets/editor/schemes/default/java.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/java.json rename to editor/impl/src/main/assets/editor/schemes/default/java.json diff --git a/editor/src/main/assets/editor/schemes/default/json.json b/editor/impl/src/main/assets/editor/schemes/default/json.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/json.json rename to editor/impl/src/main/assets/editor/schemes/default/json.json diff --git a/editor/src/main/assets/editor/schemes/default/kotlin.json b/editor/impl/src/main/assets/editor/schemes/default/kotlin.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/kotlin.json rename to editor/impl/src/main/assets/editor/schemes/default/kotlin.json diff --git a/editor/src/main/assets/editor/schemes/default/log.json b/editor/impl/src/main/assets/editor/schemes/default/log.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/log.json rename to editor/impl/src/main/assets/editor/schemes/default/log.json diff --git a/editor/src/main/assets/editor/schemes/default/scheme.prop b/editor/impl/src/main/assets/editor/schemes/default/scheme.prop similarity index 100% rename from editor/src/main/assets/editor/schemes/default/scheme.prop rename to editor/impl/src/main/assets/editor/schemes/default/scheme.prop diff --git a/editor/src/main/assets/editor/schemes/default/xml.json b/editor/impl/src/main/assets/editor/schemes/default/xml.json similarity index 100% rename from editor/src/main/assets/editor/schemes/default/xml.json rename to editor/impl/src/main/assets/editor/schemes/default/xml.json diff --git a/editor/src/main/assets/editor/treesitter/java/blocks.scm b/editor/impl/src/main/assets/editor/treesitter/java/blocks.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/java/blocks.scm rename to editor/impl/src/main/assets/editor/treesitter/java/blocks.scm diff --git a/editor/src/main/assets/editor/treesitter/java/brackets.scm b/editor/impl/src/main/assets/editor/treesitter/java/brackets.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/java/brackets.scm rename to editor/impl/src/main/assets/editor/treesitter/java/brackets.scm diff --git a/editor/src/main/assets/editor/treesitter/java/highlights.scm b/editor/impl/src/main/assets/editor/treesitter/java/highlights.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/java/highlights.scm rename to editor/impl/src/main/assets/editor/treesitter/java/highlights.scm diff --git a/editor/src/main/assets/editor/treesitter/java/indents.scm b/editor/impl/src/main/assets/editor/treesitter/java/indents.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/java/indents.scm rename to editor/impl/src/main/assets/editor/treesitter/java/indents.scm diff --git a/editor/src/main/assets/editor/treesitter/java/locals.scm b/editor/impl/src/main/assets/editor/treesitter/java/locals.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/java/locals.scm rename to editor/impl/src/main/assets/editor/treesitter/java/locals.scm diff --git a/editor/src/main/assets/editor/treesitter/json/blocks.scm b/editor/impl/src/main/assets/editor/treesitter/json/blocks.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/json/blocks.scm rename to editor/impl/src/main/assets/editor/treesitter/json/blocks.scm diff --git a/editor/src/main/assets/editor/treesitter/json/brackets.scm b/editor/impl/src/main/assets/editor/treesitter/json/brackets.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/json/brackets.scm rename to editor/impl/src/main/assets/editor/treesitter/json/brackets.scm diff --git a/editor/src/main/assets/editor/treesitter/json/highlights.scm b/editor/impl/src/main/assets/editor/treesitter/json/highlights.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/json/highlights.scm rename to editor/impl/src/main/assets/editor/treesitter/json/highlights.scm diff --git a/editor/src/main/assets/editor/treesitter/json/indents.scm b/editor/impl/src/main/assets/editor/treesitter/json/indents.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/json/indents.scm rename to editor/impl/src/main/assets/editor/treesitter/json/indents.scm diff --git a/editor/src/main/assets/editor/treesitter/kt/highlights.scm b/editor/impl/src/main/assets/editor/treesitter/kt/highlights.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/kt/highlights.scm rename to editor/impl/src/main/assets/editor/treesitter/kt/highlights.scm diff --git a/editor/src/main/assets/editor/treesitter/kt/locals.scm b/editor/impl/src/main/assets/editor/treesitter/kt/locals.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/kt/locals.scm rename to editor/impl/src/main/assets/editor/treesitter/kt/locals.scm diff --git a/editor/src/main/assets/editor/treesitter/log/highlights.scm b/editor/impl/src/main/assets/editor/treesitter/log/highlights.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/log/highlights.scm rename to editor/impl/src/main/assets/editor/treesitter/log/highlights.scm diff --git a/editor/src/main/assets/editor/treesitter/xml/blocks.scm b/editor/impl/src/main/assets/editor/treesitter/xml/blocks.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/xml/blocks.scm rename to editor/impl/src/main/assets/editor/treesitter/xml/blocks.scm diff --git a/editor/src/main/assets/editor/treesitter/xml/brackets.scm b/editor/impl/src/main/assets/editor/treesitter/xml/brackets.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/xml/brackets.scm rename to editor/impl/src/main/assets/editor/treesitter/xml/brackets.scm diff --git a/editor/src/main/assets/editor/treesitter/xml/highlights.scm b/editor/impl/src/main/assets/editor/treesitter/xml/highlights.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/xml/highlights.scm rename to editor/impl/src/main/assets/editor/treesitter/xml/highlights.scm diff --git a/editor/src/main/assets/editor/treesitter/xml/indents.scm b/editor/impl/src/main/assets/editor/treesitter/xml/indents.scm similarity index 100% rename from editor/src/main/assets/editor/treesitter/xml/indents.scm rename to editor/impl/src/main/assets/editor/treesitter/xml/indents.scm diff --git a/editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/adapters/CompletionListAdapter.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/CommonCompletionProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/CommonCompletionProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/CommonCompletionProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/CommonCompletionProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/CompletionCancelChecker.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/CompletionCancelChecker.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/CompletionCancelChecker.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/CompletionCancelChecker.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/IDELanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/LSPFormatter.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/LSPFormatter.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/LSPFormatter.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/LSPFormatter.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/cpp/CppAnalyzer.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/cpp/CppAnalyzer.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/cpp/CppAnalyzer.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/cpp/CppAnalyzer.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/cpp/CppLanguage.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/cpp/CppLanguage.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/cpp/CppLanguage.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/cpp/CppLanguage.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAnalyzer.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAnalyzer.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAnalyzer.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAnalyzer.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAutoComplete.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAutoComplete.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAutoComplete.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyAutoComplete.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyLanguage.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyLanguage.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyLanguage.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/groovy/GroovyLanguage.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/BaseIncrementalAnalyzeManager.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/IncrementalToken.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/IncrementalToken.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/incremental/IncrementalToken.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/IncrementalToken.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/incremental/LineState.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/LineState.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/incremental/LineState.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/incremental/LineState.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/newline/BaseNewlineHandler.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/BaseNewlineHandler.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/newline/BaseNewlineHandler.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/BaseNewlineHandler.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/newline/BracketsNewlineHandler.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/BracketsNewlineHandler.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/newline/BracketsNewlineHandler.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/BracketsNewlineHandler.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/newline/CStyleBracketsHandler.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/CStyleBracketsHandler.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/newline/CStyleBracketsHandler.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/CStyleBracketsHandler.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/newline/TSBracketsHandler.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/TSBracketsHandler.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/newline/TSBracketsHandler.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/TSBracketsHandler.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/newline/TSCStyleBracketsHandler.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/TSCStyleBracketsHandler.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/newline/TSCStyleBracketsHandler.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/newline/TSCStyleBracketsHandler.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TSLanguageRegistry.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TSLanguageRegistry.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TSLanguageRegistry.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TSLanguageRegistry.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterAnalyzeManager.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterAnalyzeManager.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterAnalyzeManager.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterAnalyzeManager.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterIndentProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterIndentProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterIndentProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterIndentProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterLanguageSpec.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterSpanFactory.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterSpanFactory.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterSpanFactory.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/TreeSitterSpanFactory.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/common.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/common.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/common.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/common.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/internal/TSLanguageRegistryImpl.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/internal/TSLanguageRegistryImpl.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/internal/TSLanguageRegistryImpl.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/internal/TSLanguageRegistryImpl.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/AnyOfPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/AnyOfPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/AnyOfPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/AnyOfPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/EqualPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/EqualPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/EqualPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/EqualPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/InvertingPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/InvertingPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/InvertingPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/InvertingPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/MatchPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/MatchPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/MatchPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/MatchPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotEqualPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotEqualPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotEqualPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotEqualPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotMatchPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotMatchPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotMatchPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/NotMatchPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/TreeSitterPredicate.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/TreeSitterPredicate.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/TreeSitterPredicate.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/treesitter/predicates/TreeSitterPredicate.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/utils/CommonSymbolPairs.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/utils/CommonSymbolPairs.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/utils/CommonSymbolPairs.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/utils/CommonSymbolPairs.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/utils/CompletionHelper.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/language/utils/CompletionHelper.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/language/utils/CompletionHelper.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/language/utils/CompletionHelper.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/LanguageSpecProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/LanguageSpecProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/LanguageSpecProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/LanguageSpecProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/LocalCaptureSpecProvider.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/LocalCaptureSpecProvider.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/LocalCaptureSpecProvider.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/LocalCaptureSpecProvider.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/EditorSchemeParser.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/EditorSchemeParser.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/EditorSchemeParser.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/EditorSchemeParser.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/LanguageParser.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/LanguageParser.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/LanguageParser.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/LanguageParser.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/ParseException.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/ParseException.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/ParseException.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/ParseException.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/common.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/common.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/common.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/common.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/snippets/AbstractSnippetVariableResolver.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/AbstractSnippetVariableResolver.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/snippets/AbstractSnippetVariableResolver.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/AbstractSnippetVariableResolver.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/snippets/FileVariableResolver.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/FileVariableResolver.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/snippets/FileVariableResolver.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/FileVariableResolver.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/snippets/WorkspaceVariableResolver.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/WorkspaceVariableResolver.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/snippets/WorkspaceVariableResolver.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/snippets/WorkspaceVariableResolver.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/AbstractPopupWindow.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/AbstractPopupWindow.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/AbstractPopupWindow.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/AbstractPopupWindow.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/BaseEditorWindow.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/BaseEditorWindow.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/BaseEditorWindow.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/BaseEditorWindow.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/DiagnosticWindow.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/DiagnosticWindow.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/DiagnosticWindow.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/DiagnosticWindow.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorActionsMenu.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorActionsMenu.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorActionsMenu.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorActionsMenu.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionLayout.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionLayout.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionLayout.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionLayout.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionWindow.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionWindow.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionWindow.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorCompletionWindow.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorEventDispatcher.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorEventDispatcher.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorEventDispatcher.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorEventDispatcher.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorFeatures.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorFeatures.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorFeatures.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorFeatures.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/IDECompletionPublisher.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/IDECompletionPublisher.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/IDECompletionPublisher.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/IDECompletionPublisher.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/IDEEditor.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/IDEEditor.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/IDEEditor.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/IDEEditor.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/ReplaceAction.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/ReplaceAction.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/ReplaceAction.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/ReplaceAction.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/SignatureHelpWindow.java b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/SignatureHelpWindow.java similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/SignatureHelpWindow.java rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/SignatureHelpWindow.java diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/TracingEditorRenderer.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/ui/TracingEditorRenderer.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/ui/TracingEditorRenderer.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/ui/TracingEditorRenderer.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/utils/ContentReadWrite.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/utils/ContentReadWrite.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/utils/ContentReadWrite.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/utils/ContentReadWrite.kt diff --git a/editor/src/main/java/com/itsaky/androidide/editor/utils/contentExt.kt b/editor/impl/src/main/java/com/itsaky/androidide/editor/utils/contentExt.kt similarity index 100% rename from editor/src/main/java/com/itsaky/androidide/editor/utils/contentExt.kt rename to editor/impl/src/main/java/com/itsaky/androidide/editor/utils/contentExt.kt diff --git a/editor/src/main/java/io/github/rosemoe/sora/text/ContentLockAccessor.kt b/editor/impl/src/main/java/io/github/rosemoe/sora/text/ContentLockAccessor.kt similarity index 100% rename from editor/src/main/java/io/github/rosemoe/sora/text/ContentLockAccessor.kt rename to editor/impl/src/main/java/io/github/rosemoe/sora/text/ContentLockAccessor.kt diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt b/editor/impl/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt similarity index 100% rename from editor/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt rename to editor/impl/src/main/java/io/github/rosemoe/sora/widget/IDEEditorSearcher.kt diff --git a/editor/src/main/res/layout/layout_code_editor.xml b/editor/impl/src/main/res/layout/layout_code_editor.xml similarity index 100% rename from editor/src/main/res/layout/layout_code_editor.xml rename to editor/impl/src/main/res/layout/layout_code_editor.xml diff --git a/editor/src/main/res/layout/layout_completion_item.xml b/editor/impl/src/main/res/layout/layout_completion_item.xml similarity index 100% rename from editor/src/main/res/layout/layout_completion_item.xml rename to editor/impl/src/main/res/layout/layout_completion_item.xml diff --git a/editor/src/main/res/layout/layout_editor_find_replace.xml b/editor/impl/src/main/res/layout/layout_editor_find_replace.xml similarity index 100% rename from editor/src/main/res/layout/layout_editor_find_replace.xml rename to editor/impl/src/main/res/layout/layout_editor_find_replace.xml diff --git a/editor/src/main/res/layout/layout_find_in_file.xml b/editor/impl/src/main/res/layout/layout_find_in_file.xml similarity index 100% rename from editor/src/main/res/layout/layout_find_in_file.xml rename to editor/impl/src/main/res/layout/layout_find_in_file.xml diff --git a/editor/src/main/res/layout/layout_popup_menu_item.xml b/editor/impl/src/main/res/layout/layout_popup_menu_item.xml similarity index 100% rename from editor/src/main/res/layout/layout_popup_menu_item.xml rename to editor/impl/src/main/res/layout/layout_popup_menu_item.xml diff --git a/editor/src/main/res/values/dimens.xml b/editor/impl/src/main/res/values/dimens.xml similarity index 100% rename from editor/src/main/res/values/dimens.xml rename to editor/impl/src/main/res/values/dimens.xml diff --git a/editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt b/editor/impl/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt similarity index 100% rename from editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt rename to editor/impl/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt diff --git a/editor/src/test/resources/editor-ref.json b/editor/impl/src/test/resources/editor-ref.json similarity index 100% rename from editor/src/test/resources/editor-ref.json rename to editor/impl/src/test/resources/editor-ref.json diff --git a/editor/src/test/resources/editor.json b/editor/impl/src/test/resources/editor.json similarity index 100% rename from editor/src/test/resources/editor.json rename to editor/impl/src/test/resources/editor.json diff --git a/editor/src/test/resources/java.json b/editor/impl/src/test/resources/java.json similarity index 100% rename from editor/src/test/resources/java.json rename to editor/impl/src/test/resources/java.json diff --git a/editor/src/test/resources/lang-ref-with-object.json b/editor/impl/src/test/resources/lang-ref-with-object.json similarity index 100% rename from editor/src/test/resources/lang-ref-with-object.json rename to editor/impl/src/test/resources/lang-ref-with-object.json diff --git a/editor/src/test/resources/lang-refs.json b/editor/impl/src/test/resources/lang-refs.json similarity index 100% rename from editor/src/test/resources/lang-refs.json rename to editor/impl/src/test/resources/lang-refs.json diff --git a/editor/src/test/resources/log.json b/editor/impl/src/test/resources/log.json similarity index 100% rename from editor/src/test/resources/log.json rename to editor/impl/src/test/resources/log.json diff --git a/editor/src/test/resources/syntax.json b/editor/impl/src/test/resources/syntax.json similarity index 100% rename from editor/src/test/resources/syntax.json rename to editor/impl/src/test/resources/syntax.json diff --git a/lexers/.gitignore b/editor/lexers/.gitignore similarity index 100% rename from lexers/.gitignore rename to editor/lexers/.gitignore diff --git a/lexers/build.gradle.kts b/editor/lexers/build.gradle.kts similarity index 93% rename from lexers/build.gradle.kts rename to editor/lexers/build.gradle.kts index 03c8d35d2..d6037a14a 100755 --- a/lexers/build.gradle.kts +++ b/editor/lexers/build.gradle.kts @@ -27,6 +27,10 @@ apply { plugin(LexerGeneratorPlugin::class.java) } +groupConfig { + groupIdSuffix.set("core") +} + java { sourceCompatibility = BuildConfig.javaVersion targetCompatibility = BuildConfig.javaVersion diff --git a/lexers/proguard-rules.pro b/editor/lexers/proguard-rules.pro similarity index 100% rename from lexers/proguard-rules.pro rename to editor/lexers/proguard-rules.pro diff --git a/lexers/src/main/.gitignore b/editor/lexers/src/main/.gitignore similarity index 100% rename from lexers/src/main/.gitignore rename to editor/lexers/src/main/.gitignore diff --git a/lexers/src/main/AndroidManifest.xml b/editor/lexers/src/main/AndroidManifest.xml similarity index 100% rename from lexers/src/main/AndroidManifest.xml rename to editor/lexers/src/main/AndroidManifest.xml diff --git a/lexers/src/main/README.md b/editor/lexers/src/main/README.md similarity index 100% rename from lexers/src/main/README.md rename to editor/lexers/src/main/README.md diff --git a/lexers/src/main/antlr/cpp/CPP14Lexer.g4 b/editor/lexers/src/main/antlr/cpp/CPP14Lexer.g4 similarity index 100% rename from lexers/src/main/antlr/cpp/CPP14Lexer.g4 rename to editor/lexers/src/main/antlr/cpp/CPP14Lexer.g4 diff --git a/lexers/src/main/antlr/cpp/CPP14Parser.g4 b/editor/lexers/src/main/antlr/cpp/CPP14Parser.g4 similarity index 100% rename from lexers/src/main/antlr/cpp/CPP14Parser.g4 rename to editor/lexers/src/main/antlr/cpp/CPP14Parser.g4 diff --git a/lexers/src/main/antlr/groovy/GroovyLexer.g4 b/editor/lexers/src/main/antlr/groovy/GroovyLexer.g4 similarity index 100% rename from lexers/src/main/antlr/groovy/GroovyLexer.g4 rename to editor/lexers/src/main/antlr/groovy/GroovyLexer.g4 diff --git a/lexers/src/main/antlr/java/JavaLexer.g4 b/editor/lexers/src/main/antlr/java/JavaLexer.g4 similarity index 100% rename from lexers/src/main/antlr/java/JavaLexer.g4 rename to editor/lexers/src/main/antlr/java/JavaLexer.g4 diff --git a/lexers/src/main/antlr/java/JavaParser.g4 b/editor/lexers/src/main/antlr/java/JavaParser.g4 similarity index 100% rename from lexers/src/main/antlr/java/JavaParser.g4 rename to editor/lexers/src/main/antlr/java/JavaParser.g4 diff --git a/lexers/src/main/antlr/javadoc/JavadocLexer.g4 b/editor/lexers/src/main/antlr/javadoc/JavadocLexer.g4 similarity index 100% rename from lexers/src/main/antlr/javadoc/JavadocLexer.g4 rename to editor/lexers/src/main/antlr/javadoc/JavadocLexer.g4 diff --git a/lexers/src/main/antlr/javadoc/JavadocParser.g4 b/editor/lexers/src/main/antlr/javadoc/JavadocParser.g4 similarity index 100% rename from lexers/src/main/antlr/javadoc/JavadocParser.g4 rename to editor/lexers/src/main/antlr/javadoc/JavadocParser.g4 diff --git a/lexers/src/main/antlr/kotlin/KotlinLexer.g4 b/editor/lexers/src/main/antlr/kotlin/KotlinLexer.g4 similarity index 100% rename from lexers/src/main/antlr/kotlin/KotlinLexer.g4 rename to editor/lexers/src/main/antlr/kotlin/KotlinLexer.g4 diff --git a/lexers/src/main/antlr/kotlin/KotlinParser.g4 b/editor/lexers/src/main/antlr/kotlin/KotlinParser.g4 similarity index 100% rename from lexers/src/main/antlr/kotlin/KotlinParser.g4 rename to editor/lexers/src/main/antlr/kotlin/KotlinParser.g4 diff --git a/lexers/src/main/antlr/kotlin/UnicodeClasses.g4 b/editor/lexers/src/main/antlr/kotlin/UnicodeClasses.g4 similarity index 100% rename from lexers/src/main/antlr/kotlin/UnicodeClasses.g4 rename to editor/lexers/src/main/antlr/kotlin/UnicodeClasses.g4 diff --git a/lexers/src/main/antlr/xml/XMLLexer.g4 b/editor/lexers/src/main/antlr/xml/XMLLexer.g4 similarity index 100% rename from lexers/src/main/antlr/xml/XMLLexer.g4 rename to editor/lexers/src/main/antlr/xml/XMLLexer.g4 diff --git a/lexers/src/main/antlr/xml/XMLParser.g4 b/editor/lexers/src/main/antlr/xml/XMLParser.g4 similarity index 100% rename from lexers/src/main/antlr/xml/XMLParser.g4 rename to editor/lexers/src/main/antlr/xml/XMLParser.g4 diff --git a/lexers/src/test/java/com/itsaky/androidide/lexers/BaseLexerTest.kt b/editor/lexers/src/test/java/com/itsaky/androidide/lexers/BaseLexerTest.kt similarity index 100% rename from lexers/src/test/java/com/itsaky/androidide/lexers/BaseLexerTest.kt rename to editor/lexers/src/test/java/com/itsaky/androidide/lexers/BaseLexerTest.kt diff --git a/lexers/src/test/java/com/itsaky/androidide/lexers/xml/XMLLexerTest.kt b/editor/lexers/src/test/java/com/itsaky/androidide/lexers/xml/XMLLexerTest.kt similarity index 100% rename from lexers/src/test/java/com/itsaky/androidide/lexers/xml/XMLLexerTest.kt rename to editor/lexers/src/test/java/com/itsaky/androidide/lexers/xml/XMLLexerTest.kt diff --git a/gradle-plugin/.gitignore b/editor/treesitter/.gitignore similarity index 100% rename from gradle-plugin/.gitignore rename to editor/treesitter/.gitignore diff --git a/editor-treesitter/README.md b/editor/treesitter/README.md similarity index 100% rename from editor-treesitter/README.md rename to editor/treesitter/README.md diff --git a/editor-treesitter/build.gradle.kts b/editor/treesitter/build.gradle.kts similarity index 91% rename from editor-treesitter/build.gradle.kts rename to editor/treesitter/build.gradle.kts index c8f8525ff..30238d47a 100644 --- a/editor-treesitter/build.gradle.kts +++ b/editor/treesitter/build.gradle.kts @@ -27,6 +27,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("core") +} + android { namespace = "io.github.rosemoe.sora.ts" } @@ -39,7 +43,7 @@ dependencies { } api(libs.androidx.collection) - api(projects.common) - api(projects.editorApi) - api(projects.logger) + api(projects.core.common) + api(projects.editor.api) + api(projects.logging.logger) } diff --git a/lsp/java/consumer-rules.pro b/editor/treesitter/consumer-rules.pro similarity index 100% rename from lsp/java/consumer-rules.pro rename to editor/treesitter/consumer-rules.pro diff --git a/lsp/api/proguard-rules.pro b/editor/treesitter/proguard-rules.pro similarity index 100% rename from lsp/api/proguard-rules.pro rename to editor/treesitter/proguard-rules.pro diff --git a/editor-treesitter/src/main/AndroidManifest.xml b/editor/treesitter/src/main/AndroidManifest.xml similarity index 100% rename from editor-treesitter/src/main/AndroidManifest.xml rename to editor/treesitter/src/main/AndroidManifest.xml diff --git a/editor-treesitter/src/main/java/com/itsaky/androidide/treesitter/nodeExt.kt b/editor/treesitter/src/main/java/com/itsaky/androidide/treesitter/nodeExt.kt similarity index 100% rename from editor-treesitter/src/main/java/com/itsaky/androidide/treesitter/nodeExt.kt rename to editor/treesitter/src/main/java/com/itsaky/androidide/treesitter/nodeExt.kt diff --git a/editor-treesitter/src/main/java/com/itsaky/androidide/treesitter/pointExt.kt b/editor/treesitter/src/main/java/com/itsaky/androidide/treesitter/pointExt.kt similarity index 100% rename from editor-treesitter/src/main/java/com/itsaky/androidide/treesitter/pointExt.kt rename to editor/treesitter/src/main/java/com/itsaky/androidide/treesitter/pointExt.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LineSpansGenerator.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LineSpansGenerator.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LineSpansGenerator.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LineSpansGenerator.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LocalsCaptureSpec.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LocalsCaptureSpec.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LocalsCaptureSpec.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/LocalsCaptureSpec.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeManager.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeManager.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeManager.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeManager.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeWorker.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeWorker.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeWorker.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsAnalyzeWorker.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsBracketPairs.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsBracketPairs.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsBracketPairs.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsBracketPairs.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguage.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguage.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguage.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguage.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguageSpec.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguageSpec.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguageSpec.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsLanguageSpec.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsScopedVariables.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsScopedVariables.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsScopedVariables.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsScopedVariables.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTextDocument.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTextDocument.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTextDocument.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTextDocument.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTheme.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTheme.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTheme.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/TsTheme.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/Utils.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/Utils.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/Utils.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/Utils.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/LanguagePriorityCheck.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/LanguagePriorityCheck.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/LanguagePriorityCheck.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/LanguagePriorityCheck.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsIndentHelper.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsIndentHelper.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsIndentHelper.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsIndentHelper.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsInjectableLanguageSpec.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsInjectableLanguageSpec.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsInjectableLanguageSpec.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/multilang/TsInjectableLanguageSpec.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/PredicateResult.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/PredicateResult.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/PredicateResult.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/PredicateResult.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/Predicator.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/Predicator.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/Predicator.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/Predicator.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsClientPredicateStep.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsClientPredicateStep.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsClientPredicateStep.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsClientPredicateStep.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsPredicate.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsPredicate.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsPredicate.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsPredicate.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCapture.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCapture.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCapture.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCapture.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCaptureContainer.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCaptureContainer.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCaptureContainer.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/TsSyntheticCaptureContainer.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/MatchPredicate.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/MatchPredicate.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/MatchPredicate.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/MatchPredicate.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/SetCapturePredicate.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/SetCapturePredicate.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/SetCapturePredicate.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/SetCapturePredicate.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/Utils.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/Utils.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/Utils.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/predicate/builtin/Utils.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/DefaultSpanFactory.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/DefaultSpanFactory.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/DefaultSpanFactory.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/DefaultSpanFactory.kt diff --git a/editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/TsSpanFactory.kt b/editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/TsSpanFactory.kt similarity index 100% rename from editor-treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/TsSpanFactory.kt rename to editor/treesitter/src/main/java/io/github/rosemoe/sora/editor/ts/spans/TsSpanFactory.kt diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/.gitignore b/event/eventbus-android/.gitignore similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/.gitignore rename to event/eventbus-android/.gitignore diff --git a/eventbus-android/build.gradle.kts b/event/eventbus-android/build.gradle.kts similarity index 91% rename from eventbus-android/build.gradle.kts rename to event/eventbus-android/build.gradle.kts index 9de17e7f7..ab284652e 100644 --- a/eventbus-android/build.gradle.kts +++ b/event/eventbus-android/build.gradle.kts @@ -22,10 +22,14 @@ plugins { id("org.jetbrains.kotlin.android") } +groupConfig { + groupIdSuffix.set("event") +} + android { namespace = "${BuildConfig.packageName}.eventbus.android" } dependencies { - api(projects.eventbus) + api(projects.event.eventbus) } diff --git a/lsp/models/consumer-rules.pro b/event/eventbus-android/consumer-rules.pro similarity index 100% rename from lsp/models/consumer-rules.pro rename to event/eventbus-android/consumer-rules.pro diff --git a/eventbus-android/proguard-rules.pro b/event/eventbus-android/proguard-rules.pro similarity index 100% rename from eventbus-android/proguard-rules.pro rename to event/eventbus-android/proguard-rules.pro diff --git a/eventbus-android/src/main/AndroidManifest.xml b/event/eventbus-android/src/main/AndroidManifest.xml similarity index 100% rename from eventbus-android/src/main/AndroidManifest.xml rename to event/eventbus-android/src/main/AndroidManifest.xml diff --git a/eventbus-android/src/main/java/org/greenrobot/eventbus/HandlerPoster.java b/event/eventbus-android/src/main/java/org/greenrobot/eventbus/HandlerPoster.java similarity index 100% rename from eventbus-android/src/main/java/org/greenrobot/eventbus/HandlerPoster.java rename to event/eventbus-android/src/main/java/org/greenrobot/eventbus/HandlerPoster.java diff --git a/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidComponentsImpl.java b/event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidComponentsImpl.java similarity index 100% rename from eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidComponentsImpl.java rename to event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidComponentsImpl.java diff --git a/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidLogger.java b/event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidLogger.java similarity index 100% rename from eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidLogger.java rename to event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/AndroidLogger.java diff --git a/eventbus-android/src/main/java/org/greenrobot/eventbus/android/DefaultAndroidMainThreadSupport.java b/event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/DefaultAndroidMainThreadSupport.java similarity index 100% rename from eventbus-android/src/main/java/org/greenrobot/eventbus/android/DefaultAndroidMainThreadSupport.java rename to event/eventbus-android/src/main/java/org/greenrobot/eventbus/android/DefaultAndroidMainThreadSupport.java diff --git a/idestats/.gitignore b/event/eventbus-events/.gitignore similarity index 100% rename from idestats/.gitignore rename to event/eventbus-events/.gitignore diff --git a/eventbus-events/build.gradle.kts b/event/eventbus-events/build.gradle.kts similarity index 84% rename from eventbus-events/build.gradle.kts rename to event/eventbus-events/build.gradle.kts index f256d2981..25253782b 100644 --- a/eventbus-events/build.gradle.kts +++ b/event/eventbus-events/build.gradle.kts @@ -22,14 +22,18 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("event") +} + android { namespace = "${BuildConfig.packageName}.eventbus.events" } dependencies { implementation(libs.common.kotlin) - implementation(projects.shared) - implementation(projects.logger) - - api(projects.eventbus) + implementation(projects.logging.logger) + implementation(projects.utilities.shared) + + api(projects.event.eventbus) } \ No newline at end of file diff --git a/eventbus-events/src/main/AndroidManifest.xml b/event/eventbus-events/src/main/AndroidManifest.xml similarity index 100% rename from eventbus-events/src/main/AndroidManifest.xml rename to event/eventbus-events/src/main/AndroidManifest.xml diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/Event.java b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/Event.java similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/Event.java rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/Event.java diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/EventReceiver.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/EventReceiver.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/EventReceiver.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/EventReceiver.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/ActivityLifecycleEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/ActivityLifecycleEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/ActivityLifecycleEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/ActivityLifecycleEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/DocumentEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/DocumentEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/DocumentEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/DocumentEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/EditorEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/EditorEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/EditorEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/editor/EditorEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/file/FileEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/file/FileEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/file/FileEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/file/FileEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/filetree/FileTreeEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/filetree/FileTreeEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/filetree/FileTreeEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/filetree/FileTreeEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/preferences/PreferenceEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/preferences/PreferenceEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/preferences/PreferenceEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/preferences/PreferenceEvents.kt diff --git a/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/project/ProjectEvents.kt b/event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/project/ProjectEvents.kt similarity index 100% rename from eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/project/ProjectEvents.kt rename to event/eventbus-events/src/main/java/com/itsaky/androidide/eventbus/events/project/ProjectEvents.kt diff --git a/logger/.gitignore b/event/eventbus/.gitignore similarity index 100% rename from logger/.gitignore rename to event/eventbus/.gitignore diff --git a/subprojects/tooling-api-events/build.gradle.kts b/event/eventbus/build.gradle.kts similarity index 94% rename from subprojects/tooling-api-events/build.gradle.kts rename to event/eventbus/build.gradle.kts index 77f419531..19407efde 100644 --- a/subprojects/tooling-api-events/build.gradle.kts +++ b/event/eventbus/build.gradle.kts @@ -1,26 +1,30 @@ -/* - * This file is part of AndroidIDE. - * - * AndroidIDE is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * AndroidIDE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with AndroidIDE. If not, see . - */ - -@Suppress("JavaPluginLanguageLevel") -plugins { - id("java-library") - id("org.jetbrains.kotlin.jvm") -} - -dependencies { - implementation(libs.common.jkotlin) +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +@Suppress("JavaPluginLanguageLevel") +plugins { + id("java-library") + id("org.jetbrains.kotlin.jvm") +} + +groupConfig { + groupIdSuffix.set("event") +} + +dependencies { + implementation(libs.common.jkotlin) } \ No newline at end of file diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/AsyncPoster.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/AsyncPoster.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/AsyncPoster.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/AsyncPoster.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/BackgroundPoster.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/BackgroundPoster.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/BackgroundPoster.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/BackgroundPoster.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/EventBus.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/EventBus.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/EventBus.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/EventBus.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/EventBusBuilder.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/EventBusBuilder.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/EventBusBuilder.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/EventBusBuilder.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/EventBusException.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/EventBusException.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/EventBusException.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/EventBusException.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/Logger.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/Logger.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/Logger.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/Logger.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/MainThreadSupport.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/MainThreadSupport.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/MainThreadSupport.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/MainThreadSupport.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/NoSubscriberEvent.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/NoSubscriberEvent.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/NoSubscriberEvent.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/NoSubscriberEvent.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/PendingPost.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/PendingPost.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/PendingPost.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/PendingPost.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/PendingPostQueue.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/PendingPostQueue.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/PendingPostQueue.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/PendingPostQueue.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/Poster.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/Poster.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/Poster.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/Poster.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/Subscribe.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/Subscribe.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/Subscribe.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/Subscribe.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberExceptionEvent.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberExceptionEvent.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/SubscriberExceptionEvent.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberExceptionEvent.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethod.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethod.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethod.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethod.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/SubscriberMethodFinder.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/Subscription.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/Subscription.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/Subscription.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/Subscription.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/ThreadMode.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/ThreadMode.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/ThreadMode.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/ThreadMode.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidComponents.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidComponents.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidComponents.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidComponents.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidDependenciesDetector.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidDependenciesDetector.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidDependenciesDetector.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/android/AndroidDependenciesDetector.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/meta/AbstractSubscriberInfo.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/meta/AbstractSubscriberInfo.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/meta/AbstractSubscriberInfo.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/meta/AbstractSubscriberInfo.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/meta/SimpleSubscriberInfo.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SimpleSubscriberInfo.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/meta/SimpleSubscriberInfo.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SimpleSubscriberInfo.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfo.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfo.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfo.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfo.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfoIndex.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfoIndex.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfoIndex.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberInfoIndex.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberMethodInfo.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberMethodInfo.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberMethodInfo.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/meta/SubscriberMethodInfo.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/util/AsyncExecutor.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/util/AsyncExecutor.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/util/AsyncExecutor.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/util/AsyncExecutor.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/util/ExceptionToResourceMapping.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/util/ExceptionToResourceMapping.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/util/ExceptionToResourceMapping.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/util/ExceptionToResourceMapping.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/util/HasExecutionScope.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/util/HasExecutionScope.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/util/HasExecutionScope.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/util/HasExecutionScope.java diff --git a/eventbus/src/main/java/org/greenrobot/eventbus/util/ThrowableFailureEvent.java b/event/eventbus/src/main/java/org/greenrobot/eventbus/util/ThrowableFailureEvent.java similarity index 100% rename from eventbus/src/main/java/org/greenrobot/eventbus/util/ThrowableFailureEvent.java rename to event/eventbus/src/main/java/org/greenrobot/eventbus/util/ThrowableFailureEvent.java diff --git a/logsender-sample/.gitignore b/java/javac-services/.gitignore similarity index 100% rename from logsender-sample/.gitignore rename to java/javac-services/.gitignore diff --git a/subprojects/javac-services/build.gradle.kts b/java/javac-services/build.gradle.kts similarity index 81% rename from subprojects/javac-services/build.gradle.kts rename to java/javac-services/build.gradle.kts index 7d909b88b..f65050d26 100644 --- a/subprojects/javac-services/build.gradle.kts +++ b/java/javac-services/build.gradle.kts @@ -5,6 +5,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("java") +} + android { namespace = "${BuildConfig.packageName}.javac.services" @@ -16,13 +20,14 @@ android { } dependencies { + api(libs.composite.javac) + implementation(libs.common.kotlin) implementation(libs.common.utilcode) implementation(libs.google.guava) - implementation(projects.common) - implementation(projects.logger) - - api(libs.composite.javac) + + implementation(projects.core.common) + implementation(projects.logging.logger) testImplementation(libs.tests.junit) testImplementation(libs.tests.google.truth) diff --git a/subprojects/javac-services/src/main/AndroidManifest.xml b/java/javac-services/src/main/AndroidManifest.xml similarity index 100% rename from subprojects/javac-services/src/main/AndroidManifest.xml rename to java/javac-services/src/main/AndroidManifest.xml diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelAbort.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelAbort.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelAbort.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelAbort.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelService.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelService.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelService.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/CancelService.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBAttr.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBAttr.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBAttr.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBAttr.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassFinder.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassReader.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassWriter.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassWriter.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassWriter.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBClassWriter.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBEnter.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBEnter.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBEnter.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBEnter.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavaCompiler.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavaCompiler.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavaCompiler.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavaCompiler.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBJavacTrees.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBLog.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBMemberEnter.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBMemberEnter.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBMemberEnter.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBMemberEnter.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBNames.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBNames.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBNames.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBNames.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBResolve.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBResolve.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBResolve.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBResolve.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBTreeMaker.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBTreeMaker.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBTreeMaker.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBTreeMaker.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/CancelServiceImpl.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/CancelServiceImpl.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/CancelServiceImpl.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/CancelServiceImpl.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/JavacFlowListener.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableBorrow.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableBorrow.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableBorrow.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableBorrow.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableCompiler.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableContext.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableJavaCompiler.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableJavaCompiler.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableJavaCompiler.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableJavaCompiler.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/compiler/ReusableLog.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/AndroidFsProviderImpl.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/AndroidFsProviderImpl.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/AndroidFsProviderImpl.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/AndroidFsProviderImpl.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CacheFSInfoSingleton.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CacheFSInfoSingleton.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CacheFSInfoSingleton.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CacheFSInfoSingleton.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachedJarFileSystem.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachingJarFileSystemProvider.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachingJarFileSystemProvider.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachingJarFileSystemProvider.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/CachingJarFileSystemProvider.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/JarPackageProviderImpl.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/JarPackageProviderImpl.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/JarPackageProviderImpl.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/fs/JarPackageProviderImpl.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/CompilationInfo.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/DiagnosticListenerImpl.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparser.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparser.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparser.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparser.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparserImpl.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparserImpl.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparserImpl.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/PartialReparserImpl.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/partial/RichDiagnostic.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/JavaDiagnosticUtils.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/ReparserUtils.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/ReparserUtils.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/ReparserUtils.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/util/ReparserUtils.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/ErrorAwareTreeScanner.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/ErrorAwareTreeScanner.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/ErrorAwareTreeScanner.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/ErrorAwareTreeScanner.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/FindAnonymousVisitor.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/FindAnonymousVisitor.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/FindAnonymousVisitor.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/FindAnonymousVisitor.kt diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/TranslateMethodPositionsVisitor.java b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/TranslateMethodPositionsVisitor.java similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/TranslateMethodPositionsVisitor.java rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/TranslateMethodPositionsVisitor.java diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/UnEnter.kt b/java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/UnEnter.kt similarity index 100% rename from subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/UnEnter.kt rename to java/javac-services/src/main/java/com/itsaky/androidide/javac/services/visitors/UnEnter.kt diff --git a/logsender/.gitignore b/java/lsp/.gitignore similarity index 100% rename from logsender/.gitignore rename to java/lsp/.gitignore diff --git a/lsp/java/build.gradle.kts b/java/lsp/build.gradle.kts similarity index 73% rename from lsp/java/build.gradle.kts rename to java/lsp/build.gradle.kts index 108454305..40389a976 100644 --- a/lsp/java/build.gradle.kts +++ b/java/lsp/build.gradle.kts @@ -24,6 +24,10 @@ plugins { id("realm-android") } +groupConfig { + groupIdSuffix.set("event") +} + android { namespace = "${BuildConfig.packageName}.lsp.java" @@ -41,7 +45,7 @@ kapt { } dependencies { - kapt(projects.annotationProcessors) + kapt(projects.annotation.processors) implementation(libs.androidide.ts) implementation(libs.androidide.ts.java) @@ -54,13 +58,13 @@ dependencies { implementation(libs.google.gson) implementation(libs.google.material) - implementation(projects.actions) - implementation(projects.common) - implementation(projects.editorApi) - implementation(projects.resources) - implementation(projects.lsp.api) - implementation(projects.subprojects.indexing) - implementation(projects.subprojects.javacServices) + implementation(projects.core.actions) + implementation(projects.core.common) + implementation(projects.core.indexing) + implementation(projects.core.lspApi) + implementation(projects.core.resources) + implementation(projects.editor.api) + implementation(projects.java.javacServices) implementation(libs.composite.javac) implementation(libs.composite.javapoet) @@ -71,9 +75,9 @@ dependencies { implementation(libs.androidx.core.ktx) implementation(libs.common.kotlin) - testImplementation(projects.subprojects.testingCommon) - testImplementation(projects.subprojects.testingLsp) - androidTestImplementation(projects.subprojects.testingAndroid) - androidTestImplementation(projects.common) - androidTestImplementation(projects.shared) + testImplementation(projects.testing.commonTest) + testImplementation(projects.testing.lspTest) + + androidTestImplementation(projects.testing.androidTest) + androidTestImplementation(projects.utilities.shared) } \ No newline at end of file diff --git a/lsp/xml/consumer-rules.pro b/java/lsp/consumer-rules.pro similarity index 100% rename from lsp/xml/consumer-rules.pro rename to java/lsp/consumer-rules.pro diff --git a/lsp/java/proguard-rules.pro b/java/lsp/proguard-rules.pro similarity index 100% rename from lsp/java/proguard-rules.pro rename to java/lsp/proguard-rules.pro diff --git a/lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt similarity index 100% rename from lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaClassCRUDTest.kt diff --git a/lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexerTest.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexerTest.kt similarity index 100% rename from lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexerTest.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexerTest.kt diff --git a/lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt similarity index 100% rename from lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/ModelBuilder.kt diff --git a/lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/SharedModelCRUDTest.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/SharedModelCRUDTest.kt similarity index 100% rename from lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/SharedModelCRUDTest.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/SharedModelCRUDTest.kt diff --git a/lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/crudExts.kt b/java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/crudExts.kt similarity index 100% rename from lsp/java/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/crudExts.kt rename to java/lsp/src/androidTest/java/com/itsaky/androidide/lsp/java/indexing/crudExts.kt diff --git a/lsp/java/src/main/AndroidManifest.xml b/java/lsp/src/main/AndroidManifest.xml similarity index 100% rename from lsp/java/src/main/AndroidManifest.xml rename to java/lsp/src/main/AndroidManifest.xml diff --git a/lsp/java/src/main/assets/data/editor/java/snippets.global.json b/java/lsp/src/main/assets/data/editor/java/snippets.global.json similarity index 100% rename from lsp/java/src/main/assets/data/editor/java/snippets.global.json rename to java/lsp/src/main/assets/data/editor/java/snippets.global.json diff --git a/lsp/java/src/main/assets/data/editor/java/snippets.local.json b/java/lsp/src/main/assets/data/editor/java/snippets.local.json similarity index 100% rename from lsp/java/src/main/assets/data/editor/java/snippets.local.json rename to java/lsp/src/main/assets/data/editor/java/snippets.local.json diff --git a/lsp/java/src/main/assets/data/editor/java/snippets.member.json b/java/lsp/src/main/assets/data/editor/java/snippets.member.json similarity index 100% rename from lsp/java/src/main/assets/data/editor/java/snippets.member.json rename to java/lsp/src/main/assets/data/editor/java/snippets.member.json diff --git a/lsp/java/src/main/assets/data/editor/java/snippets.top-level.json b/java/lsp/src/main/assets/data/editor/java/snippets.top-level.json similarity index 100% rename from lsp/java/src/main/assets/data/editor/java/snippets.top-level.json rename to java/lsp/src/main/assets/data/editor/java/snippets.top-level.json diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/CompilationCancellationException.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/CompilationCancellationException.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/CompilationCancellationException.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/CompilationCancellationException.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/JavaCompilerProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/JavaCompilerProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/JavaCompilerProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/JavaCompilerProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/JavaLanguageServer.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/JavaLanguageServer.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/JavaLanguageServer.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/JavaLanguageServer.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/BaseJavaCodeAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/BaseJavaCodeAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/BaseJavaCodeAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/BaseJavaCodeAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/FieldBasedAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/JavaCodeActionsMenu.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/JavaCodeActionsMenu.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/JavaCodeActionsMenu.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/JavaCodeActionsMenu.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/CommentAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/CommentAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/CommentAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/CommentAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/FindReferencesAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/FindReferencesAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/FindReferencesAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/FindReferencesAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/GoToDefinitionAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/GoToDefinitionAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/GoToDefinitionAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/GoToDefinitionAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/OrganizeImportsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/OrganizeImportsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/OrganizeImportsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/OrganizeImportsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/RemoveUnusedImportsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/RemoveUnusedImportsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/RemoveUnusedImportsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/RemoveUnusedImportsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/UncommentAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/UncommentAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/common/UncommentAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/common/UncommentAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddImportAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddThrowsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddThrowsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddThrowsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AddThrowsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AutoFixImportsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AutoFixImportsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AutoFixImportsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/AutoFixImportsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/CreateMissingMethodAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/FieldToBlockAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/FieldToBlockAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/FieldToBlockAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/FieldToBlockAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/ImplementAbstractMethodsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveClassAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveClassAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveClassAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveClassAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveMethodAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveMethodAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveMethodAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveMethodAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/RemoveUnusedThrowsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/SuppressUncheckedWarningAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/VariableToStatementAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/VariableToStatementAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/VariableToStatementAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/diagnostics/VariableToStatementAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateConstructorAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateConstructorAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateConstructorAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateConstructorAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateMissingConstructorAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateMissingConstructorAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateMissingConstructorAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateMissingConstructorAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateSettersAndGettersAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/GenerateToStringMethodAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/actions/generators/OverrideSuperclassMethodsAction.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilationTaskProcessor.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilationTaskProcessor.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilationTaskProcessor.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilationTaskProcessor.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileBatch.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompileTask.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/CompilerProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/DefaultCompilationTaskProcessor.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/DefaultCompilationTaskProcessor.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/DefaultCompilationTaskProcessor.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/DefaultCompilationTaskProcessor.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JCReusableCompiler.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JCReusableCompiler.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JCReusableCompiler.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JCReusableCompiler.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerConfig.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerConfig.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerConfig.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerConfig.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerImpl.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerImpl.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerImpl.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerImpl.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/JavaCompilerService.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileManager.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SourceFileObject.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SynchronizedTask.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SynchronizedTask.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/compiler/SynchronizedTask.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/compiler/SynchronizedTask.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/AdvancedJavaEditHandler.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/AdvancedJavaEditHandler.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/AdvancedJavaEditHandler.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/AdvancedJavaEditHandler.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/BaseJavaEditHandler.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/BaseJavaEditHandler.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/BaseJavaEditHandler.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/BaseJavaEditHandler.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/ClassImportEditHandler.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/ClassImportEditHandler.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/ClassImportEditHandler.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/ClassImportEditHandler.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/MultipleClassImportEditHandler.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/MultipleClassImportEditHandler.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/edits/MultipleClassImportEditHandler.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/edits/MultipleClassImportEditHandler.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/ICloneable.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/ICloneable.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/ICloneable.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/ICloneable.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaIndexable.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaIndexable.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaIndexable.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaIndexable.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaSymbol.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaSymbol.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaSymbol.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaSymbol.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaType.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaType.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaType.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/IJavaType.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/ISharedJavaIndexable.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/ISharedJavaIndexable.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/ISharedJavaIndexable.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/ISharedJavaIndexable.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexer.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexer.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexer.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexer.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaJarModelBuilder.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaJarModelBuilder.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaJarModelBuilder.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/JavaJarModelBuilder.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfo.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfo.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfo.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfo.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParser.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParser.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParser.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParser.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/AnnotationElement.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/AnnotationElement.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/AnnotationElement.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/AnnotationElement.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaAnnotation.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaAnnotation.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaAnnotation.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaAnnotation.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaClass.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaClass.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaClass.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaClass.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaConstant.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaConstant.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaConstant.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaConstant.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaEnum.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaEnum.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaEnum.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaEnum.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaField.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaField.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaField.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaField.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaIndexingRealmModule.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaIndexingRealmModule.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaIndexingRealmModule.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaIndexingRealmModule.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaInterface.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaInterface.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaInterface.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaInterface.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaMethod.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaMethod.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaMethod.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaMethod.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaType.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaType.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaType.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/JavaType.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/annotationElementValues.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/annotationElementValues.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/annotationElementValues.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/indexing/classfile/annotationElementValues.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/CompilationRequest.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/DiagnosticCode.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/DiagnosticCode.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/DiagnosticCode.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/DiagnosticCode.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaCompletionItem.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaCompletionItem.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaCompletionItem.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaCompletionItem.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerConfiguration.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerConfiguration.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerConfiguration.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerConfiguration.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerSettings.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerSettings.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerSettings.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/JavaServerSettings.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/PartialReparseRequest.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/PartialReparseRequest.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/models/PartialReparseRequest.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/models/PartialReparseRequest.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/IJavaParser.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/IJavaParser.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/IJavaParser.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/IJavaParser.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ParseTask.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ParseTask.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ParseTask.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ParseTask.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/Parser.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSJavaParser.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSMethodPruner.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseCache.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseCache.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseCache.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseCache.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseResult.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseResult.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseResult.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/parser/ts/TSParseResult.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/BaseJavaServiceProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/BaseJavaServiceProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/BaseJavaServiceProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/BaseJavaServiceProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CancelableServiceProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CancelableServiceProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CancelableServiceProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CancelableServiceProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CodeFormatProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CodeFormatProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CodeFormatProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CodeFormatProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CompletionProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CompletionProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/CompletionProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/CompletionProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/DefinitionProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/DiagnosticsProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaDiagnosticProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaDiagnosticProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaDiagnosticProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaDiagnosticProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/ReferenceProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/SignatureProvider.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ClassNamesCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ClassNamesCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ClassNamesCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ClassNamesCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IJavaCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IdentifierCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IdentifierCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IdentifierCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/IdentifierCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ImportCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/KeywordCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/KeywordCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/KeywordCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/KeywordCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberReferenceCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/MemberSelectCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/ScopeCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SnippetCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SnippetCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SnippetCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SnippetCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/StaticImportCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/completion/SwitchConstantCompletionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/ErroneousDefinitionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/IJavaDefinitionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/LocalDefinitionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/definition/RemoteDefinitionProvider.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetRepository.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetRepository.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetRepository.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetRepository.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetScope.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetScope.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetScope.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/providers/snippet/JavaSnippetScope.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddException.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddImport.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddImport.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddImport.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddImport.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/AddSuppressWarningAnnotation.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertFieldToBlock.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertVariableToStatement.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertVariableToStatement.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertVariableToStatement.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ConvertVariableToStatement.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/CreateMissingMethod.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/GenerateRecordConstructor.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/ImplementAbstractMethods.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveClass.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveClass.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveClass.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveClass.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveException.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/RemoveMethod.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/Rewrite.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/Rewrite.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/rewrite/Rewrite.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/rewrite/Rewrite.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ASTFixer.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ASTFixer.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ASTFixer.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ASTFixer.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/AnalyzeTimer.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/AnalyzeTimer.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/AnalyzeTimer.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/AnalyzeTimer.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CancelChecker.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/CancelChecker.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CancelChecker.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/CancelChecker.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/CodeActionUtils.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/DescriptorUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/DescriptorUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/DescriptorUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/DescriptorUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/EditHelper.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/Extractors.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/Extractors.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/Extractors.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/Extractors.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/FindHelper.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaParserUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/JavaPoetUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MarkdownHelper.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/MarkdownHelper.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MarkdownHelper.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/MarkdownHelper.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/MethodPtr.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/NavigationHelper.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ScopeHelper.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/ShortTypePrinter.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TestUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TestUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TestUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TestUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TreeUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TreeUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TreeUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TreeUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/TypeUtils.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/insertUtils.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/insertUtils.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/utils/insertUtils.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/utils/insertUtils.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/DiagnosticVisitor.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindAnonymousTypeDeclaration.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindAnonymousTypeDeclaration.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindAnonymousTypeDeclaration.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindAnonymousTypeDeclaration.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindBiggerRange.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindBiggerRange.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindBiggerRange.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindBiggerRange.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindCompletionsAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindCompletionsAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindCompletionsAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindCompletionsAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindInvocationAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindInvocationAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindInvocationAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindInvocationAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodAt.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodAt.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodAt.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodAt.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodCallAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodDeclarationAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodDeclarationAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodDeclarationAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindMethodDeclarationAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindNameAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindReferences.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationAt.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationAt.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationAt.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationAt.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationNamed.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationNamed.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationNamed.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarationNamed.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarations.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarations.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarations.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindTypeDeclarations.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariableAtCursor.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariableAtCursor.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariableAtCursor.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariableAtCursor.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariablesBetween.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariablesBetween.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariablesBetween.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/FindVariablesBetween.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/MethodRangeScanner.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/MethodRangeScanner.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/MethodRangeScanner.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/MethodRangeScanner.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrettyPrintingVisitor.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrettyPrintingVisitor.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrettyPrintingVisitor.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrettyPrintingVisitor.java diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrintingVisitor.kt b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrintingVisitor.kt similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrintingVisitor.kt rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PrintingVisitor.kt diff --git a/lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PruneMethodBodies.java b/java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PruneMethodBodies.java similarity index 100% rename from lsp/java/src/main/java/com/itsaky/androidide/lsp/java/visitors/PruneMethodBodies.java rename to java/lsp/src/main/java/com/itsaky/androidide/lsp/java/visitors/PruneMethodBodies.java diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaCompilerProviderTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/JavaCompilerProviderTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaCompilerProviderTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/JavaCompilerProviderTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/JavaLSPTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/actions/AddImportTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/compiler/CompilerTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/compiler/CompilerTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/compiler/CompilerTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/compiler/CompilerTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/AndroidJarModelingRule.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/AndroidJarModelingRule.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/AndroidJarModelingRule.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/AndroidJarModelingRule.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/DescriptorUtilsTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/DescriptorUtilsTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/DescriptorUtilsTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/DescriptorUtilsTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexWorkerText.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexWorkerText.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexWorkerText.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/JavaIndexWorkerText.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParserTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParserTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParserTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/indexing/apiinfo/ApiInfoParserTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/partial/PartialReparserImplTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaCompletionProviderTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/providers/JavaSelectionProviderTest.kt diff --git a/lsp/java/src/test/java/com/itsaky/androidide/lsp/java/utils/FindHelperTest.kt b/java/lsp/src/test/java/com/itsaky/androidide/lsp/java/utils/FindHelperTest.kt similarity index 100% rename from lsp/java/src/test/java/com/itsaky/androidide/lsp/java/utils/FindHelperTest.kt rename to java/lsp/src/test/java/com/itsaky/androidide/lsp/java/utils/FindHelperTest.kt diff --git a/lookup/.gitignore b/logging/idestats/.gitignore similarity index 100% rename from lookup/.gitignore rename to logging/idestats/.gitignore diff --git a/idestats/build.gradle.kts b/logging/idestats/build.gradle.kts similarity index 81% rename from idestats/build.gradle.kts rename to logging/idestats/build.gradle.kts index 23c685fd8..32155e4bb 100644 --- a/idestats/build.gradle.kts +++ b/logging/idestats/build.gradle.kts @@ -15,13 +15,19 @@ * along with AndroidIDE. If not, see . */ +import com.itsaky.androidide.build.config.BuildConfig + plugins { id("com.android.library") id("org.jetbrains.kotlin.android") } +groupConfig { + groupIdSuffix.set("logging") +} + android { - namespace = "com.itsaky.androidide.stats" + namespace = "${BuildConfig.packageName}.stats" } dependencies { @@ -32,10 +38,10 @@ dependencies { implementation(libs.common.utilcode) implementation(libs.google.gson) - implementation(projects.buildInfo) - implementation(projects.common) - implementation(projects.logger) - implementation(projects.preferences) + implementation(projects.core.common) + implementation(projects.logging.logger) + implementation(projects.utilities.buildInfo) + implementation(projects.utilities.preferences) androidTestImplementation(libs.tests.androidx.junit) androidTestImplementation(libs.tests.androidx.test.core) diff --git a/preferences/consumer-rules.pro b/logging/idestats/consumer-rules.pro similarity index 100% rename from preferences/consumer-rules.pro rename to logging/idestats/consumer-rules.pro diff --git a/idestats/proguard-rules.pro b/logging/idestats/proguard-rules.pro similarity index 100% rename from idestats/proguard-rules.pro rename to logging/idestats/proguard-rules.pro diff --git a/idestats/src/androidTest/java/com/itsaky/androidide/stats/StatUploadWorkerTest.kt b/logging/idestats/src/androidTest/java/com/itsaky/androidide/stats/StatUploadWorkerTest.kt similarity index 100% rename from idestats/src/androidTest/java/com/itsaky/androidide/stats/StatUploadWorkerTest.kt rename to logging/idestats/src/androidTest/java/com/itsaky/androidide/stats/StatUploadWorkerTest.kt diff --git a/idestats/src/main/AndroidManifest.xml b/logging/idestats/src/main/AndroidManifest.xml similarity index 100% rename from idestats/src/main/AndroidManifest.xml rename to logging/idestats/src/main/AndroidManifest.xml diff --git a/idestats/src/main/java/com/itsaky/androidide/stats/AndroidIDEStats.kt b/logging/idestats/src/main/java/com/itsaky/androidide/stats/AndroidIDEStats.kt similarity index 100% rename from idestats/src/main/java/com/itsaky/androidide/stats/AndroidIDEStats.kt rename to logging/idestats/src/main/java/com/itsaky/androidide/stats/AndroidIDEStats.kt diff --git a/idestats/src/main/java/com/itsaky/androidide/stats/StatData.kt b/logging/idestats/src/main/java/com/itsaky/androidide/stats/StatData.kt similarity index 100% rename from idestats/src/main/java/com/itsaky/androidide/stats/StatData.kt rename to logging/idestats/src/main/java/com/itsaky/androidide/stats/StatData.kt diff --git a/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadResponse.kt b/logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadResponse.kt similarity index 100% rename from idestats/src/main/java/com/itsaky/androidide/stats/StatUploadResponse.kt rename to logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadResponse.kt diff --git a/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadService.kt b/logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadService.kt similarity index 100% rename from idestats/src/main/java/com/itsaky/androidide/stats/StatUploadService.kt rename to logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadService.kt diff --git a/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadWorker.kt b/logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadWorker.kt similarity index 100% rename from idestats/src/main/java/com/itsaky/androidide/stats/StatUploadWorker.kt rename to logging/idestats/src/main/java/com/itsaky/androidide/stats/StatUploadWorker.kt diff --git a/lsp/api/.gitignore b/logging/logger/.gitignore similarity index 100% rename from lsp/api/.gitignore rename to logging/logger/.gitignore diff --git a/logger/build.gradle.kts b/logging/logger/build.gradle.kts similarity index 82% rename from logger/build.gradle.kts rename to logging/logger/build.gradle.kts index 1f61c1907..4f531dfb5 100644 --- a/logger/build.gradle.kts +++ b/logging/logger/build.gradle.kts @@ -15,16 +15,26 @@ * along with AndroidIDE. If not, see . */ +import com.itsaky.androidide.plugins.NoDesugarPlugin + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("com.vanniktech.maven.publish.base") } +apply { + plugin(NoDesugarPlugin::class.java) +} + +groupConfig { + groupIdSuffix.set("logging") +} + description = "AndroidIDE Logging Framework" dependencies { - compileOnly(projects.subprojects.frameworkStubs) + compileOnly(projects.utilities.frameworkStubs) api(libs.logging.logback.core) api(libs.logging.logback.classic) { @@ -33,7 +43,7 @@ dependencies { exclude(group = "ch.qos.logback", module = "logback-core") } - implementation(projects.buildInfo) + implementation(projects.utilities.buildInfo) testImplementation(libs.tests.junit) testImplementation(libs.tests.google.truth) diff --git a/logger/src/main/java/com/itsaky/androidide/logging/JvmStdErrAppender.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/JvmStdErrAppender.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/JvmStdErrAppender.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/JvmStdErrAppender.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/LogcatAppender.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/LogcatAppender.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/LogcatAppender.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/LogcatAppender.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/StdErrAppender.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/StdErrAppender.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/StdErrAppender.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/StdErrAppender.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatEncoder.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatEncoder.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatEncoder.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatEncoder.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatLayout.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatLayout.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatLayout.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatLayout.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/encoder/ThreadTimeEncoder.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/ThreadTimeEncoder.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/encoder/ThreadTimeEncoder.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/ThreadTimeEncoder.java diff --git a/logger/src/main/java/com/itsaky/androidide/logging/utils/LogUtils.java b/logging/logger/src/main/java/com/itsaky/androidide/logging/utils/LogUtils.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/logging/utils/LogUtils.java rename to logging/logger/src/main/java/com/itsaky/androidide/logging/utils/LogUtils.java diff --git a/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java b/logging/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/utils/ILogger.java rename to logging/logger/src/main/java/com/itsaky/androidide/utils/ILogger.java diff --git a/logger/src/main/java/com/itsaky/androidide/utils/LogTagUtils.java b/logging/logger/src/main/java/com/itsaky/androidide/utils/LogTagUtils.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/utils/LogTagUtils.java rename to logging/logger/src/main/java/com/itsaky/androidide/utils/LogTagUtils.java diff --git a/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java b/logging/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java similarity index 100% rename from logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java rename to logging/logger/src/main/java/com/itsaky/androidide/utils/LogUtils.java diff --git a/lsp/java/.gitignore b/logging/logsender-sample/.gitignore similarity index 100% rename from lsp/java/.gitignore rename to logging/logsender-sample/.gitignore diff --git a/logsender-sample/build.gradle.kts b/logging/logsender-sample/build.gradle.kts similarity index 90% rename from logsender-sample/build.gradle.kts rename to logging/logsender-sample/build.gradle.kts index 89b269761..b8e7fb302 100644 --- a/logsender-sample/build.gradle.kts +++ b/logging/logsender-sample/build.gradle.kts @@ -21,6 +21,10 @@ plugins { id("com.android.application") } +groupConfig { + groupIdSuffix.set("logging") +} + android { namespace = "${BuildConfig.packageName}.logsender.sample" @@ -33,8 +37,8 @@ android { dependencies { - implementation(projects.logger) - implementation(projects.logsender) + implementation(projects.logging.logger) + implementation(projects.logging.logsender) implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintlayout) diff --git a/lsp/models/proguard-rules.pro b/logging/logsender-sample/proguard-rules.pro similarity index 100% rename from lsp/models/proguard-rules.pro rename to logging/logsender-sample/proguard-rules.pro diff --git a/logsender-sample/src/main/AndroidManifest.xml b/logging/logsender-sample/src/main/AndroidManifest.xml similarity index 100% rename from logsender-sample/src/main/AndroidManifest.xml rename to logging/logsender-sample/src/main/AndroidManifest.xml diff --git a/logsender-sample/src/main/java/com/itsaky/androidide/logsender/sample/MainActivity.java b/logging/logsender-sample/src/main/java/com/itsaky/androidide/logsender/sample/MainActivity.java similarity index 100% rename from logsender-sample/src/main/java/com/itsaky/androidide/logsender/sample/MainActivity.java rename to logging/logsender-sample/src/main/java/com/itsaky/androidide/logsender/sample/MainActivity.java diff --git a/logsender-sample/src/main/res/drawable/ic_launcher.xml b/logging/logsender-sample/src/main/res/drawable/ic_launcher.xml similarity index 100% rename from logsender-sample/src/main/res/drawable/ic_launcher.xml rename to logging/logsender-sample/src/main/res/drawable/ic_launcher.xml diff --git a/logsender-sample/src/main/res/drawable/ic_launcher_background.xml b/logging/logsender-sample/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from logsender-sample/src/main/res/drawable/ic_launcher_background.xml rename to logging/logsender-sample/src/main/res/drawable/ic_launcher_background.xml diff --git a/logsender-sample/src/main/res/drawable/ic_launcher_foreground.xml b/logging/logsender-sample/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from logsender-sample/src/main/res/drawable/ic_launcher_foreground.xml rename to logging/logsender-sample/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/logsender-sample/src/main/res/drawable/ic_launcher_round.xml b/logging/logsender-sample/src/main/res/drawable/ic_launcher_round.xml similarity index 100% rename from logsender-sample/src/main/res/drawable/ic_launcher_round.xml rename to logging/logsender-sample/src/main/res/drawable/ic_launcher_round.xml diff --git a/logsender-sample/src/main/res/layout/activity_main.xml b/logging/logsender-sample/src/main/res/layout/activity_main.xml similarity index 100% rename from logsender-sample/src/main/res/layout/activity_main.xml rename to logging/logsender-sample/src/main/res/layout/activity_main.xml diff --git a/logsender-sample/src/main/res/values-night/themes.xml b/logging/logsender-sample/src/main/res/values-night/themes.xml similarity index 100% rename from logsender-sample/src/main/res/values-night/themes.xml rename to logging/logsender-sample/src/main/res/values-night/themes.xml diff --git a/logsender-sample/src/main/res/values/colors.xml b/logging/logsender-sample/src/main/res/values/colors.xml similarity index 100% rename from logsender-sample/src/main/res/values/colors.xml rename to logging/logsender-sample/src/main/res/values/colors.xml diff --git a/logsender-sample/src/main/res/values/strings.xml b/logging/logsender-sample/src/main/res/values/strings.xml similarity index 100% rename from logsender-sample/src/main/res/values/strings.xml rename to logging/logsender-sample/src/main/res/values/strings.xml diff --git a/logsender-sample/src/main/res/values/themes.xml b/logging/logsender-sample/src/main/res/values/themes.xml similarity index 100% rename from logsender-sample/src/main/res/values/themes.xml rename to logging/logsender-sample/src/main/res/values/themes.xml diff --git a/lsp/models/.gitignore b/logging/logsender/.gitignore similarity index 100% rename from lsp/models/.gitignore rename to logging/logsender/.gitignore diff --git a/logsender/build.gradle.kts b/logging/logsender/build.gradle.kts similarity index 90% rename from logsender/build.gradle.kts rename to logging/logsender/build.gradle.kts index 8f0fe3b56..730c82faf 100644 --- a/logsender/build.gradle.kts +++ b/logging/logsender/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ +import com.itsaky.androidide.plugins.NoDesugarPlugin import com.itsaky.androidide.build.config.BuildConfig plugins { @@ -22,6 +23,14 @@ plugins { id("com.vanniktech.maven.publish.base") } +apply { + plugin(NoDesugarPlugin::class.java) +} + +groupConfig { + groupIdSuffix.set("logging") +} + description = "LogSender is used to read logs from applications built with AndroidIDE" android { diff --git a/resources/consumer-rules.pro b/logging/logsender/consumer-rules.pro similarity index 100% rename from resources/consumer-rules.pro rename to logging/logsender/consumer-rules.pro diff --git a/lsp/xml/proguard-rules.pro b/logging/logsender/proguard-rules.pro similarity index 100% rename from lsp/xml/proguard-rules.pro rename to logging/logsender/proguard-rules.pro diff --git a/logsender/src/main/AndroidManifest.xml b/logging/logsender/src/main/AndroidManifest.xml similarity index 100% rename from logsender/src/main/AndroidManifest.xml rename to logging/logsender/src/main/AndroidManifest.xml diff --git a/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogReceiver.aidl b/logging/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogReceiver.aidl similarity index 100% rename from logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogReceiver.aidl rename to logging/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogReceiver.aidl diff --git a/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogSender.aidl b/logging/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogSender.aidl similarity index 100% rename from logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogSender.aidl rename to logging/logsender/src/main/aidl/com/itsaky/androidide/logsender/ILogSender.aidl diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/LogSender.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/LogSender.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/LogSender.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/LogSender.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/socket/AbstractSocketCommand.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/AbstractSocketCommand.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/socket/AbstractSocketCommand.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/AbstractSocketCommand.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/socket/ISocketCommand.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/ISocketCommand.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/socket/ISocketCommand.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/ISocketCommand.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SenderInfoCommand.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SenderInfoCommand.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/socket/SenderInfoCommand.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SenderInfoCommand.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SignalCommand.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SignalCommand.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/socket/SignalCommand.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SignalCommand.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SocketCommandParser.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SocketCommandParser.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/socket/SocketCommandParser.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/socket/SocketCommandParser.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogReader.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogReader.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogReader.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogReader.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogSenderInstaller.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogSenderInstaller.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogSenderInstaller.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/LogSenderInstaller.java diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/utils/Logger.java b/logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/Logger.java similarity index 100% rename from logsender/src/main/java/com/itsaky/androidide/logsender/utils/Logger.java rename to logging/logsender/src/main/java/com/itsaky/androidide/logsender/utils/Logger.java diff --git a/logsender/src/main/res/drawable/ic_androidide_log.xml b/logging/logsender/src/main/res/drawable/ic_androidide_log.xml similarity index 100% rename from logsender/src/main/res/drawable/ic_androidide_log.xml rename to logging/logsender/src/main/res/drawable/ic_androidide_log.xml diff --git a/logsender/src/main/res/values/bools.xml b/logging/logsender/src/main/res/values/bools.xml similarity index 100% rename from logsender/src/main/res/values/bools.xml rename to logging/logsender/src/main/res/values/bools.xml diff --git a/logsender/src/main/res/values/strings.xml b/logging/logsender/src/main/res/values/strings.xml similarity index 100% rename from logsender/src/main/res/values/strings.xml rename to logging/logsender/src/main/res/values/strings.xml diff --git a/lsp/.gitignore b/lsp/.gitignore deleted file mode 100755 index 56cc6425e..000000000 --- a/lsp/.gitignore +++ /dev/null @@ -1,85 +0,0 @@ -# Built application files -*.apk -*.aar -*.ap_ -*.aab - -# Files for the ART/Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ -out/ -# Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Android Studio Navigation editor temp files -.navigation/ - -# Android Studio captures folder -captures/ - -# IntelliJ -*.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -# Android Studio 3 in .gitignore file. -.idea/caches -.idea/modules.xml -# Comment next line if keeping position of elements in Navigation Editor is relevant for you -.idea/navEditor.xml - -# Keystore files -# Uncomment the following lines if you do not want to check your keystore files in. -#*.jks -#*.keystore - -# External native build folder generated in Android Studio 2.2 and later -.externalNativeBuild -.cxx/ - -# Google Services (e.g. APIs or Firebase) -# google-services.json - -# Freeline -freeline.py -freeline/ -freeline_project_description.json - -# fastlane -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots -fastlane/test_output -fastlane/readme.md - -# Version control -vcs.xml - -# lint -lint/intermediates/ -lint/generated/ -lint/outputs/ -lint/tmp/ -# lint/reports/ diff --git a/settings.gradle.kts b/settings.gradle.kts index df37b68a0..d1a8b7f86 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -118,64 +118,65 @@ if (FDroidConfig.hasRead && FDroidConfig.isFDroidBuild) { rootProject.name = "AndroidIDE" +// keep this sorted alphabetically include( - ":annotation-processors", - ":annotation-processors-ksp", - ":annotations", - ":actions", - ":app", - ":build-info", - ":common", - ":editor", - ":editor-api", - ":editor-treesitter", - ":eventbus", - ":eventbus-android", - ":eventbus-events", - ":gradle-plugin", - ":gradle-plugin-config", - ":idestats", - ":lexers", - ":logger", - ":logsender", - ":logsender-sample", - ":lookup", - ":preferences", - ":resources", - ":shared", - ":templates-api", - ":templates-impl", - ":treeview", - ":uidesigner", - ":xml-inflater", - ":lsp:api", - ":lsp:models", - ":lsp:java", - ":lsp:xml", - ":subprojects:aaptcompiler", - ":subprojects:builder-model-impl", - ":subprojects:flashbar", - ":subprojects:framework-stubs", - ":subprojects:database", - ":subprojects:indexing", - ":subprojects:javac-services", - ":subprojects:projects", - ":subprojects:testing-android", - ":subprojects:testing-benchmarks", - ":subprojects:testing-common", - ":subprojects:testing-lsp", - ":subprojects:testing-tooling", - ":subprojects:testing-unit", - ":subprojects:tooling-api", - ":subprojects:tooling-api-events", - ":subprojects:tooling-api-impl", - ":subprojects:tooling-api-model", - ":subprojects:xml-dom", - ":subprojects:xml-utils", - ":termux:termux-app", - ":termux:termux-emulator", - ":termux:termux-shared", - ":termux:termux-view", + ":annotation:annotations", + ":annotation:processors", + ":annotation:processors-ksp", + ":core:actions", + ":core:app", + ":core:common", + ":core:database", + ":core:indexing", + ":core:lsp-api", + ":core:lsp-models", + ":core:projects", + ":core:resources", + ":editor:api", + ":editor:impl", + ":editor:lexers", + ":editor:treesitter", + ":event:eventbus", + ":event:eventbus-android", + ":event:eventbus-events", + ":java:javac-services", + ":java:lsp", + ":logging:idestats", + ":logging:logger", + ":logging:logsender", + ":logging:logsender-sample", + ":termux:application", + ":termux:emulator", + ":termux:shared", + ":termux:view", + ":testing:androidTest", + ":testing:benchmarks", + ":testing:commonTest", + ":testing:gradleToolingTest", + ":testing:lspTest", + ":testing:unitTest", + ":tooling:api", + ":tooling:builder-model-impl", + ":tooling:events", + ":tooling:impl", + ":tooling:model", + ":tooling:plugin", + ":tooling:plugin-config", + ":utilities:build-info", + ":utilities:flashbar", + ":utilities:framework-stubs", + ":utilities:lookup", + ":utilities:preferences", + ":utilities:shared", + ":utilities:templates-api", + ":utilities:templates-impl", + ":utilities:treeview", + ":utilities:uidesigner", + ":utilities:xml-inflater", + ":xml:aaptcompiler", + ":xml:dom", + ":xml:lsp", + ":xml:utils", ) object FDroidConfig { diff --git a/lsp/xml/.gitignore b/termux/application/.gitignore similarity index 100% rename from lsp/xml/.gitignore rename to termux/application/.gitignore diff --git a/termux/termux-app/build.gradle.kts b/termux/application/build.gradle.kts similarity index 64% rename from termux/termux-app/build.gradle.kts rename to termux/application/build.gradle.kts index f21cef039..dde74cd0b 100644 --- a/termux/termux-app/build.gradle.kts +++ b/termux/application/build.gradle.kts @@ -1,3 +1,20 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + @file:Suppress("UnstableApiUsage") import com.itsaky.androidide.build.config.BuildConfig @@ -12,6 +29,10 @@ apply { plugin(TerminalBootstrapPackagesPlugin::class.java) } +groupConfig { + groupIdSuffix.set("termux") +} + val packageVariant = System.getenv("TERMUX_PACKAGE_VARIANT") ?: "apt-android-7" // Default: "apt-android-7" android { @@ -62,13 +83,13 @@ dependencies { implementation(libs.common.markwon.linkify) implementation(libs.common.markwon.recycler) - implementation(projects.common) - implementation(projects.preferences) - implementation(projects.resources) - implementation(projects.termux.termuxView) - implementation(projects.termux.termuxShared) + implementation(projects.core.common) + implementation(projects.core.resources) + implementation(projects.termux.view) + implementation(projects.termux.shared) + implementation(projects.utilities.preferences) - testImplementation(projects.subprojects.testingUnit) + testImplementation(projects.testing.unitTest) } tasks.register("versionName") { diff --git a/termux/termux-app/proguard-rules.pro b/termux/application/proguard-rules.pro similarity index 100% rename from termux/termux-app/proguard-rules.pro rename to termux/application/proguard-rules.pro diff --git a/termux/termux-app/src/main/AndroidManifest.xml b/termux/application/src/main/AndroidManifest.xml similarity index 100% rename from termux/termux-app/src/main/AndroidManifest.xml rename to termux/application/src/main/AndroidManifest.xml diff --git a/termux/termux-app/src/main/assets/data/common/idesetup.sh b/termux/application/src/main/assets/data/common/idesetup.sh similarity index 100% rename from termux/termux-app/src/main/assets/data/common/idesetup.sh rename to termux/application/src/main/assets/data/common/idesetup.sh diff --git a/termux/termux-app/src/main/cpp/.gitignore b/termux/application/src/main/cpp/.gitignore similarity index 100% rename from termux/termux-app/src/main/cpp/.gitignore rename to termux/application/src/main/cpp/.gitignore diff --git a/termux/termux-app/src/main/cpp/Android.mk b/termux/application/src/main/cpp/Android.mk similarity index 100% rename from termux/termux-app/src/main/cpp/Android.mk rename to termux/application/src/main/cpp/Android.mk diff --git a/termux/termux-app/src/main/cpp/termux-bootstrap.c b/termux/application/src/main/cpp/termux-bootstrap.c similarity index 100% rename from termux/termux-app/src/main/cpp/termux-bootstrap.c rename to termux/application/src/main/cpp/termux-bootstrap.c diff --git a/termux/termux-app/src/main/java/com/itsaky/androidide/activities/TerminalActivity.kt b/termux/application/src/main/java/com/itsaky/androidide/activities/TerminalActivity.kt similarity index 100% rename from termux/termux-app/src/main/java/com/itsaky/androidide/activities/TerminalActivity.kt rename to termux/application/src/main/java/com/itsaky/androidide/activities/TerminalActivity.kt diff --git a/termux/termux-app/src/main/java/com/itsaky/androidide/terminal/IdeTerminalSessionClient.kt b/termux/application/src/main/java/com/itsaky/androidide/terminal/IdeTerminalSessionClient.kt similarity index 100% rename from termux/termux-app/src/main/java/com/itsaky/androidide/terminal/IdeTerminalSessionClient.kt rename to termux/application/src/main/java/com/itsaky/androidide/terminal/IdeTerminalSessionClient.kt diff --git a/termux/termux-app/src/main/java/com/itsaky/androidide/terminal/IdesetupSession.kt b/termux/application/src/main/java/com/itsaky/androidide/terminal/IdesetupSession.kt similarity index 100% rename from termux/termux-app/src/main/java/com/itsaky/androidide/terminal/IdesetupSession.kt rename to termux/application/src/main/java/com/itsaky/androidide/terminal/IdesetupSession.kt diff --git a/termux/termux-app/src/main/java/com/termux/app/TermuxActivity.java b/termux/application/src/main/java/com/termux/app/TermuxActivity.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/TermuxActivity.java rename to termux/application/src/main/java/com/termux/app/TermuxActivity.java diff --git a/termux/termux-app/src/main/java/com/termux/app/TermuxApplication.java b/termux/application/src/main/java/com/termux/app/TermuxApplication.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/TermuxApplication.java rename to termux/application/src/main/java/com/termux/app/TermuxApplication.java diff --git a/termux/termux-app/src/main/java/com/termux/app/TermuxInstaller.java b/termux/application/src/main/java/com/termux/app/TermuxInstaller.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/TermuxInstaller.java rename to termux/application/src/main/java/com/termux/app/TermuxInstaller.java diff --git a/termux/termux-app/src/main/java/com/termux/app/TermuxService.java b/termux/application/src/main/java/com/termux/app/TermuxService.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/TermuxService.java rename to termux/application/src/main/java/com/termux/app/TermuxService.java diff --git a/termux/termux-app/src/main/java/com/termux/app/activities/HelpActivity.java b/termux/application/src/main/java/com/termux/app/activities/HelpActivity.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/activities/HelpActivity.java rename to termux/application/src/main/java/com/termux/app/activities/HelpActivity.java diff --git a/termux/termux-app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java b/termux/application/src/main/java/com/termux/app/api/file/FileReceiverActivity.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/api/file/FileReceiverActivity.java rename to termux/application/src/main/java/com/termux/app/api/file/FileReceiverActivity.java diff --git a/termux/termux-app/src/main/java/com/termux/app/event/SystemEventReceiver.java b/termux/application/src/main/java/com/termux/app/event/SystemEventReceiver.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/event/SystemEventReceiver.java rename to termux/application/src/main/java/com/termux/app/event/SystemEventReceiver.java diff --git a/termux/termux-app/src/main/java/com/termux/app/models/UserAction.java b/termux/application/src/main/java/com/termux/app/models/UserAction.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/models/UserAction.java rename to termux/application/src/main/java/com/termux/app/models/UserAction.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java b/termux/application/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java rename to termux/application/src/main/java/com/termux/app/terminal/TermuxActivityRootView.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/termux/application/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java rename to termux/application/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java rename to termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java b/termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java rename to termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalSessionServiceClient.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java rename to termux/application/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java b/termux/application/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java rename to termux/application/src/main/java/com/termux/app/terminal/io/FullScreenWorkAround.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java b/termux/application/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java rename to termux/application/src/main/java/com/termux/app/terminal/io/KeyboardShortcut.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/termux/application/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java rename to termux/application/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java diff --git a/termux/termux-app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java b/termux/application/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java similarity index 100% rename from termux/termux-app/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java rename to termux/application/src/main/java/com/termux/app/terminal/io/TermuxTerminalExtraKeys.java diff --git a/termux/termux-app/src/main/res/drawable/current_session.xml b/termux/application/src/main/res/drawable/current_session.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/current_session.xml rename to termux/application/src/main/res/drawable/current_session.xml diff --git a/termux/termux-app/src/main/res/drawable/current_session_black.xml b/termux/application/src/main/res/drawable/current_session_black.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/current_session_black.xml rename to termux/application/src/main/res/drawable/current_session_black.xml diff --git a/termux/termux-app/src/main/res/drawable/ic_service_notification.xml b/termux/application/src/main/res/drawable/ic_service_notification.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/ic_service_notification.xml rename to termux/application/src/main/res/drawable/ic_service_notification.xml diff --git a/termux/termux-app/src/main/res/drawable/ic_settings.xml b/termux/application/src/main/res/drawable/ic_settings.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/ic_settings.xml rename to termux/application/src/main/res/drawable/ic_settings.xml diff --git a/termux/termux-app/src/main/res/drawable/session_background_black_selected.xml b/termux/application/src/main/res/drawable/session_background_black_selected.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/session_background_black_selected.xml rename to termux/application/src/main/res/drawable/session_background_black_selected.xml diff --git a/termux/termux-app/src/main/res/drawable/session_background_selected.xml b/termux/application/src/main/res/drawable/session_background_selected.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/session_background_selected.xml rename to termux/application/src/main/res/drawable/session_background_selected.xml diff --git a/termux/termux-app/src/main/res/drawable/session_ripple.xml b/termux/application/src/main/res/drawable/session_ripple.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/session_ripple.xml rename to termux/application/src/main/res/drawable/session_ripple.xml diff --git a/termux/termux-app/src/main/res/drawable/session_ripple_black.xml b/termux/application/src/main/res/drawable/session_ripple_black.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/session_ripple_black.xml rename to termux/application/src/main/res/drawable/session_ripple_black.xml diff --git a/termux/termux-app/src/main/res/drawable/terminal_scroll_shape.xml b/termux/application/src/main/res/drawable/terminal_scroll_shape.xml similarity index 100% rename from termux/termux-app/src/main/res/drawable/terminal_scroll_shape.xml rename to termux/application/src/main/res/drawable/terminal_scroll_shape.xml diff --git a/termux/termux-app/src/main/res/layout/activity_termux.xml b/termux/application/src/main/res/layout/activity_termux.xml similarity index 100% rename from termux/termux-app/src/main/res/layout/activity_termux.xml rename to termux/application/src/main/res/layout/activity_termux.xml diff --git a/termux/termux-app/src/main/res/layout/item_terminal_sessions_list.xml b/termux/application/src/main/res/layout/item_terminal_sessions_list.xml similarity index 100% rename from termux/termux-app/src/main/res/layout/item_terminal_sessions_list.xml rename to termux/application/src/main/res/layout/item_terminal_sessions_list.xml diff --git a/termux/termux-app/src/main/res/layout/preference_markdown_text.xml b/termux/application/src/main/res/layout/preference_markdown_text.xml similarity index 100% rename from termux/termux-app/src/main/res/layout/preference_markdown_text.xml rename to termux/application/src/main/res/layout/preference_markdown_text.xml diff --git a/termux/termux-app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml b/termux/application/src/main/res/layout/view_terminal_toolbar_extra_keys.xml similarity index 100% rename from termux/termux-app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml rename to termux/application/src/main/res/layout/view_terminal_toolbar_extra_keys.xml diff --git a/termux/termux-app/src/main/res/layout/view_terminal_toolbar_text_input.xml b/termux/application/src/main/res/layout/view_terminal_toolbar_text_input.xml similarity index 100% rename from termux/termux-app/src/main/res/layout/view_terminal_toolbar_text_input.xml rename to termux/application/src/main/res/layout/view_terminal_toolbar_text_input.xml diff --git a/termux/termux-app/src/test/java/com/termux/app/TermuxActivityTest.java b/termux/application/src/test/java/com/termux/app/TermuxActivityTest.java similarity index 100% rename from termux/termux-app/src/test/java/com/termux/app/TermuxActivityTest.java rename to termux/application/src/test/java/com/termux/app/TermuxActivityTest.java diff --git a/termux/termux-app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java b/termux/application/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java similarity index 100% rename from termux/termux-app/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java rename to termux/application/src/test/java/com/termux/app/api/file/FileReceiverActivityTest.java diff --git a/termux/termux-app/testkey_untrusted.jks b/termux/application/testkey_untrusted.jks similarity index 100% rename from termux/termux-app/testkey_untrusted.jks rename to termux/application/testkey_untrusted.jks diff --git a/resources/.gitignore b/termux/emulator/.gitignore similarity index 100% rename from resources/.gitignore rename to termux/emulator/.gitignore diff --git a/termux/emulator/build.gradle.kts b/termux/emulator/build.gradle.kts new file mode 100644 index 000000000..d1d2fdc4c --- /dev/null +++ b/termux/emulator/build.gradle.kts @@ -0,0 +1,61 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +import com.itsaky.androidide.build.config.BuildConfig + +plugins { + id("com.android.library") + id("kotlin-android") +} + +groupConfig { + groupIdSuffix.set("emulator") +} + +android { + namespace = "com.termux.emulator" + ndkVersion = BuildConfig.ndkVersion + + defaultConfig { + externalNativeBuild { + ndkBuild { + cFlags += arrayOf("-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections") + } + } + } + + externalNativeBuild { + ndkBuild { + path = file("src/main/jni/Android.mk") + } + } + + testOptions { + unitTests.isReturnDefaultValues = true + } +} + +tasks.withType(Test::class.java) { + testLogging { + events("started", "passed", "skipped", "failed") + } +} + +dependencies { + implementation(libs.androidx.annotation) + testImplementation(projects.testing.unitTest) +} diff --git a/termux/termux-emulator/proguard-rules.pro b/termux/emulator/proguard-rules.pro similarity index 100% rename from termux/termux-emulator/proguard-rules.pro rename to termux/emulator/proguard-rules.pro diff --git a/termux/termux-emulator/src/main/AndroidManifest.xml b/termux/emulator/src/main/AndroidManifest.xml similarity index 100% rename from termux/termux-emulator/src/main/AndroidManifest.xml rename to termux/emulator/src/main/AndroidManifest.xml diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/ByteQueue.java b/termux/emulator/src/main/java/com/termux/terminal/ByteQueue.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/ByteQueue.java rename to termux/emulator/src/main/java/com/termux/terminal/ByteQueue.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/JNI.java b/termux/emulator/src/main/java/com/termux/terminal/JNI.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/JNI.java rename to termux/emulator/src/main/java/com/termux/terminal/JNI.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/KeyHandler.java b/termux/emulator/src/main/java/com/termux/terminal/KeyHandler.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/KeyHandler.java rename to termux/emulator/src/main/java/com/termux/terminal/KeyHandler.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/Logger.java b/termux/emulator/src/main/java/com/termux/terminal/Logger.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/Logger.java rename to termux/emulator/src/main/java/com/termux/terminal/Logger.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalBuffer.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalBuffer.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalColors.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalColors.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalColors.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalColors.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalEmulator.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalEmulator.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalOutput.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalOutput.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalOutput.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalOutput.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalRow.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalRow.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalRow.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalRow.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalSession.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalSession.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalSession.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalSession.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java b/termux/emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java rename to termux/emulator/src/main/java/com/termux/terminal/TerminalSessionClient.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/TextStyle.java b/termux/emulator/src/main/java/com/termux/terminal/TextStyle.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/TextStyle.java rename to termux/emulator/src/main/java/com/termux/terminal/TextStyle.java diff --git a/termux/termux-emulator/src/main/java/com/termux/terminal/WcWidth.java b/termux/emulator/src/main/java/com/termux/terminal/WcWidth.java similarity index 100% rename from termux/termux-emulator/src/main/java/com/termux/terminal/WcWidth.java rename to termux/emulator/src/main/java/com/termux/terminal/WcWidth.java diff --git a/termux/termux-emulator/src/main/jni/Android.mk b/termux/emulator/src/main/jni/Android.mk similarity index 100% rename from termux/termux-emulator/src/main/jni/Android.mk rename to termux/emulator/src/main/jni/Android.mk diff --git a/termux/termux-emulator/src/main/jni/termux.c b/termux/emulator/src/main/jni/termux.c similarity index 100% rename from termux/termux-emulator/src/main/jni/termux.c rename to termux/emulator/src/main/jni/termux.c diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java b/termux/emulator/src/test/java/com/termux/terminal/ByteQueueTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java rename to termux/emulator/src/test/java/com/termux/terminal/ByteQueueTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java b/termux/emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java rename to termux/emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java b/termux/emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java rename to termux/emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/DecSetTest.java b/termux/emulator/src/test/java/com/termux/terminal/DecSetTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/DecSetTest.java rename to termux/emulator/src/test/java/com/termux/terminal/DecSetTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java b/termux/emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java rename to termux/emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/HistoryTest.java b/termux/emulator/src/test/java/com/termux/terminal/HistoryTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/HistoryTest.java rename to termux/emulator/src/test/java/com/termux/terminal/HistoryTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java b/termux/emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java rename to termux/emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java b/termux/emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java rename to termux/emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java b/termux/emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java rename to termux/emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/ResizeTest.java b/termux/emulator/src/test/java/com/termux/terminal/ResizeTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/ResizeTest.java rename to termux/emulator/src/test/java/com/termux/terminal/ResizeTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java b/termux/emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java rename to termux/emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java b/termux/emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java rename to termux/emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/TerminalRowTest.java b/termux/emulator/src/test/java/com/termux/terminal/TerminalRowTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/TerminalRowTest.java rename to termux/emulator/src/test/java/com/termux/terminal/TerminalRowTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/TerminalTest.java b/termux/emulator/src/test/java/com/termux/terminal/TerminalTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/TerminalTest.java rename to termux/emulator/src/test/java/com/termux/terminal/TerminalTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java b/termux/emulator/src/test/java/com/termux/terminal/TerminalTestCase.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java rename to termux/emulator/src/test/java/com/termux/terminal/TerminalTestCase.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/TextStyleTest.java b/termux/emulator/src/test/java/com/termux/terminal/TextStyleTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/TextStyleTest.java rename to termux/emulator/src/test/java/com/termux/terminal/TextStyleTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java b/termux/emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java rename to termux/emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java diff --git a/termux/termux-emulator/src/test/java/com/termux/terminal/WcWidthTest.java b/termux/emulator/src/test/java/com/termux/terminal/WcWidthTest.java similarity index 100% rename from termux/termux-emulator/src/test/java/com/termux/terminal/WcWidthTest.java rename to termux/emulator/src/test/java/com/termux/terminal/WcWidthTest.java diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/ide/.gitignore b/termux/shared/.gitignore similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/ide/.gitignore rename to termux/shared/.gitignore diff --git a/termux/termux-shared/LICENSE.md b/termux/shared/LICENSE.md similarity index 100% rename from termux/termux-shared/LICENSE.md rename to termux/shared/LICENSE.md diff --git a/termux/termux-shared/build.gradle.kts b/termux/shared/build.gradle.kts similarity index 50% rename from termux/termux-shared/build.gradle.kts rename to termux/shared/build.gradle.kts index 974caefaa..36522f1de 100644 --- a/termux/termux-shared/build.gradle.kts +++ b/termux/shared/build.gradle.kts @@ -1,3 +1,20 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + import com.itsaky.androidide.build.config.BuildConfig plugins { @@ -5,6 +22,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("termux") +} + android { namespace = "com.termux.shared" ndkVersion = BuildConfig.ndkVersion @@ -34,12 +55,12 @@ dependencies { implementation(libs.common.io) implementation(libs.common.termuxAmLib) - implementation(projects.common) - implementation(projects.termux.termuxView) - implementation(projects.buildInfo) - implementation(projects.preferences) - implementation(projects.resources) + implementation(projects.core.common) + implementation(projects.core.resources) + implementation(projects.termux.view) + implementation(projects.utilities.buildInfo) + implementation(projects.utilities.preferences) - testImplementation(projects.subprojects.testingUnit) - testImplementation(projects.subprojects.testingAndroid) + testImplementation(projects.testing.unitTest) + testImplementation(projects.testing.androidTest) } diff --git a/termux/termux-shared/proguard-rules.pro b/termux/shared/proguard-rules.pro similarity index 100% rename from termux/termux-shared/proguard-rules.pro rename to termux/shared/proguard-rules.pro diff --git a/termux/termux-shared/src/main/AndroidManifest.xml b/termux/shared/src/main/AndroidManifest.xml similarity index 100% rename from termux/termux-shared/src/main/AndroidManifest.xml rename to termux/shared/src/main/AndroidManifest.xml diff --git a/termux/termux-shared/src/main/cpp/Android.mk b/termux/shared/src/main/cpp/Android.mk similarity index 100% rename from termux/termux-shared/src/main/cpp/Android.mk rename to termux/shared/src/main/cpp/Android.mk diff --git a/termux/termux-shared/src/main/cpp/Application.mk b/termux/shared/src/main/cpp/Application.mk similarity index 100% rename from termux/termux-shared/src/main/cpp/Application.mk rename to termux/shared/src/main/cpp/Application.mk diff --git a/termux/termux-shared/src/main/cpp/local-socket.cpp b/termux/shared/src/main/cpp/local-socket.cpp similarity index 100% rename from termux/termux-shared/src/main/cpp/local-socket.cpp rename to termux/shared/src/main/cpp/local-socket.cpp diff --git a/termux/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java b/termux/shared/src/main/java/com/termux/shared/activities/ReportActivity.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/activities/ReportActivity.java rename to termux/shared/src/main/java/com/termux/shared/activities/ReportActivity.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java b/termux/shared/src/main/java/com/termux/shared/activities/TextIOActivity.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/activities/TextIOActivity.java rename to termux/shared/src/main/java/com/termux/shared/activities/TextIOActivity.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/activity/ActivityErrno.java b/termux/shared/src/main/java/com/termux/shared/activity/ActivityErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/activity/ActivityErrno.java rename to termux/shared/src/main/java/com/termux/shared/activity/ActivityErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java b/termux/shared/src/main/java/com/termux/shared/activity/ActivityUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/activity/ActivityUtils.java rename to termux/shared/src/main/java/com/termux/shared/activity/ActivityUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java b/termux/shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java rename to termux/shared/src/main/java/com/termux/shared/activity/media/AppCompatActivityUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java b/termux/shared/src/main/java/com/termux/shared/android/AndroidUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/AndroidUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/AndroidUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java b/termux/shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/FeatureFlagUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java b/termux/shared/src/main/java/com/termux/shared/android/PackageUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/PackageUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/PackageUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java b/termux/shared/src/main/java/com/termux/shared/android/PermissionUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/PermissionUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java b/termux/shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/PhantomProcessUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java b/termux/shared/src/main/java/com/termux/shared/android/ProcessUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/ProcessUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/ProcessUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java b/termux/shared/src/main/java/com/termux/shared/android/SELinuxUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/SELinuxUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/SELinuxUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java b/termux/shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/SettingsProviderUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/UserUtils.java b/termux/shared/src/main/java/com/termux/shared/android/UserUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/UserUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/UserUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java b/termux/shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java rename to termux/shared/src/main/java/com/termux/shared/android/resource/ResourceUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java b/termux/shared/src/main/java/com/termux/shared/crash/CrashHandler.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/crash/CrashHandler.java rename to termux/shared/src/main/java/com/termux/shared/crash/CrashHandler.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java b/termux/shared/src/main/java/com/termux/shared/data/DataUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/data/DataUtils.java rename to termux/shared/src/main/java/com/termux/shared/data/DataUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java b/termux/shared/src/main/java/com/termux/shared/data/IntentUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/data/IntentUtils.java rename to termux/shared/src/main/java/com/termux/shared/data/IntentUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/errors/Errno.java b/termux/shared/src/main/java/com/termux/shared/errors/Errno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/errors/Errno.java rename to termux/shared/src/main/java/com/termux/shared/errors/Errno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/errors/Error.java b/termux/shared/src/main/java/com/termux/shared/errors/Error.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/errors/Error.java rename to termux/shared/src/main/java/com/termux/shared/errors/Error.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java b/termux/shared/src/main/java/com/termux/shared/errors/FunctionErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/errors/FunctionErrno.java rename to termux/shared/src/main/java/com/termux/shared/errors/FunctionErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java b/termux/shared/src/main/java/com/termux/shared/file/FileUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/FileUtils.java rename to termux/shared/src/main/java/com/termux/shared/file/FileUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java b/termux/shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java rename to termux/shared/src/main/java/com/termux/shared/file/FileUtilsErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FileAttributes.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FileKey.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FilePermission.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FilePermissions.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FileTime.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FileType.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileType.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FileType.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/FileTypes.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/NativeDispatcher.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java b/termux/shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java rename to termux/shared/src/main/java/com/termux/shared/file/filesystem/UnixConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java b/termux/shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java rename to termux/shared/src/main/java/com/termux/shared/file/tests/FileUtilsTests.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java b/termux/shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java rename to termux/shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java b/termux/shared/src/main/java/com/termux/shared/interact/ShareUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/interact/ShareUtils.java rename to termux/shared/src/main/java/com/termux/shared/interact/ShareUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java b/termux/shared/src/main/java/com/termux/shared/jni/models/JniResult.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/jni/models/JniResult.java rename to termux/shared/src/main/java/com/termux/shared/jni/models/JniResult.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/logger/Logger.java b/termux/shared/src/main/java/com/termux/shared/logger/Logger.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/logger/Logger.java rename to termux/shared/src/main/java/com/termux/shared/logger/Logger.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java b/termux/shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java rename to termux/shared/src/main/java/com/termux/shared/markdown/MarkdownUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux/shared/src/main/java/com/termux/shared/models/ReportInfo.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java rename to termux/shared/src/main/java/com/termux/shared/models/ReportInfo.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java b/termux/shared/src/main/java/com/termux/shared/models/TextIOInfo.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/models/TextIOInfo.java rename to termux/shared/src/main/java/com/termux/shared/models/TextIOInfo.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/ILocalSocketManager.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalServerSocket.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManager.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketManagerClientBase.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/LocalSocketRunConfig.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java b/termux/shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java rename to termux/shared/src/main/java/com/termux/shared/net/socket/local/PeerCred.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java b/termux/shared/src/main/java/com/termux/shared/net/uri/UriScheme.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/uri/UriScheme.java rename to termux/shared/src/main/java/com/termux/shared/net/uri/UriScheme.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java b/termux/shared/src/main/java/com/termux/shared/net/uri/UriUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/uri/UriUtils.java rename to termux/shared/src/main/java/com/termux/shared/net/uri/UriUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java b/termux/shared/src/main/java/com/termux/shared/net/url/UrlUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/net/url/UrlUtils.java rename to termux/shared/src/main/java/com/termux/shared/net/url/UrlUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java b/termux/shared/src/main/java/com/termux/shared/notification/NotificationUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/notification/NotificationUtils.java rename to termux/shared/src/main/java/com/termux/shared/notification/NotificationUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java b/termux/shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java rename to termux/shared/src/main/java/com/termux/shared/reflection/ReflectionUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java b/termux/shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java rename to termux/shared/src/main/java/com/termux/shared/settings/preferences/AppSharedPreferences.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java b/termux/shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java rename to termux/shared/src/main/java/com/termux/shared/settings/preferences/SharedPreferenceUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux/shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java rename to termux/shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java b/termux/shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java rename to termux/shared/src/main/java/com/termux/shared/settings/properties/SharedPropertiesParser.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java b/termux/shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java rename to termux/shared/src/main/java/com/termux/shared/shell/ArgumentTokenizer.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java b/termux/shared/src/main/java/com/termux/shared/shell/ShellUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/ShellUtils.java rename to termux/shared/src/main/java/com/termux/shared/shell/ShellUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java b/termux/shared/src/main/java/com/termux/shared/shell/StreamGobbler.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/StreamGobbler.java rename to termux/shared/src/main/java/com/termux/shared/shell/StreamGobbler.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java b/termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java rename to termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java b/termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java rename to termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServerErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java b/termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java rename to termux/shared/src/main/java/com/termux/shared/shell/am/AmSocketServerRunConfig.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java b/termux/shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/ExecutionCommand.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java b/termux/shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/ShellCommandConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/AndroidShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/IShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellCommandShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/ShellEnvironmentVariable.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java b/termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultConfig.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java b/termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultData.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java b/termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultSender.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java b/termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/result/ResultSenderErrno.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java b/termux/shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java rename to termux/shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java b/termux/shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java rename to termux/shared/src/main/java/com/termux/shared/termux/TermuxBootstrap.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java b/termux/shared/src/main/java/com/termux/shared/termux/TermuxConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java rename to termux/shared/src/main/java/com/termux/shared/termux/TermuxConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/TermuxUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/TermuxUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/TermuxUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/crash/TermuxCrashUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/data/TermuxUrlUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeyButton.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysInfo.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/ExtraKeysView.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButton.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java b/termux/shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java rename to termux/shared/src/main/java/com/termux/shared/termux/extrakeys/SpecialButtonState.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/file/TermuxFileUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/interact/TextInputDialogUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java b/termux/shared/src/main/java/com/termux/shared/termux/models/UserAction.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/models/UserAction.java rename to termux/shared/src/main/java/com/termux/shared/termux/models/UserAction.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/notification/TermuxNotificationUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/plugins/TermuxPluginUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java b/termux/shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java rename to termux/shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java b/termux/shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java rename to termux/shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxPreferenceConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java b/termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java rename to termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxAppSharedProperties.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java b/termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java rename to termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java b/termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java rename to termux/shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/TermuxShellManager.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/TermuxShellUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/am/TermuxAmSocketServer.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxAppShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellCommandShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/command/environment/TermuxShellEnvironment.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java b/termux/shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java rename to termux/shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java b/termux/shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java rename to termux/shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalSessionClientBase.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java b/termux/shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java rename to termux/shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java b/termux/shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java rename to termux/shared/src/main/java/com/termux/shared/termux/terminal/io/BellHandler.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java b/termux/shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java rename to termux/shared/src/main/java/com/termux/shared/termux/terminal/io/TerminalExtraKeys.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java b/termux/shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java rename to termux/shared/src/main/java/com/termux/shared/termux/theme/TermuxThemeUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java b/termux/shared/src/main/java/com/termux/shared/theme/NightMode.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/theme/NightMode.java rename to termux/shared/src/main/java/com/termux/shared/theme/NightMode.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java b/termux/shared/src/main/java/com/termux/shared/theme/ThemeUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/theme/ThemeUtils.java rename to termux/shared/src/main/java/com/termux/shared/theme/ThemeUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java b/termux/shared/src/main/java/com/termux/shared/view/KeyboardUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/view/KeyboardUtils.java rename to termux/shared/src/main/java/com/termux/shared/view/KeyboardUtils.java diff --git a/termux/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java b/termux/shared/src/main/java/com/termux/shared/view/ViewUtils.java similarity index 100% rename from termux/termux-shared/src/main/java/com/termux/shared/view/ViewUtils.java rename to termux/shared/src/main/java/com/termux/shared/view/ViewUtils.java diff --git a/termux/termux-shared/src/main/res/drawable/ic_error_notification.xml b/termux/shared/src/main/res/drawable/ic_error_notification.xml similarity index 100% rename from termux/termux-shared/src/main/res/drawable/ic_error_notification.xml rename to termux/shared/src/main/res/drawable/ic_error_notification.xml diff --git a/termux/termux-shared/src/main/res/layout/activity_report.xml b/termux/shared/src/main/res/layout/activity_report.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/activity_report.xml rename to termux/shared/src/main/res/layout/activity_report.xml diff --git a/termux/termux-shared/src/main/res/layout/activity_text_io.xml b/termux/shared/src/main/res/layout/activity_text_io.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/activity_text_io.xml rename to termux/shared/src/main/res/layout/activity_text_io.xml diff --git a/termux/termux-shared/src/main/res/layout/dialog_show_message.xml b/termux/shared/src/main/res/layout/dialog_show_message.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/dialog_show_message.xml rename to termux/shared/src/main/res/layout/dialog_show_message.xml diff --git a/termux/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml b/termux/shared/src/main/res/layout/markdown_adapter_node_code_block.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/markdown_adapter_node_code_block.xml rename to termux/shared/src/main/res/layout/markdown_adapter_node_code_block.xml diff --git a/termux/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml b/termux/shared/src/main/res/layout/markdown_adapter_node_default.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/markdown_adapter_node_default.xml rename to termux/shared/src/main/res/layout/markdown_adapter_node_default.xml diff --git a/termux/termux-shared/src/main/res/layout/partial_primary_toolbar.xml b/termux/shared/src/main/res/layout/partial_primary_toolbar.xml similarity index 100% rename from termux/termux-shared/src/main/res/layout/partial_primary_toolbar.xml rename to termux/shared/src/main/res/layout/partial_primary_toolbar.xml diff --git a/termux/termux-shared/src/main/res/menu/menu_report.xml b/termux/shared/src/main/res/menu/menu_report.xml similarity index 100% rename from termux/termux-shared/src/main/res/menu/menu_report.xml rename to termux/shared/src/main/res/menu/menu_report.xml diff --git a/termux/termux-shared/src/main/res/menu/menu_text_io.xml b/termux/shared/src/main/res/menu/menu_text_io.xml similarity index 100% rename from termux/termux-shared/src/main/res/menu/menu_text_io.xml rename to termux/shared/src/main/res/menu/menu_text_io.xml diff --git a/termux/termux-shared/src/main/res/raw/apt_info_script.sh b/termux/shared/src/main/res/raw/apt_info_script.sh similarity index 100% rename from termux/termux-shared/src/main/res/raw/apt_info_script.sh rename to termux/shared/src/main/res/raw/apt_info_script.sh diff --git a/termux/termux-shared/src/main/res/raw/bell.ogg b/termux/shared/src/main/res/raw/bell.ogg similarity index 100% rename from termux/termux-shared/src/main/res/raw/bell.ogg rename to termux/shared/src/main/res/raw/bell.ogg diff --git a/termux/termux-shared/src/main/res/raw/keep.xml b/termux/shared/src/main/res/raw/keep.xml similarity index 100% rename from termux/termux-shared/src/main/res/raw/keep.xml rename to termux/shared/src/main/res/raw/keep.xml diff --git a/termux/termux-emulator/build.gradle.kts b/termux/termux-emulator/build.gradle.kts deleted file mode 100644 index 100065ccc..000000000 --- a/termux/termux-emulator/build.gradle.kts +++ /dev/null @@ -1,40 +0,0 @@ -import com.itsaky.androidide.build.config.BuildConfig - -plugins { - id("com.android.library") - id("kotlin-android") -} - -android { - namespace = "com.termux.emulator" - ndkVersion = BuildConfig.ndkVersion - - defaultConfig { - externalNativeBuild { - ndkBuild { - cFlags += arrayOf("-std=c11", "-Wall", "-Wextra", "-Werror", "-Os", "-fno-stack-protector", "-Wl,--gc-sections") - } - } - } - - externalNativeBuild { - ndkBuild { - path = file("src/main/jni/Android.mk") - } - } - - testOptions { - unitTests.isReturnDefaultValues = true - } -} - -tasks.withType(Test::class.java) { - testLogging { - events("started", "passed", "skipped", "failed") - } -} - -dependencies { - implementation(libs.androidx.annotation) - testImplementation(projects.subprojects.testingUnit) -} diff --git a/termux/termux-view/build.gradle.kts b/termux/termux-view/build.gradle.kts deleted file mode 100644 index 3a8df2644..000000000 --- a/termux/termux-view/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -import com.itsaky.androidide.build.config.BuildConfig - -plugins { - id("com.android.library") - id("kotlin-android") -} - -android { - namespace = "com.termux.view" - ndkVersion = BuildConfig.ndkVersion -} - -dependencies { - implementation(libs.androidx.annotation) - implementation(projects.resources) - api(projects.termux.termuxEmulator) - - testImplementation(projects.subprojects.testingUnit) -} \ No newline at end of file diff --git a/shared/.gitignore b/termux/view/.gitignore similarity index 100% rename from shared/.gitignore rename to termux/view/.gitignore diff --git a/termux/view/build.gradle.kts b/termux/view/build.gradle.kts new file mode 100644 index 000000000..e52e86b0a --- /dev/null +++ b/termux/view/build.gradle.kts @@ -0,0 +1,42 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +import com.itsaky.androidide.build.config.BuildConfig + +plugins { + id("com.android.library") + id("kotlin-android") +} + +groupConfig { + groupIdSuffix.set("termux") +} + +android { + namespace = "com.termux.view" + ndkVersion = BuildConfig.ndkVersion +} + +dependencies { + api(projects.termux.emulator) + + implementation(libs.androidx.annotation) + + implementation(projects.core.resources) + + testImplementation(projects.testing.unitTest) +} \ No newline at end of file diff --git a/termux/termux-view/proguard-rules.pro b/termux/view/proguard-rules.pro similarity index 100% rename from termux/termux-view/proguard-rules.pro rename to termux/view/proguard-rules.pro diff --git a/termux/termux-view/src/main/AndroidManifest.xml b/termux/view/src/main/AndroidManifest.xml similarity index 100% rename from termux/termux-view/src/main/AndroidManifest.xml rename to termux/view/src/main/AndroidManifest.xml diff --git a/termux/termux-view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java b/termux/view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java rename to termux/view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java diff --git a/termux/termux-view/src/main/java/com/termux/view/TerminalRenderer.java b/termux/view/src/main/java/com/termux/view/TerminalRenderer.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/TerminalRenderer.java rename to termux/view/src/main/java/com/termux/view/TerminalRenderer.java diff --git a/termux/termux-view/src/main/java/com/termux/view/TerminalView.java b/termux/view/src/main/java/com/termux/view/TerminalView.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/TerminalView.java rename to termux/view/src/main/java/com/termux/view/TerminalView.java diff --git a/termux/termux-view/src/main/java/com/termux/view/TerminalViewClient.java b/termux/view/src/main/java/com/termux/view/TerminalViewClient.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/TerminalViewClient.java rename to termux/view/src/main/java/com/termux/view/TerminalViewClient.java diff --git a/termux/termux-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java b/termux/view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java rename to termux/view/src/main/java/com/termux/view/support/PopupWindowCompatGingerbread.java diff --git a/termux/termux-view/src/main/java/com/termux/view/textselection/CursorController.java b/termux/view/src/main/java/com/termux/view/textselection/CursorController.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/textselection/CursorController.java rename to termux/view/src/main/java/com/termux/view/textselection/CursorController.java diff --git a/termux/termux-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java b/termux/view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java rename to termux/view/src/main/java/com/termux/view/textselection/TextSelectionCursorController.java diff --git a/termux/termux-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java b/termux/view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java similarity index 100% rename from termux/termux-view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java rename to termux/view/src/main/java/com/termux/view/textselection/TextSelectionHandleView.java diff --git a/subprojects/aaptcompiler/.gitignore b/testing/androidTest/.gitignore similarity index 100% rename from subprojects/aaptcompiler/.gitignore rename to testing/androidTest/.gitignore diff --git a/subprojects/testing-android/build.gradle.kts b/testing/androidTest/build.gradle.kts similarity index 90% rename from subprojects/testing-android/build.gradle.kts rename to testing/androidTest/build.gradle.kts index ffbdc1ec6..4e1213d4d 100644 --- a/subprojects/testing-android/build.gradle.kts +++ b/testing/androidTest/build.gradle.kts @@ -22,6 +22,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("testing") +} + android { namespace = "${BuildConfig.packageName}.testing.android" } @@ -42,7 +46,7 @@ dependencies { // compileOnly so that we can provide the APIs for the related test rules // if a module needs to use those APIs, it needs to explicitly add the database module as a // dependency - compileOnly(projects.subprojects.database) + compileOnly(projects.core.database) api(libs.google.protobuf) api(libs.tests.androidx.espresso.core) @@ -58,8 +62,8 @@ dependencies { exclude("org.jetbrains.kotlin") } - api(projects.buildInfo) - api(projects.common) - api(projects.shared) - api(projects.subprojects.testingCommon) + api(projects.core.common) + api(projects.testing.commonTest) + api(projects.utilities.buildInfo) + api(projects.utilities.shared) } \ No newline at end of file diff --git a/shared/consumer-rules.pro b/testing/androidTest/consumer-rules.pro similarity index 100% rename from shared/consumer-rules.pro rename to testing/androidTest/consumer-rules.pro diff --git a/preferences/proguard-rules.pro b/testing/androidTest/proguard-rules.pro similarity index 100% rename from preferences/proguard-rules.pro rename to testing/androidTest/proguard-rules.pro diff --git a/subprojects/testing-android/src/main/java/androidx/test/uiautomator/UiDeviceAccessor.java b/testing/androidTest/src/main/java/androidx/test/uiautomator/UiDeviceAccessor.java similarity index 100% rename from subprojects/testing-android/src/main/java/androidx/test/uiautomator/UiDeviceAccessor.java rename to testing/androidTest/src/main/java/androidx/test/uiautomator/UiDeviceAccessor.java diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/contextUtils.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/contextUtils.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/contextUtils.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/contextUtils.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/rules/AbstractAndroidTestRule.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/rules/AbstractAndroidTestRule.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/rules/AbstractAndroidTestRule.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/rules/AbstractAndroidTestRule.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/rules/RealmDBTestRule.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/rules/RealmDBTestRule.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/rules/RealmDBTestRule.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/rules/RealmDBTestRule.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiAutomatorUtils.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiAutomatorUtils.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiAutomatorUtils.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiAutomatorUtils.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiDeviceUtils.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiDeviceUtils.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiDeviceUtils.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiDeviceUtils.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiObjectUtils.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiObjectUtils.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/uiObjectUtils.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/uiObjectUtils.kt diff --git a/subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/util/NoOpStatement.kt b/testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/util/NoOpStatement.kt similarity index 100% rename from subprojects/testing-android/src/main/java/com/itsaky/androidide/testing/android/util/NoOpStatement.kt rename to testing/androidTest/src/main/java/com/itsaky/androidide/testing/android/util/NoOpStatement.kt diff --git a/subprojects/builder-model-impl/.gitignore b/testing/benchmarks/.gitignore similarity index 100% rename from subprojects/builder-model-impl/.gitignore rename to testing/benchmarks/.gitignore diff --git a/subprojects/testing-benchmark/benchmark-proguard-rules.pro b/testing/benchmarks/benchmark-proguard-rules.pro similarity index 100% rename from subprojects/testing-benchmark/benchmark-proguard-rules.pro rename to testing/benchmarks/benchmark-proguard-rules.pro diff --git a/subprojects/testing-benchmark/build.gradle.kts b/testing/benchmarks/build.gradle.kts similarity index 86% rename from subprojects/testing-benchmark/build.gradle.kts rename to testing/benchmarks/build.gradle.kts index 596b71512..e8ef9e7aa 100644 --- a/subprojects/testing-benchmark/build.gradle.kts +++ b/testing/benchmarks/build.gradle.kts @@ -23,6 +23,10 @@ plugins { alias(libs.plugins.benchmark) } +groupConfig { + groupIdSuffix.set("testing") +} + android { namespace = "${BuildConfig.packageName}.benchmark" @@ -62,9 +66,9 @@ dependencies { androidTestImplementation(libs.tests.google.truth) androidTestImplementation(libs.androidx.benchmark.junit4) - androidTestImplementation(projects.common) - androidTestImplementation(projects.lsp.java) - androidTestImplementation(projects.shared) - androidTestImplementation(projects.subprojects.database) - androidTestImplementation(projects.subprojects.indexing) + androidTestImplementation(projects.core.common) + androidTestImplementation(projects.core.database) + androidTestImplementation(projects.core.indexing) + androidTestImplementation(projects.java.lsp) + androidTestImplementation(projects.utilities.shared) } \ No newline at end of file diff --git a/subprojects/testing-benchmark/src/androidTest/AndroidManifest.xml b/testing/benchmarks/src/androidTest/AndroidManifest.xml similarity index 100% rename from subprojects/testing-benchmark/src/androidTest/AndroidManifest.xml rename to testing/benchmarks/src/androidTest/AndroidManifest.xml diff --git a/subprojects/testing-benchmark/src/androidTest/java/com/itsaky/androidide/benchmark/lsp/java/JavaIndexingWorkerBenchmark.kt b/testing/benchmarks/src/androidTest/java/com/itsaky/androidide/benchmark/lsp/java/JavaIndexingWorkerBenchmark.kt similarity index 100% rename from subprojects/testing-benchmark/src/androidTest/java/com/itsaky/androidide/benchmark/lsp/java/JavaIndexingWorkerBenchmark.kt rename to testing/benchmarks/src/androidTest/java/com/itsaky/androidide/benchmark/lsp/java/JavaIndexingWorkerBenchmark.kt diff --git a/subprojects/database/.gitignore b/testing/commonTest/.gitignore similarity index 100% rename from subprojects/database/.gitignore rename to testing/commonTest/.gitignore diff --git a/subprojects/testing-common/build.gradle.kts b/testing/commonTest/build.gradle.kts similarity index 89% rename from subprojects/testing-common/build.gradle.kts rename to testing/commonTest/build.gradle.kts index cb00c2278..9254318db 100644 --- a/subprojects/testing-common/build.gradle.kts +++ b/testing/commonTest/build.gradle.kts @@ -22,12 +22,16 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("testing") +} + dependencies { kapt(libs.google.auto.service) api(libs.google.auto.service.annotations) api(libs.tests.junit) - api(projects.logger) + api(projects.logging.logger) - api(projects.subprojects.toolingApiImpl) + api(projects.tooling.impl) } \ No newline at end of file diff --git a/subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/CIOnlyTestRule.kt b/testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/CIOnlyTestRule.kt similarity index 100% rename from subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/CIOnlyTestRule.kt rename to testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/CIOnlyTestRule.kt diff --git a/subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/NoOpStatement.kt b/testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/NoOpStatement.kt similarity index 100% rename from subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/NoOpStatement.kt rename to testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/NoOpStatement.kt diff --git a/subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/logging/TestingLoggingConfgurator.kt b/testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/logging/TestingLoggingConfgurator.kt similarity index 100% rename from subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/logging/TestingLoggingConfgurator.kt rename to testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/logging/TestingLoggingConfgurator.kt diff --git a/subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/utils/OperatingSystem.kt b/testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/utils/OperatingSystem.kt similarity index 100% rename from subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/utils/OperatingSystem.kt rename to testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/utils/OperatingSystem.kt diff --git a/subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/utils/utilsExt.kt b/testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/utils/utilsExt.kt similarity index 100% rename from subprojects/testing-common/src/main/java/com/itsaky/androidide/testing/common/utils/utilsExt.kt rename to testing/commonTest/src/main/java/com/itsaky/androidide/testing/common/utils/utilsExt.kt diff --git a/subprojects/flashbar/.gitignore b/testing/gradleToolingTest/.gitignore similarity index 100% rename from subprojects/flashbar/.gitignore rename to testing/gradleToolingTest/.gitignore diff --git a/subprojects/testing-tooling/build.gradle.kts b/testing/gradleToolingTest/build.gradle.kts similarity index 79% rename from subprojects/testing-tooling/build.gradle.kts rename to testing/gradleToolingTest/build.gradle.kts index dbf86033a..9325376be 100644 --- a/subprojects/testing-tooling/build.gradle.kts +++ b/testing/gradleToolingTest/build.gradle.kts @@ -21,18 +21,23 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("testing") +} + dependencies { api(libs.common.jkotlin) api(libs.tests.robolectric) api(libs.tests.junit) api(libs.tests.google.truth) api(libs.tests.mockk) - api(projects.buildInfo) - api(projects.logger) - api(projects.shared) - api(projects.subprojects.toolingApi) - api(projects.subprojects.testingCommon) + + api(projects.logging.logger) + api(projects.utilities.buildInfo) + api(projects.utilities.shared) + api(projects.testing.commonTest) + api(projects.tooling.api) // build tooling API before tests - compileOnly(projects.subprojects.toolingApiImpl) + compileOnly(projects.tooling.impl) } \ No newline at end of file diff --git a/subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/ToolingApiTestLauncher.kt b/testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/ToolingApiTestLauncher.kt similarity index 100% rename from subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/ToolingApiTestLauncher.kt rename to testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/ToolingApiTestLauncher.kt diff --git a/subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestLauncherParams.kt b/testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestLauncherParams.kt similarity index 100% rename from subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestLauncherParams.kt rename to testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestLauncherParams.kt diff --git a/subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestScope.kt b/testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestScope.kt similarity index 100% rename from subprojects/testing-tooling/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestScope.kt rename to testing/gradleToolingTest/src/main/java/com/itsaky/androidide/testing/tooling/models/ToolingApiTestScope.kt diff --git a/subprojects/indexing/.gitignore b/testing/lspTest/.gitignore similarity index 100% rename from subprojects/indexing/.gitignore rename to testing/lspTest/.gitignore diff --git a/subprojects/testing-lsp/build.gradle.kts b/testing/lspTest/build.gradle.kts similarity index 73% rename from subprojects/testing-lsp/build.gradle.kts rename to testing/lspTest/build.gradle.kts index 9c874bc82..21319b9f5 100644 --- a/subprojects/testing-lsp/build.gradle.kts +++ b/testing/lspTest/build.gradle.kts @@ -22,6 +22,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("testing") +} + android { namespace = "${BuildConfig.packageName}.lsp.testing" } @@ -32,12 +36,12 @@ dependencies { api(libs.common.kotlin) api(libs.tests.mockito.kotlin) - api(projects.actions) - api(projects.common) - api(projects.eventbusAndroid) - api(projects.lsp.api) - api(projects.subprojects.testingCommon) - api(projects.subprojects.testingAndroid) - api(projects.subprojects.testingTooling) - api(projects.subprojects.testingUnit) + api(projects.core.actions) + api(projects.core.common) + api(projects.core.lspApi) + api(projects.event.eventbusAndroid) + api(projects.testing.commonTest) + api(projects.testing.androidTest) + api(projects.testing.gradleToolingTest) + api(projects.testing.unitTest) } \ No newline at end of file diff --git a/subprojects/testing-lsp/src/main/AndroidManifest.xml b/testing/lspTest/src/main/AndroidManifest.xml similarity index 100% rename from subprojects/testing-lsp/src/main/AndroidManifest.xml rename to testing/lspTest/src/main/AndroidManifest.xml diff --git a/subprojects/testing-lsp/src/main/java/com/itsaky/androidide/lsp/testing/LSPTest.kt b/testing/lspTest/src/main/java/com/itsaky/androidide/lsp/testing/LSPTest.kt similarity index 100% rename from subprojects/testing-lsp/src/main/java/com/itsaky/androidide/lsp/testing/LSPTest.kt rename to testing/lspTest/src/main/java/com/itsaky/androidide/lsp/testing/LSPTest.kt diff --git a/subprojects/testing-lsp/src/main/java/com/itsaky/androidide/lsp/testing/util/ReflectiveLogListener.kt b/testing/lspTest/src/main/java/com/itsaky/androidide/lsp/testing/util/ReflectiveLogListener.kt similarity index 100% rename from subprojects/testing-lsp/src/main/java/com/itsaky/androidide/lsp/testing/util/ReflectiveLogListener.kt rename to testing/lspTest/src/main/java/com/itsaky/androidide/lsp/testing/util/ReflectiveLogListener.kt diff --git a/subprojects/javac-services/.gitignore b/testing/unitTest/.gitignore similarity index 100% rename from subprojects/javac-services/.gitignore rename to testing/unitTest/.gitignore diff --git a/subprojects/testing-unit/build.gradle.kts b/testing/unitTest/build.gradle.kts similarity index 85% rename from subprojects/testing-unit/build.gradle.kts rename to testing/unitTest/build.gradle.kts index 9aa82f05c..7b75f761d 100644 --- a/subprojects/testing-unit/build.gradle.kts +++ b/testing/unitTest/build.gradle.kts @@ -22,6 +22,10 @@ plugins { kotlin("android") } +groupConfig { + groupIdSuffix.set("testing") +} + android { namespace = "${BuildConfig.packageName}.testing.unit" } @@ -32,8 +36,9 @@ dependencies { api(libs.tests.junit) api(libs.tests.google.truth) api(libs.tests.mockk) - api(projects.buildInfo) - api(projects.common) - api(projects.shared) - api(projects.subprojects.testingCommon) + + api(projects.core.common) + api(projects.testing.commonTest) + api(projects.utilities.buildInfo) + api(projects.utilities.shared) } \ No newline at end of file diff --git a/subprojects/database/consumer-rules.pro b/testing/unitTest/consumer-rules.pro similarity index 100% rename from subprojects/database/consumer-rules.pro rename to testing/unitTest/consumer-rules.pro diff --git a/resources/proguard-rules.pro b/testing/unitTest/proguard-rules.pro similarity index 100% rename from resources/proguard-rules.pro rename to testing/unitTest/proguard-rules.pro diff --git a/subprojects/projects/.gitignore b/tooling/api/.gitignore similarity index 100% rename from subprojects/projects/.gitignore rename to tooling/api/.gitignore diff --git a/subprojects/tooling-api/build.gradle.kts b/tooling/api/build.gradle.kts similarity index 77% rename from subprojects/tooling-api/build.gradle.kts rename to tooling/api/build.gradle.kts index dd250cdcc..93503c308 100644 --- a/subprojects/tooling-api/build.gradle.kts +++ b/tooling/api/build.gradle.kts @@ -21,13 +21,17 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("tooling") +} + dependencies { - api(projects.buildInfo) - api(projects.logger) - api(projects.shared) - api(projects.subprojects.toolingApiModel) - api(projects.subprojects.toolingApiEvents) - + api(projects.logging.logger) + api(projects.tooling.events) + api(projects.tooling.model) + api(projects.utilities.buildInfo) + api(projects.utilities.shared) + api(libs.google.gson) api(libs.common.jsonrpc) implementation(libs.common.jkotlin) diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/ForwardingToolingApiClient.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/ForwardingToolingApiClient.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/ForwardingToolingApiClient.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/ForwardingToolingApiClient.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiClient.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiClient.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiClient.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiClient.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/AndroidInitializationParams.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/AndroidInitializationParams.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/AndroidInitializationParams.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/AndroidInitializationParams.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/GradleDistributionParams.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/GradleDistributionParams.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/GradleDistributionParams.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/GradleDistributionParams.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/LogMessageParams.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/LogMessageParams.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/LogMessageParams.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/LogMessageParams.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/ShutDownMessage.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/ShutDownMessage.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/ShutDownMessage.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/ShutDownMessage.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/TaskExecutionMessage.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/TaskExecutionMessage.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/TaskExecutionMessage.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/TaskExecutionMessage.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildCancellationRequestResult.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildCancellationRequestResult.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildCancellationRequestResult.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildCancellationRequestResult.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildInfo.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildInfo.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildInfo.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildInfo.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildResult.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildResult.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildResult.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/BuildResult.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/GradleWrapperCheckResult.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/GradleWrapperCheckResult.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/GradleWrapperCheckResult.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/GradleWrapperCheckResult.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/InitializeResult.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/InitializeResult.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/InitializeResult.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/InitializeResult.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/TaskExecutionResult.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/TaskExecutionResult.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/TaskExecutionResult.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/messages/result/TaskExecutionResult.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/FileTypeAdapter.java diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/RuntimeTypeAdapterFactory.java b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/RuntimeTypeAdapterFactory.java similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/RuntimeTypeAdapterFactory.java rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/RuntimeTypeAdapterFactory.java diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingApiLauncher.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingApiLauncher.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingApiLauncher.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingApiLauncher.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingProps.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingProps.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingProps.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/ToolingProps.kt diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/versions.kt b/tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/versions.kt similarity index 100% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/util/versions.kt rename to tooling/api/src/main/java/com/itsaky/androidide/tooling/api/util/versions.kt diff --git a/subprojects/testing-android/.gitignore b/tooling/builder-model-impl/.gitignore similarity index 100% rename from subprojects/testing-android/.gitignore rename to tooling/builder-model-impl/.gitignore diff --git a/subprojects/builder-model-impl/build.gradle.kts b/tooling/builder-model-impl/build.gradle.kts similarity index 87% rename from subprojects/builder-model-impl/build.gradle.kts rename to tooling/builder-model-impl/build.gradle.kts index a2758f0fb..592fd4838 100644 --- a/subprojects/builder-model-impl/build.gradle.kts +++ b/tooling/builder-model-impl/build.gradle.kts @@ -21,8 +21,14 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("tooling") +} + dependencies { - implementation(libs.common.jkotlin) - implementation(projects.buildInfo) api(libs.tooling.builderModel) + + implementation(libs.common.jkotlin) + + implementation(projects.utilities.buildInfo) } \ No newline at end of file diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/BooleanOption.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/BooleanOption.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/BooleanOption.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/BooleanOption.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/DeprecationTarget.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/DeprecationTarget.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/DeprecationTarget.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/DeprecationTarget.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/IntegerOption.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/IntegerOption.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/IntegerOption.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/IntegerOption.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Option.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Option.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Option.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Option.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionParsers.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionParsers.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionParsers.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionParsers.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionalBooleanOption.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionalBooleanOption.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionalBooleanOption.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/OptionalBooleanOption.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/ReplacedOption.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/ReplacedOption.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/ReplacedOption.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/ReplacedOption.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Stage.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Stage.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Stage.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Stage.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/StringOption.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/StringOption.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/StringOption.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/StringOption.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/TestRunnerArguments.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/TestRunnerArguments.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/TestRunnerArguments.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/TestRunnerArguments.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Version.kt b/tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Version.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/android/build/gradle/options/Version.kt rename to tooling/builder-model-impl/src/main/java/com/android/build/gradle/options/Version.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidArtifact.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidGradlePluginProjectFlags.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidGradlePluginProjectFlags.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidGradlePluginProjectFlags.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidGradlePluginProjectFlags.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidLibraryData.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidLibraryData.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidLibraryData.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultAndroidLibraryData.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultApiVersion.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultApiVersion.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultApiVersion.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultApiVersion.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultArtifactDependencies.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultArtifactDependencies.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultArtifactDependencies.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultArtifactDependencies.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultBundleInfo.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultBundleInfo.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultBundleInfo.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultBundleInfo.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultCustomSourceDirectory.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultCustomSourceDirectory.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultCustomSourceDirectory.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultCustomSourceDirectory.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultGraphItem.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultGraphItem.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultGraphItem.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultGraphItem.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaArtifact.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaCompileOptions.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaCompileOptions.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaCompileOptions.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultJavaCompileOptions.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibrary.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibrary.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibrary.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibrary.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibraryInfo.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibraryInfo.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibraryInfo.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibraryInfo.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectInfo.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectInfo.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectInfo.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectInfo.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectSyncIssues.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectSyncIssues.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectSyncIssues.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultProjectSyncIssues.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceProvider.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSourceSetContainer.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSyncIssue.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSyncIssue.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSyncIssue.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultSyncIssue.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestInfo.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestInfo.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestInfo.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestInfo.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestedTargetVariant.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestedTargetVariant.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestedTargetVariant.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultTestedTargetVariant.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultUnresolvedDependency.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultUnresolvedDependency.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultUnresolvedDependency.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultUnresolvedDependency.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariant.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultVariantDependencies.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultViewBindingOptions.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultViewBindingOptions.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultViewBindingOptions.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultViewBindingOptions.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IDESyncIssue.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IDESyncIssue.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IDESyncIssue.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IDESyncIssue.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IJavaCompilerSettings.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IJavaCompilerSettings.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IJavaCompilerSettings.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/IJavaCompilerSettings.kt diff --git a/subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/modelConstants.kt b/tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/modelConstants.kt similarity index 100% rename from subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/modelConstants.kt rename to tooling/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/modelConstants.kt diff --git a/subprojects/testing-benchmark/.gitignore b/tooling/events/.gitignore similarity index 100% rename from subprojects/testing-benchmark/.gitignore rename to tooling/events/.gitignore diff --git a/eventbus/build.gradle.kts b/tooling/events/build.gradle.kts similarity index 91% rename from eventbus/build.gradle.kts rename to tooling/events/build.gradle.kts index 138478f68..040d10c07 100644 --- a/eventbus/build.gradle.kts +++ b/tooling/events/build.gradle.kts @@ -1,26 +1,30 @@ -/* - * This file is part of AndroidIDE. - * - * AndroidIDE is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * AndroidIDE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with AndroidIDE. If not, see . - */ - -@Suppress("JavaPluginLanguageLevel") -plugins { - id("java-library") - id("org.jetbrains.kotlin.jvm") -} - -dependencies { - implementation(libs.common.jkotlin) +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +@Suppress("JavaPluginLanguageLevel") +plugins { + id("java-library") + id("org.jetbrains.kotlin.jvm") +} + +groupConfig { + groupIdSuffix.set("tooling") +} + +dependencies { + implementation(libs.common.jkotlin) } \ No newline at end of file diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/FinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/FinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/FinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/FinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/OperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/OperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/OperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/OperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/OperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/OperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/OperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/OperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/ProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/ProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/ProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/ProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/StartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/StartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/StartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/StartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/StatusEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/StatusEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/StatusEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/StatusEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/configuration/ProjectConfigurationStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/download/FileDownloadStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/internal/DefaultStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskExecutionResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskExecutionResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskExecutionResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskExecutionResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFailureResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFailureResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFailureResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFailureResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSkippedResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSkippedResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSkippedResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSkippedResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSuccessResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSuccessResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSuccessResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/task/TaskSuccessResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/test/TestStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/test/TestStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/transform/TransformStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemFinishEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemFinishEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemFinishEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemFinishEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationDescriptor.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationDescriptor.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationDescriptor.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationDescriptor.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationResult.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationResult.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationResult.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemOperationResult.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemProgressEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemProgressEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemProgressEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemProgressEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemStartEvent.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemStartEvent.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemStartEvent.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/events/work/WorkItemStartEvent.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/BuildIdentifier.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/model/BuildIdentifier.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/BuildIdentifier.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/model/BuildIdentifier.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/PluginIdentifier.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/model/PluginIdentifier.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/PluginIdentifier.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/model/PluginIdentifier.kt diff --git a/subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/ProjectIdentifier.kt b/tooling/events/src/main/java/com/itsaky/androidide/tooling/model/ProjectIdentifier.kt similarity index 100% rename from subprojects/tooling-api-events/src/main/java/com/itsaky/androidide/tooling/model/ProjectIdentifier.kt rename to tooling/events/src/main/java/com/itsaky/androidide/tooling/model/ProjectIdentifier.kt diff --git a/subprojects/testing-common/.gitignore b/tooling/impl/.gitignore similarity index 100% rename from subprojects/testing-common/.gitignore rename to tooling/impl/.gitignore diff --git a/subprojects/tooling-api-impl/build.gradle.kts b/tooling/impl/build.gradle.kts similarity index 85% rename from subprojects/tooling-api-impl/build.gradle.kts rename to tooling/impl/build.gradle.kts index bb54c20e7..6f9929a85 100644 --- a/subprojects/tooling-api-impl/build.gradle.kts +++ b/tooling/impl/build.gradle.kts @@ -25,6 +25,10 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("tooling") +} + tasks.withType { manifest { attributes("Main-Class" to "${BuildConfig.packageName}.tooling.impl.Main") } } @@ -60,10 +64,10 @@ project.tasks.getByName("shadowJar") { dependencies { kapt(libs.google.auto.service) - api(projects.subprojects.toolingApi) + api(projects.tooling.api) - implementation(projects.buildInfo) - implementation(projects.shared) + implementation(projects.utilities.buildInfo) + implementation(projects.utilities.shared) implementation(libs.common.jkotlin) implementation(libs.google.auto.service.annotations) @@ -71,7 +75,7 @@ dependencies { implementation(libs.xml.apis) implementation(libs.tooling.gradleApi) - testImplementation(projects.subprojects.testingTooling) + testImplementation(projects.testing.gradleToolingTest) runtimeOnly(libs.tooling.slf4j) } diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/LoggingOutputStream.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/LoggingOutputStream.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/LoggingOutputStream.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/LoggingOutputStream.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/Main.java diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ProjectInitializationExeption.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/ProjectInitializationExeption.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ProjectInitializationExeption.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/ProjectInitializationExeption.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/AndroidProjectImpl.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/GradleProjectImpl.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/GradleProjectImpl.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/GradleProjectImpl.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/GradleProjectImpl.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/JavaProjectImpl.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/JavaProjectImpl.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/JavaProjectImpl.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/JavaProjectImpl.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/ProjectImpl.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/ProjectImpl.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/ProjectImpl.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/ProjectImpl.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/internal/forwarding/ForwardingProject.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingApiAppender.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingApiAppender.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingApiAppender.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingApiAppender.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingLoggingConfigurator.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingLoggingConfigurator.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingLoggingConfigurator.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/logging/ToolingLoggingConfigurator.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/EventTransformer.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/EventTransformer.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/EventTransformer.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/EventTransformer.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/ForwardingProgressListener.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/ForwardingProgressListener.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/ForwardingProgressListener.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/progress/ForwardingProgressListener.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AndroidProjectModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/GradleProjectModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/GradleProjectModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/GradleProjectModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/GradleProjectModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/IModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/IModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/IModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/IModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ISyncIssueReporter.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ISyncIssueReporter.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ISyncIssueReporter.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ISyncIssueReporter.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/JavaProjectModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/JavaProjectModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/JavaProjectModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/JavaProjectModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModelBuilderException.java b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModelBuilderException.java similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModelBuilderException.java rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModelBuilderException.java diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModuleProjectModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModuleProjectModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModuleProjectModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/ModuleProjectModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/NotAnAndroidProjectException.java b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/NotAnAndroidProjectException.java similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/NotAnAndroidProjectException.java rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/NotAnAndroidProjectException.java diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/RootModelBuilder.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/RootModelBuilder.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/RootModelBuilder.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/RootModelBuilder.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/types.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/types.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/types.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/types.kt diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/LogbackStatusListener.kt b/tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/util/LogbackStatusListener.kt similarity index 100% rename from subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/util/LogbackStatusListener.kt rename to tooling/impl/src/main/java/com/itsaky/androidide/tooling/impl/util/LogbackStatusListener.kt diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/ApplicationIDComputationTest.kt b/tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/ApplicationIDComputationTest.kt similarity index 100% rename from subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/ApplicationIDComputationTest.kt rename to tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/ApplicationIDComputationTest.kt diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/CIOnlyToolingApiTests.kt b/tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/CIOnlyToolingApiTests.kt similarity index 100% rename from subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/CIOnlyToolingApiTests.kt rename to tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/CIOnlyToolingApiTests.kt diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt b/tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt similarity index 100% rename from subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt rename to tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/ProjectInitializationCancellationTest.kt b/tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/ProjectInitializationCancellationTest.kt similarity index 100% rename from subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/ProjectInitializationCancellationTest.kt rename to tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/ProjectInitializationCancellationTest.kt diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/common.kt b/tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/common.kt similarity index 100% rename from subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/common.kt rename to tooling/impl/src/test/java/com/itsaky/androidide/tooling/impl/common.kt diff --git a/subprojects/testing-lsp/.gitignore b/tooling/model/.gitignore similarity index 100% rename from subprojects/testing-lsp/.gitignore rename to tooling/model/.gitignore diff --git a/subprojects/tooling-api-model/build.gradle.kts b/tooling/model/build.gradle.kts similarity index 88% rename from subprojects/tooling-api-model/build.gradle.kts rename to tooling/model/build.gradle.kts index d6ecdc0f4..ce57361a6 100644 --- a/subprojects/tooling-api-model/build.gradle.kts +++ b/tooling/model/build.gradle.kts @@ -21,14 +21,20 @@ plugins { id ("org.jetbrains.kotlin.jvm") } -dependencies { - implementation(projects.logger) +groupConfig { + groupIdSuffix.set("tooling") +} + +dependencies { - api(projects.subprojects.xmlDom) - api(projects.subprojects.builderModelImpl) api(libs.common.jsonrpc) + api(projects.tooling.builderModelImpl) + api(projects.xml.dom) + implementation(libs.common.jkotlin) + + implementation(projects.logging.logger) } tasks.register < Copy > ("copyToTestDir") { diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IAndroidProject.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IGradleProject.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IGradleProject.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IGradleProject.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IGradleProject.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IJavaProject.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IJavaProject.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IJavaProject.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IJavaProject.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IModuleProject.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IModuleProject.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IModuleProject.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IModuleProject.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IProject.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IProject.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IProject.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IProject.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IProjectQueries.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IProjectQueries.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/IProjectQueries.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/IProjectQueries.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/ProjectType.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/ProjectType.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/ProjectType.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/ProjectType.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidArtifactMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidArtifactMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidArtifactMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidArtifactMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidProjectMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidProjectMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidProjectMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidProjectMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidVariantMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidVariantMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidVariantMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/AndroidVariantMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicAndroidVariantMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicAndroidVariantMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicAndroidVariantMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicAndroidVariantMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicProjectMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicProjectMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicProjectMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BasicProjectMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BuildVariantInfo.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BuildVariantInfo.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/BuildVariantInfo.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/BuildVariantInfo.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleArtifact.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleArtifact.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleArtifact.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleArtifact.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleTask.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleTask.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleTask.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/GradleTask.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/IModuleMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/IModuleMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/IModuleMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/IModuleMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaContentRoot.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaContentRoot.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaContentRoot.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaContentRoot.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleCompilerSettings.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleCompilerSettings.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleCompilerSettings.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleCompilerSettings.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleDependency.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleDependency.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleDependency.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleDependency.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleExternalDependency.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleExternalDependency.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleExternalDependency.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleExternalDependency.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleProjectDependency.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleProjectDependency.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleProjectDependency.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaModuleProjectDependency.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaProjectMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaProjectMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaProjectMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaProjectMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaSourceDirectory.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaSourceDirectory.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaSourceDirectory.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/JavaSourceDirectory.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/Launchable.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/Launchable.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/Launchable.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/Launchable.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/ProjectMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/ProjectMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/ProjectMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/ProjectMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/ToolingServerMetadata.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/ToolingServerMetadata.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/ToolingServerMetadata.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/ToolingServerMetadata.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/params/StringParameter.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/params/StringParameter.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/params/StringParameter.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/params/StringParameter.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/result/SelectProjectResult.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/result/SelectProjectResult.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/models/result/SelectProjectResult.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/models/result/SelectProjectResult.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/util/AndroidModulePropertyCopier.kt diff --git a/subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/utils.kt b/tooling/model/src/main/java/com/itsaky/androidide/tooling/api/util/utils.kt similarity index 100% rename from subprojects/tooling-api-model/src/main/java/com/itsaky/androidide/tooling/api/util/utils.kt rename to tooling/model/src/main/java/com/itsaky/androidide/tooling/api/util/utils.kt diff --git a/subprojects/testing-tooling/.gitignore b/tooling/plugin-config/.gitignore similarity index 100% rename from subprojects/testing-tooling/.gitignore rename to tooling/plugin-config/.gitignore diff --git a/gradle-plugin-config/build.gradle.kts b/tooling/plugin-config/build.gradle.kts similarity index 94% rename from gradle-plugin-config/build.gradle.kts rename to tooling/plugin-config/build.gradle.kts index dfe49f002..90c772be6 100644 --- a/gradle-plugin-config/build.gradle.kts +++ b/tooling/plugin-config/build.gradle.kts @@ -21,4 +21,8 @@ plugins { id("com.vanniktech.maven.publish.base") } +groupConfig { + groupIdSuffix.set("tooling") +} + description = "Configuration options for the Tooling API and Gradle Plugin." \ No newline at end of file diff --git a/gradle-plugin-config/src/main/java/com/itsaky/androidide/tooling/api/LogSenderConfig.java b/tooling/plugin-config/src/main/java/com/itsaky/androidide/tooling/api/LogSenderConfig.java similarity index 100% rename from gradle-plugin-config/src/main/java/com/itsaky/androidide/tooling/api/LogSenderConfig.java rename to tooling/plugin-config/src/main/java/com/itsaky/androidide/tooling/api/LogSenderConfig.java diff --git a/gradle-plugin-config/src/main/java/com/itsaky/androidide/tooling/api/ToolingConfig.java b/tooling/plugin-config/src/main/java/com/itsaky/androidide/tooling/api/ToolingConfig.java similarity index 100% rename from gradle-plugin-config/src/main/java/com/itsaky/androidide/tooling/api/ToolingConfig.java rename to tooling/plugin-config/src/main/java/com/itsaky/androidide/tooling/api/ToolingConfig.java diff --git a/subprojects/testing-unit/.gitignore b/tooling/plugin/.gitignore similarity index 100% rename from subprojects/testing-unit/.gitignore rename to tooling/plugin/.gitignore diff --git a/gradle-plugin/build.gradle.kts b/tooling/plugin/build.gradle.kts similarity index 93% rename from gradle-plugin/build.gradle.kts rename to tooling/plugin/build.gradle.kts index 579b7e4b2..7a68ef13b 100644 --- a/gradle-plugin/build.gradle.kts +++ b/tooling/plugin/build.gradle.kts @@ -25,6 +25,10 @@ plugins { id("com.vanniktech.maven.publish.base") } +groupConfig { + groupIdSuffix.set("tooling") +} + description = "Gradle Plugin for projects that are built with AndroidIDE" tasks.named("test") { @@ -46,8 +50,8 @@ configurations { } dependencies { - implementation(projects.gradlePluginConfig) - implementation(projects.buildInfo) + implementation(projects.tooling.pluginConfig) + implementation(projects.utilities.buildInfo) // use the AGP APIs from the minimum supported AGP version add("androidBuildTool", "com.android.tools.build:gradle:${AGP_VERSION_MINIMUM}") @@ -55,7 +59,7 @@ dependencies { testImplementation(gradleTestKit()) testImplementation(libs.tests.junit.jupiter) testImplementation(libs.tests.google.truth) - testImplementation(projects.shared) + testImplementation(projects.utilities.shared) testRuntimeOnly(libs.tests.junit.platformLauncher) } diff --git a/gradle-plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEGradlePlugin.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEGradlePlugin.kt similarity index 100% rename from gradle-plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEGradlePlugin.kt rename to tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEGradlePlugin.kt diff --git a/gradle-plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt similarity index 100% rename from gradle-plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt rename to tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt diff --git a/gradle-plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt similarity index 100% rename from gradle-plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt rename to tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt diff --git a/gradle-plugin/src/main/java/com/itsaky/androidide/gradle/common.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt similarity index 100% rename from gradle-plugin/src/main/java/com/itsaky/androidide/gradle/common.kt rename to tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt diff --git a/gradle-plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPluginTest.kt b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPluginTest.kt similarity index 100% rename from gradle-plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPluginTest.kt rename to tooling/plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPluginTest.kt diff --git a/gradle-plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEPluginTest.kt b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEPluginTest.kt similarity index 100% rename from gradle-plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEPluginTest.kt rename to tooling/plugin/src/test/java/com/itsaky/androidide/gradle/AndroidIDEPluginTest.kt diff --git a/gradle-plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt similarity index 100% rename from gradle-plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt rename to tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt diff --git a/gradle-plugin/src/test/resources/sample-project/.gitignore b/tooling/plugin/src/test/resources/sample-project/.gitignore similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/.gitignore rename to tooling/plugin/src/test/resources/sample-project/.gitignore diff --git a/gradle-plugin/src/test/resources/sample-project/app/.gitignore b/tooling/plugin/src/test/resources/sample-project/app/.gitignore similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/.gitignore rename to tooling/plugin/src/test/resources/sample-project/app/.gitignore diff --git a/gradle-plugin/src/test/resources/sample-project/app/build.gradle.in b/tooling/plugin/src/test/resources/sample-project/app/build.gradle.in similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/build.gradle.in rename to tooling/plugin/src/test/resources/sample-project/app/build.gradle.in diff --git a/gradle-plugin/src/test/resources/sample-project/app/build.gradle.kts.in b/tooling/plugin/src/test/resources/sample-project/app/build.gradle.kts.in similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/build.gradle.kts.in rename to tooling/plugin/src/test/resources/sample-project/app/build.gradle.kts.in diff --git a/shared/proguard-rules.pro b/tooling/plugin/src/test/resources/sample-project/app/proguard-rules.pro old mode 100644 new mode 100755 similarity index 100% rename from shared/proguard-rules.pro rename to tooling/plugin/src/test/resources/sample-project/app/proguard-rules.pro diff --git a/gradle-plugin/src/test/resources/sample-project/app/src/main/AndroidManifest.xml b/tooling/plugin/src/test/resources/sample-project/app/src/main/AndroidManifest.xml similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/src/main/AndroidManifest.xml rename to tooling/plugin/src/test/resources/sample-project/app/src/main/AndroidManifest.xml diff --git a/gradle-plugin/src/test/resources/sample-project/app/src/main/res/values/strings.xml b/tooling/plugin/src/test/resources/sample-project/app/src/main/res/values/strings.xml similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/app/src/main/res/values/strings.xml rename to tooling/plugin/src/test/resources/sample-project/app/src/main/res/values/strings.xml diff --git a/subprojects/tooling-api-events/.gitignore b/tooling/plugin/src/test/resources/sample-project/build-logic/.gitignore similarity index 100% rename from subprojects/tooling-api-events/.gitignore rename to tooling/plugin/src/test/resources/sample-project/build-logic/.gitignore diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/gradle.properties b/tooling/plugin/src/test/resources/sample-project/build-logic/gradle.properties similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/gradle.properties rename to tooling/plugin/src/test/resources/sample-project/build-logic/gradle.properties diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.jar b/tooling/plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.jar rename to tooling/plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.properties b/tooling/plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.properties rename to tooling/plugin/src/test/resources/sample-project/build-logic/gradle/wrapper/gradle-wrapper.properties diff --git a/termux/termux-shared/.gitignore b/tooling/plugin/src/test/resources/sample-project/build-logic/ide/.gitignore similarity index 100% rename from termux/termux-shared/.gitignore rename to tooling/plugin/src/test/resources/sample-project/build-logic/ide/.gitignore diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/ide/build.gradle.kts b/tooling/plugin/src/test/resources/sample-project/build-logic/ide/build.gradle.kts similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/ide/build.gradle.kts rename to tooling/plugin/src/test/resources/sample-project/build-logic/ide/build.gradle.kts diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/ide/src/main/java/build-logic.root-project.gradle.kts b/tooling/plugin/src/test/resources/sample-project/build-logic/ide/src/main/java/build-logic.root-project.gradle.kts similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/ide/src/main/java/build-logic.root-project.gradle.kts rename to tooling/plugin/src/test/resources/sample-project/build-logic/ide/src/main/java/build-logic.root-project.gradle.kts diff --git a/gradle-plugin/src/test/resources/sample-project/build-logic/settings.gradle.kts b/tooling/plugin/src/test/resources/sample-project/build-logic/settings.gradle.kts similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build-logic/settings.gradle.kts rename to tooling/plugin/src/test/resources/sample-project/build-logic/settings.gradle.kts diff --git a/gradle-plugin/src/test/resources/sample-project/build.gradle.kts.in b/tooling/plugin/src/test/resources/sample-project/build.gradle.kts.in similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/build.gradle.kts.in rename to tooling/plugin/src/test/resources/sample-project/build.gradle.kts.in diff --git a/gradle-plugin/src/test/resources/sample-project/gradle.properties b/tooling/plugin/src/test/resources/sample-project/gradle.properties similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/gradle.properties rename to tooling/plugin/src/test/resources/sample-project/gradle.properties diff --git a/gradle-plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.jar b/tooling/plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.jar rename to tooling/plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle-plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.properties b/tooling/plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.properties rename to tooling/plugin/src/test/resources/sample-project/gradle/wrapper/gradle-wrapper.properties diff --git a/gradle-plugin/src/test/resources/sample-project/gradlew b/tooling/plugin/src/test/resources/sample-project/gradlew similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/gradlew rename to tooling/plugin/src/test/resources/sample-project/gradlew diff --git a/gradle-plugin/src/test/resources/sample-project/gradlew.bat b/tooling/plugin/src/test/resources/sample-project/gradlew.bat similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/gradlew.bat rename to tooling/plugin/src/test/resources/sample-project/gradlew.bat diff --git a/gradle-plugin/src/test/resources/sample-project/nested/app/.gitignore b/tooling/plugin/src/test/resources/sample-project/nested/app/.gitignore similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/nested/app/.gitignore rename to tooling/plugin/src/test/resources/sample-project/nested/app/.gitignore diff --git a/gradle-plugin/src/test/resources/sample-project/nested/app/build.gradle.kts.in b/tooling/plugin/src/test/resources/sample-project/nested/app/build.gradle.kts.in similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/nested/app/build.gradle.kts.in rename to tooling/plugin/src/test/resources/sample-project/nested/app/build.gradle.kts.in diff --git a/subprojects/database/proguard-rules.pro b/tooling/plugin/src/test/resources/sample-project/nested/app/proguard-rules.pro old mode 100644 new mode 100755 similarity index 100% rename from subprojects/database/proguard-rules.pro rename to tooling/plugin/src/test/resources/sample-project/nested/app/proguard-rules.pro diff --git a/gradle-plugin/src/test/resources/sample-project/nested/app/src/main/AndroidManifest.xml b/tooling/plugin/src/test/resources/sample-project/nested/app/src/main/AndroidManifest.xml similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/nested/app/src/main/AndroidManifest.xml rename to tooling/plugin/src/test/resources/sample-project/nested/app/src/main/AndroidManifest.xml diff --git a/gradle-plugin/src/test/resources/sample-project/nested/app/src/main/res/values/strings.xml b/tooling/plugin/src/test/resources/sample-project/nested/app/src/main/res/values/strings.xml similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/nested/app/src/main/res/values/strings.xml rename to tooling/plugin/src/test/resources/sample-project/nested/app/src/main/res/values/strings.xml diff --git a/gradle-plugin/src/test/resources/sample-project/settings.gradle.kts b/tooling/plugin/src/test/resources/sample-project/settings.gradle.kts similarity index 100% rename from gradle-plugin/src/test/resources/sample-project/settings.gradle.kts rename to tooling/plugin/src/test/resources/sample-project/settings.gradle.kts diff --git a/subprojects/tooling-api-impl/.gitignore b/utilities/build-info/.gitignore similarity index 100% rename from subprojects/tooling-api-impl/.gitignore rename to utilities/build-info/.gitignore diff --git a/build-info/build.gradle.kts b/utilities/build-info/build.gradle.kts similarity index 98% rename from build-info/build.gradle.kts rename to utilities/build-info/build.gradle.kts index c3192aaee..b83465ae8 100644 --- a/build-info/build.gradle.kts +++ b/utilities/build-info/build.gradle.kts @@ -34,6 +34,10 @@ plugins { id("com.vanniktech.maven.publish.base") } +groupConfig { + groupIdSuffix.set("utils") +} + description = "Information about the AndroidIDE build" val buildInfoGenDir: Provider = project.layout.buildDirectory.dir("generated/buildInfo") diff --git a/build-info/src/main/java/com/itsaky/androidide/buildinfo/BuildInfo.java.in b/utilities/build-info/src/main/java/com/itsaky/androidide/buildinfo/BuildInfo.java.in similarity index 100% rename from build-info/src/main/java/com/itsaky/androidide/buildinfo/BuildInfo.java.in rename to utilities/build-info/src/main/java/com/itsaky/androidide/buildinfo/BuildInfo.java.in diff --git a/subprojects/tooling-api-model/.gitignore b/utilities/flashbar/.gitignore similarity index 100% rename from subprojects/tooling-api-model/.gitignore rename to utilities/flashbar/.gitignore diff --git a/subprojects/flashbar/README.md b/utilities/flashbar/README.md similarity index 100% rename from subprojects/flashbar/README.md rename to utilities/flashbar/README.md diff --git a/subprojects/flashbar/build.gradle.kts b/utilities/flashbar/build.gradle.kts similarity index 92% rename from subprojects/flashbar/build.gradle.kts rename to utilities/flashbar/build.gradle.kts index f5049b943..c9e9d5b19 100644 --- a/subprojects/flashbar/build.gradle.kts +++ b/utilities/flashbar/build.gradle.kts @@ -22,6 +22,10 @@ plugins { id("kotlin-android") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.flashbar" } @@ -35,5 +39,5 @@ dependencies { implementation(libs.androidx.constraintlayout) implementation(libs.google.material) - implementation(projects.resources) + implementation(projects.core.resources) } \ No newline at end of file diff --git a/subprojects/flashbar/consumer-rules.pro b/utilities/flashbar/consumer-rules.pro similarity index 100% rename from subprojects/flashbar/consumer-rules.pro rename to utilities/flashbar/consumer-rules.pro diff --git a/subprojects/flashbar/proguard-rules.pro b/utilities/flashbar/proguard-rules.pro similarity index 100% rename from subprojects/flashbar/proguard-rules.pro rename to utilities/flashbar/proguard-rules.pro diff --git a/subprojects/flashbar/src/main/AndroidManifest.xml b/utilities/flashbar/src/main/AndroidManifest.xml similarity index 100% rename from subprojects/flashbar/src/main/AndroidManifest.xml rename to utilities/flashbar/src/main/AndroidManifest.xml diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/Flashbar.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/Flashbar.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/Flashbar.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/Flashbar.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarContainerView.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarContainerView.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarContainerView.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarContainerView.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarView.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarView.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarView.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/FlashbarView.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/SwipeDismissTouchListener.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/SwipeDismissTouchListener.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/SwipeDismissTouchListener.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/SwipeDismissTouchListener.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/BaseFlashAnimBuilder.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/BaseFlashAnimBuilder.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/BaseFlashAnimBuilder.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/BaseFlashAnimBuilder.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnim.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnim.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnim.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnim.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimBarBuilder.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimBarBuilder.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimBarBuilder.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimBarBuilder.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimIconBuilder.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimIconBuilder.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimIconBuilder.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/anim/FlashAnimIconBuilder.kt diff --git a/subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/util/CommonUtils.kt b/utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/util/CommonUtils.kt similarity index 100% rename from subprojects/flashbar/src/main/java/com/itsaky/androidide/flashbar/util/CommonUtils.kt rename to utilities/flashbar/src/main/java/com/itsaky/androidide/flashbar/util/CommonUtils.kt diff --git a/subprojects/flashbar/src/main/res/drawable/fb_button_background_selector.xml b/utilities/flashbar/src/main/res/drawable/fb_button_background_selector.xml similarity index 100% rename from subprojects/flashbar/src/main/res/drawable/fb_button_background_selector.xml rename to utilities/flashbar/src/main/res/drawable/fb_button_background_selector.xml diff --git a/subprojects/flashbar/src/main/res/drawable/shadow_bottom.xml b/utilities/flashbar/src/main/res/drawable/shadow_bottom.xml similarity index 100% rename from subprojects/flashbar/src/main/res/drawable/shadow_bottom.xml rename to utilities/flashbar/src/main/res/drawable/shadow_bottom.xml diff --git a/subprojects/flashbar/src/main/res/drawable/shadow_top.xml b/utilities/flashbar/src/main/res/drawable/shadow_top.xml similarity index 100% rename from subprojects/flashbar/src/main/res/drawable/shadow_top.xml rename to utilities/flashbar/src/main/res/drawable/shadow_top.xml diff --git a/subprojects/flashbar/src/main/res/layout/flash_bar_view.xml b/utilities/flashbar/src/main/res/layout/flash_bar_view.xml similarity index 100% rename from subprojects/flashbar/src/main/res/layout/flash_bar_view.xml rename to utilities/flashbar/src/main/res/layout/flash_bar_view.xml diff --git a/subprojects/flashbar/src/main/res/values/attrs.xml b/utilities/flashbar/src/main/res/values/attrs.xml similarity index 100% rename from subprojects/flashbar/src/main/res/values/attrs.xml rename to utilities/flashbar/src/main/res/values/attrs.xml diff --git a/subprojects/flashbar/src/main/res/values/colors.xml b/utilities/flashbar/src/main/res/values/colors.xml similarity index 100% rename from subprojects/flashbar/src/main/res/values/colors.xml rename to utilities/flashbar/src/main/res/values/colors.xml diff --git a/subprojects/flashbar/src/main/res/values/dimens.xml b/utilities/flashbar/src/main/res/values/dimens.xml similarity index 100% rename from subprojects/flashbar/src/main/res/values/dimens.xml rename to utilities/flashbar/src/main/res/values/dimens.xml diff --git a/subprojects/flashbar/src/main/res/values/integers.xml b/utilities/flashbar/src/main/res/values/integers.xml similarity index 100% rename from subprojects/flashbar/src/main/res/values/integers.xml rename to utilities/flashbar/src/main/res/values/integers.xml diff --git a/subprojects/framework-stubs/.gitignore b/utilities/framework-stubs/.gitignore similarity index 100% rename from subprojects/framework-stubs/.gitignore rename to utilities/framework-stubs/.gitignore diff --git a/subprojects/framework-stubs/build.gradle.kts b/utilities/framework-stubs/build.gradle.kts similarity index 94% rename from subprojects/framework-stubs/build.gradle.kts rename to utilities/framework-stubs/build.gradle.kts index 2b3f9a142..ad87b435e 100644 --- a/subprojects/framework-stubs/build.gradle.kts +++ b/utilities/framework-stubs/build.gradle.kts @@ -20,6 +20,10 @@ plugins { id("java-library") } +groupConfig { + groupIdSuffix.set("utils") +} + dependencies { compileOnlyApi(files ("libs/android.jar")) } \ No newline at end of file diff --git a/subprojects/tooling-api/.gitignore b/utilities/lookup/.gitignore similarity index 100% rename from subprojects/tooling-api/.gitignore rename to utilities/lookup/.gitignore diff --git a/lookup/build.gradle.kts b/utilities/lookup/build.gradle.kts similarity index 88% rename from lookup/build.gradle.kts rename to utilities/lookup/build.gradle.kts index 2e1606128..383ac8e26 100644 --- a/lookup/build.gradle.kts +++ b/utilities/lookup/build.gradle.kts @@ -22,11 +22,15 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("utils") +} + dependencies { kapt(libs.google.auto.service) - implementation(projects.logger) - implementation(projects.shared) + implementation(projects.logging.logger) + implementation(projects.utilities.shared) implementation(libs.common.jkotlin) implementation(libs.google.auto.service.annotations) diff --git a/lookup/src/main/java/com/itsaky/androidide/lookup/ForwardingLookup.kt b/utilities/lookup/src/main/java/com/itsaky/androidide/lookup/ForwardingLookup.kt similarity index 100% rename from lookup/src/main/java/com/itsaky/androidide/lookup/ForwardingLookup.kt rename to utilities/lookup/src/main/java/com/itsaky/androidide/lookup/ForwardingLookup.kt diff --git a/lookup/src/main/java/com/itsaky/androidide/lookup/Lookup.java b/utilities/lookup/src/main/java/com/itsaky/androidide/lookup/Lookup.java similarity index 100% rename from lookup/src/main/java/com/itsaky/androidide/lookup/Lookup.java rename to utilities/lookup/src/main/java/com/itsaky/androidide/lookup/Lookup.java diff --git a/lookup/src/main/java/com/itsaky/androidide/lookup/LookupProvider.java b/utilities/lookup/src/main/java/com/itsaky/androidide/lookup/LookupProvider.java similarity index 100% rename from lookup/src/main/java/com/itsaky/androidide/lookup/LookupProvider.java rename to utilities/lookup/src/main/java/com/itsaky/androidide/lookup/LookupProvider.java diff --git a/lookup/src/main/java/com/itsaky/androidide/lookup/ServiceRegisteredException.java b/utilities/lookup/src/main/java/com/itsaky/androidide/lookup/ServiceRegisteredException.java similarity index 100% rename from lookup/src/main/java/com/itsaky/androidide/lookup/ServiceRegisteredException.java rename to utilities/lookup/src/main/java/com/itsaky/androidide/lookup/ServiceRegisteredException.java diff --git a/lookup/src/main/java/com/itsaky/androidide/lookup/internal/DefaultLookup.java b/utilities/lookup/src/main/java/com/itsaky/androidide/lookup/internal/DefaultLookup.java similarity index 100% rename from lookup/src/main/java/com/itsaky/androidide/lookup/internal/DefaultLookup.java rename to utilities/lookup/src/main/java/com/itsaky/androidide/lookup/internal/DefaultLookup.java diff --git a/lookup/src/test/java/com/itsaky/androidide/lookup/LookupTest.kt b/utilities/lookup/src/test/java/com/itsaky/androidide/lookup/LookupTest.kt similarity index 100% rename from lookup/src/test/java/com/itsaky/androidide/lookup/LookupTest.kt rename to utilities/lookup/src/test/java/com/itsaky/androidide/lookup/LookupTest.kt diff --git a/preferences/.gitignore b/utilities/preferences/.gitignore similarity index 100% rename from preferences/.gitignore rename to utilities/preferences/.gitignore diff --git a/preferences/build.gradle.kts b/utilities/preferences/build.gradle.kts similarity index 82% rename from preferences/build.gradle.kts rename to utilities/preferences/build.gradle.kts index 18e5bf0ae..8b6e5c0d5 100644 --- a/preferences/build.gradle.kts +++ b/utilities/preferences/build.gradle.kts @@ -23,15 +23,20 @@ plugins { id("kotlin-parcelize") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.preferences" } dependencies { - implementation(projects.common) - implementation(projects.eventbusEvents) - implementation(projects.resources) - implementation(projects.shared) + implementation(projects.core.common) + implementation(projects.core.resources) + implementation(projects.event.eventbusEvents) + implementation(projects.utilities.shared) + implementation(libs.androidx.annotation) implementation(libs.androidx.preference) implementation(libs.google.material) diff --git a/subprojects/projects/consumer-rules.pro b/utilities/preferences/consumer-rules.pro similarity index 100% rename from subprojects/projects/consumer-rules.pro rename to utilities/preferences/consumer-rules.pro diff --git a/subprojects/projects/proguard-rules.pro b/utilities/preferences/proguard-rules.pro similarity index 100% rename from subprojects/projects/proguard-rules.pro rename to utilities/preferences/proguard-rules.pro diff --git a/preferences/src/main/AndroidManifest.xml b/utilities/preferences/src/main/AndroidManifest.xml similarity index 100% rename from preferences/src/main/AndroidManifest.xml rename to utilities/preferences/src/main/AndroidManifest.xml diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/BaseIDEPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/BaseIDEPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/BaseIDEPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/BaseIDEPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/BasePreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/BasePreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/BasePreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/BasePreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/ChoiceBasedDialogPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/ChoiceBasedDialogPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/ChoiceBasedDialogPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/ChoiceBasedDialogPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/DialogPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/DialogPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/DialogPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/DialogPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/EditTextPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/EditTextPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/EditTextPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/EditTextPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IDEPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IDEPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/IDEPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IDEPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/IPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceGroup.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceInflater.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceInflater.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceInflater.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceInflater.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceScreen.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceScreen.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceScreen.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/IPreferenceScreen.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/MultiChoicePreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/MultiChoicePreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/MultiChoicePreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/MultiChoicePreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/NumberInputEditTextPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/NumberInputEditTextPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/NumberInputEditTextPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/NumberInputEditTextPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceChoices.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceChoices.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceChoices.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceChoices.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceValueType.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceValueType.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceValueType.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/PreferenceValueType.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/SimpleClickablePreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SimpleClickablePreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/SimpleClickablePreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SimpleClickablePreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/SimplePreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SimplePreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/SimplePreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SimplePreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/SingleChoicePreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SingleChoicePreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/SingleChoicePreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SingleChoicePreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/SwitchPreference.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SwitchPreference.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/SwitchPreference.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/SwitchPreference.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/BuildPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/BuildPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/BuildPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/BuildPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/DevOpsPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/DevOpsPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/DevOpsPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/DevOpsPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/EditorPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/EditorPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/EditorPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/EditorPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/GeneralPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/GeneralPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/GeneralPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/GeneralPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/JavaPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/JavaPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/JavaPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/JavaPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/StatPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/StatPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/StatPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/StatPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/XmlPreferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/XmlPreferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/XmlPreferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/XmlPreferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/internal/preferences.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/preferences.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/internal/preferences.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/internal/preferences.kt diff --git a/preferences/src/main/java/com/itsaky/androidide/preferences/utils/editorUtil.kt b/utilities/preferences/src/main/java/com/itsaky/androidide/preferences/utils/editorUtil.kt similarity index 100% rename from preferences/src/main/java/com/itsaky/androidide/preferences/utils/editorUtil.kt rename to utilities/preferences/src/main/java/com/itsaky/androidide/preferences/utils/editorUtil.kt diff --git a/preferences/src/main/res/layout/layout_dialog_text_input.xml b/utilities/preferences/src/main/res/layout/layout_dialog_text_input.xml similarity index 100% rename from preferences/src/main/res/layout/layout_dialog_text_input.xml rename to utilities/preferences/src/main/res/layout/layout_dialog_text_input.xml diff --git a/subprojects/xml-dom/.gitignore b/utilities/shared/.gitignore similarity index 100% rename from subprojects/xml-dom/.gitignore rename to utilities/shared/.gitignore diff --git a/shared/build.gradle.kts b/utilities/shared/build.gradle.kts similarity index 88% rename from shared/build.gradle.kts rename to utilities/shared/build.gradle.kts index bb8182dff..862256d68 100644 --- a/shared/build.gradle.kts +++ b/utilities/shared/build.gradle.kts @@ -21,13 +21,18 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("utils") +} + dependencies { implementation(libs.androidx.annotation) implementation(libs.androidx.collection) implementation(libs.google.guava) implementation(libs.google.gson) - implementation(projects.logger) - implementation(projects.buildInfo) + + implementation(projects.logging.logger) + implementation(projects.utilities.buildInfo) testImplementation(libs.tests.google.truth) testImplementation(libs.tests.junit) diff --git a/subprojects/testing-android/consumer-rules.pro b/utilities/shared/consumer-rules.pro similarity index 100% rename from subprojects/testing-android/consumer-rules.pro rename to utilities/shared/consumer-rules.pro diff --git a/subprojects/testing-android/proguard-rules.pro b/utilities/shared/proguard-rules.pro similarity index 100% rename from subprojects/testing-android/proguard-rules.pro rename to utilities/shared/proguard-rules.pro diff --git a/subprojects/projects/src/main/AndroidManifest.xml b/utilities/shared/src/main/AndroidManifest.xml similarity index 100% rename from subprojects/projects/src/main/AndroidManifest.xml rename to utilities/shared/src/main/AndroidManifest.xml diff --git a/shared/src/main/java/com/itsaky/androidide/models/Locations.kt b/utilities/shared/src/main/java/com/itsaky/androidide/models/Locations.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/models/Locations.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/models/Locations.kt diff --git a/shared/src/main/java/com/itsaky/androidide/models/LogLine.kt b/utilities/shared/src/main/java/com/itsaky/androidide/models/LogLine.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/models/LogLine.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/models/LogLine.kt diff --git a/shared/src/main/java/com/itsaky/androidide/progress/ICancelChecker.kt b/utilities/shared/src/main/java/com/itsaky/androidide/progress/ICancelChecker.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/progress/ICancelChecker.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/progress/ICancelChecker.kt diff --git a/shared/src/main/java/com/itsaky/androidide/progress/ProgressManager.kt b/utilities/shared/src/main/java/com/itsaky/androidide/progress/ProgressManager.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/progress/ProgressManager.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/progress/ProgressManager.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/AndroidPluginVersion.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/AndroidPluginVersion.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/AndroidPluginVersion.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/AndroidPluginVersion.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/Cache.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/Cache.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/Cache.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/Cache.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/ClassTrie.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/ClassTrie.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/ClassTrie.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/ClassTrie.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/DefaultRecyclable.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/DefaultRecyclable.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/DefaultRecyclable.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/DefaultRecyclable.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/DocumentUtils.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/DocumentUtils.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/DocumentUtils.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/DocumentUtils.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt similarity index 94% rename from shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt index b6f90df82..81b67eea3 100644 --- a/shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt +++ b/utilities/shared/src/main/java/com/itsaky/androidide/utils/FileProvider.kt @@ -53,7 +53,7 @@ class FileProvider { fun currentDir(): Path = Paths.get(System.getProperty("user.dir")!!) @JvmStatic - fun implModule(): Path = projectRoot().resolve("subprojects/tooling-api-impl") + fun implModule(): Path = projectRoot().resolve("tooling/impl") @JvmStatic fun projectRoot(): Path = diff --git a/shared/src/main/java/com/itsaky/androidide/utils/InputStreamLineReader.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/InputStreamLineReader.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/InputStreamLineReader.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/InputStreamLineReader.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/IntPair.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/IntPair.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/IntPair.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/IntPair.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/ReaderInputStream.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/RecyclableObjectPool.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/RecyclableObjectPool.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/RecyclableObjectPool.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/RecyclableObjectPool.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/ServiceLoader.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/ServiceLoader.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/ServiceLoader.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/ServiceLoader.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/ServiceNotFoundException.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/ServiceNotFoundException.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/ServiceNotFoundException.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/ServiceNotFoundException.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/SourceClassTrie.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/SourceClassTrie.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/SourceClassTrie.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/SourceClassTrie.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/StopWatch.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/StopWatch.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/StopWatch.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/StopWatch.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/StringUtil.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/StringUtil.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/StringUtil.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/StringUtil.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/UniqueNameBuilder.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/UniqueNameBuilder.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/UniqueNameBuilder.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/UniqueNameBuilder.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/VMUtils.java b/utilities/shared/src/main/java/com/itsaky/androidide/utils/VMUtils.java similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/VMUtils.java rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/VMUtils.java diff --git a/shared/src/main/java/com/itsaky/androidide/utils/collectionExts.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/collectionExts.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/collectionExts.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/collectionExts.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/miscUtils.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/miscUtils.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/miscUtils.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/miscUtils.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/recyclableObjectPoolExtensions.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/recyclableObjectPoolExtensions.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/recyclableObjectPoolExtensions.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/recyclableObjectPoolExtensions.kt diff --git a/shared/src/main/java/com/itsaky/androidide/utils/stringExt.kt b/utilities/shared/src/main/java/com/itsaky/androidide/utils/stringExt.kt similarity index 100% rename from shared/src/main/java/com/itsaky/androidide/utils/stringExt.kt rename to utilities/shared/src/main/java/com/itsaky/androidide/utils/stringExt.kt diff --git a/shared/src/test/java/com/itsaky/androidide/utils/FileProviderTest.kt b/utilities/shared/src/test/java/com/itsaky/androidide/utils/FileProviderTest.kt similarity index 100% rename from shared/src/test/java/com/itsaky/androidide/utils/FileProviderTest.kt rename to utilities/shared/src/test/java/com/itsaky/androidide/utils/FileProviderTest.kt diff --git a/subprojects/xml-utils/.gitignore b/utilities/templates-api/.gitignore similarity index 100% rename from subprojects/xml-utils/.gitignore rename to utilities/templates-api/.gitignore diff --git a/templates-api/build.gradle.kts b/utilities/templates-api/build.gradle.kts similarity index 85% rename from templates-api/build.gradle.kts rename to utilities/templates-api/build.gradle.kts index b45c06eed..bab9833f0 100644 --- a/templates-api/build.gradle.kts +++ b/utilities/templates-api/build.gradle.kts @@ -22,6 +22,10 @@ plugins { id("org.jetbrains.kotlin.android") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.templates" } @@ -29,11 +33,11 @@ android { dependencies { api(libs.composite.javapoet) - api(projects.common) - api(projects.logger) - api(projects.resources) - api(projects.subprojects.xmlDom) - api(projects.subprojects.xmlUtils) + api(projects.core.common) + api(projects.core.resources) + api(projects.logging.logger) + api(projects.xml.dom) + api(projects.xml.utils) api(libs.aapt2.common) api(libs.androidx.annotation) diff --git a/subprojects/testing-unit/consumer-rules.pro b/utilities/templates-api/consumer-rules.pro similarity index 100% rename from subprojects/testing-unit/consumer-rules.pro rename to utilities/templates-api/consumer-rules.pro diff --git a/subprojects/testing-unit/proguard-rules.pro b/utilities/templates-api/proguard-rules.pro similarity index 100% rename from subprojects/testing-unit/proguard-rules.pro rename to utilities/templates-api/proguard-rules.pro diff --git a/templates-api/src/main/AndroidManifest.xml b/utilities/templates-api/src/main/AndroidManifest.xml similarity index 100% rename from templates-api/src/main/AndroidManifest.xml rename to utilities/templates-api/src/main/AndroidManifest.xml diff --git a/templates-api/proguard-rules.pro b/utilities/templates-api/src/main/assets/templates/base/module/android/proguard-rules.pro similarity index 100% rename from templates-api/proguard-rules.pro rename to utilities/templates-api/src/main/assets/templates/base/module/android/proguard-rules.pro diff --git a/templates-api/src/main/assets/templates/base/module/android/res/drawable-v24/ic_launcher_foreground.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/drawable-v24/ic_launcher_foreground.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/drawable-v24/ic_launcher_foreground.xml diff --git a/templates-api/src/main/assets/templates/base/module/android/res/drawable/ic_launcher_background.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/drawable/ic_launcher_background.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/drawable/ic_launcher_background.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/drawable/ic_launcher_background.xml diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher_round.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher_round.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher_round.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher_round.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher_round.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher_round.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher_round.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher_round.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher_round.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher_round.webp b/utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/templates-api/src/main/assets/templates/base/module/android/res/xml/backup_rules.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/xml/backup_rules.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/xml/backup_rules.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/xml/backup_rules.xml diff --git a/templates-api/src/main/assets/templates/base/module/android/res/xml/data_extraction_rules.xml b/utilities/templates-api/src/main/assets/templates/base/module/android/res/xml/data_extraction_rules.xml similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/res/xml/data_extraction_rules.xml rename to utilities/templates-api/src/main/assets/templates/base/module/android/res/xml/data_extraction_rules.xml diff --git a/templates-api/src/main/assets/templates/base/root/gitignore b/utilities/templates-api/src/main/assets/templates/base/root/gitignore similarity index 100% rename from templates-api/src/main/assets/templates/base/root/gitignore rename to utilities/templates-api/src/main/assets/templates/base/root/gitignore diff --git a/templates-api/src/main/assets/templates/base/root/gradle.properties b/utilities/templates-api/src/main/assets/templates/base/root/gradle.properties similarity index 100% rename from templates-api/src/main/assets/templates/base/root/gradle.properties rename to utilities/templates-api/src/main/assets/templates/base/root/gradle.properties diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateProvider.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateProvider.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateProvider.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateProvider.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/ITemplateWidgetViewProvider.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/RecipeExecutor.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/RecipeExecutor.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/RecipeExecutor.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/RecipeExecutor.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/Sdk.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/Sdk.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/Sdk.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/Sdk.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/AndroidModuleTemplateBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/AndroidModuleTemplateBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/AndroidModuleTemplateBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/AndroidModuleTemplateBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/FileTemplateBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/FileTemplateBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/FileTemplateBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/FileTemplateBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/ModuleTemplateBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/ModuleTemplateBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/ModuleTemplateBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/ModuleTemplateBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/ProjectTemplateBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/ProjectTemplateBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/ProjectTemplateBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/ProjectTemplateBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/androidx.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/androidx.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/androidx.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/androidx.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/base.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/base.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/base.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/base.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/Dependency.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/Dependency.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/models/Dependency.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/Dependency.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/DependencyConfiguration.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/DependencyConfiguration.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/models/DependencyConfiguration.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/DependencyConfiguration.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/models.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/models.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/models/models.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/models/models.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/buildGradle.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/buildGradle.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/buildGradle.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/buildGradle.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/manifest.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/manifest.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/manifest.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/manifest.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/misc.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/misc.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/misc.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/misc.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/utils.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/utils.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/utils.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/android/utils.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/common.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/common.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/common.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/modules/common.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/buildGradle.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/buildGradle.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/root/buildGradle.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/buildGradle.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/gradleWrapper.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/gradleWrapper.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/root/gradleWrapper.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/gradleWrapper.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/settings.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/settings.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/root/settings.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/root/settings.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/templateBuilders.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/templateBuilders.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/templateBuilders.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/templateBuilders.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidManifestBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidManifestBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidManifestBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidManifestBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidModuleResManager.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidModuleResManager.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidModuleResManager.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/AndroidModuleResManager.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/SourceWriter.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/SourceWriter.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/util/SourceWriter.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/SourceWriter.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/utils.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/utils.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/util/utils.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/utils.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/xmlBuilder.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/xmlBuilder.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/base/util/xmlBuilder.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/base/util/xmlBuilder.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/constants.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/constants.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/constants.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/constants.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/template.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/template.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/template.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/template.kt diff --git a/templates-api/src/main/java/com/itsaky/androidide/templates/widget.kt b/utilities/templates-api/src/main/java/com/itsaky/androidide/templates/widget.kt similarity index 100% rename from templates-api/src/main/java/com/itsaky/androidide/templates/widget.kt rename to utilities/templates-api/src/main/java/com/itsaky/androidide/templates/widget.kt diff --git a/templates-api/.gitignore b/utilities/templates-impl/.gitignore similarity index 100% rename from templates-api/.gitignore rename to utilities/templates-impl/.gitignore diff --git a/templates-impl/build.gradle.kts b/utilities/templates-impl/build.gradle.kts similarity index 68% rename from templates-impl/build.gradle.kts rename to utilities/templates-impl/build.gradle.kts index f5d439f29..feabcf39d 100644 --- a/templates-impl/build.gradle.kts +++ b/utilities/templates-impl/build.gradle.kts @@ -23,6 +23,10 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.templates.impl" } @@ -30,19 +34,20 @@ android { dependencies { kapt(libs.google.auto.service) - api(projects.templatesApi) + api(projects.utilities.templatesApi) + + implementation(projects.core.common) + implementation(projects.core.projects) + implementation(projects.utilities.preferences) + implementation(projects.utilities.shared) - implementation(projects.shared) - implementation(projects.common) - implementation(projects.preferences) - implementation(projects.subprojects.projects) implementation(libs.androidx.annotation) implementation(libs.androidx.core.ktx) implementation(libs.google.auto.service.annotations) - testImplementation(projects.templatesApi) - testImplementation(projects.lsp.api) - testImplementation(projects.preferences) - testImplementation(projects.subprojects.testingUnit) - testImplementation(projects.subprojects.testingTooling) + testImplementation(projects.core.lspApi) + testImplementation(projects.testing.unitTest) + testImplementation(projects.testing.gradleToolingTest) + testImplementation(projects.utilities.templatesApi) + testImplementation(projects.utilities.preferences) } \ No newline at end of file diff --git a/templates-api/consumer-rules.pro b/utilities/templates-impl/consumer-rules.pro similarity index 100% rename from templates-api/consumer-rules.pro rename to utilities/templates-impl/consumer-rules.pro diff --git a/templates-api/src/main/assets/templates/base/module/android/proguard-rules.pro b/utilities/templates-impl/proguard-rules.pro similarity index 100% rename from templates-api/src/main/assets/templates/base/module/android/proguard-rules.pro rename to utilities/templates-impl/proguard-rules.pro diff --git a/templates-impl/src/main/AndroidManifest.xml b/utilities/templates-impl/src/main/AndroidManifest.xml similarity index 100% rename from templates-impl/src/main/AndroidManifest.xml rename to utilities/templates-impl/src/main/AndroidManifest.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_dashboard_black_24dp.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_dashboard_black_24dp.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_dashboard_black_24dp.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_dashboard_black_24dp.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_home_black_24dp.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_home_black_24dp.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_home_black_24dp.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_home_black_24dp.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_notifications_black_24dp.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_notifications_black_24dp.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_notifications_black_24dp.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/drawable/ic_notifications_black_24dp.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/layout/activity_main.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/activity_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/layout/activity_main.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/activity_main.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_dashboard.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_dashboard.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_dashboard.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_dashboard.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_home.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_home.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_home.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_home.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_notifications.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_notifications.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_notifications.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/layout/fragment_notifications.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/menu/bottom_nav_menu.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/menu/bottom_nav_menu.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/menu/bottom_nav_menu.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/menu/bottom_nav_menu.xml diff --git a/templates-impl/src/main/assets/templates/bottomNav/res/values/dimens.xml b/utilities/templates-impl/src/main/assets/templates/bottomNav/res/values/dimens.xml similarity index 100% rename from templates-impl/src/main/assets/templates/bottomNav/res/values/dimens.xml rename to utilities/templates-impl/src/main/assets/templates/bottomNav/res/values/dimens.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_camera.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_camera.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_camera.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_camera.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_gallery.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_gallery.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_gallery.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_gallery.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_slideshow.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_slideshow.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_slideshow.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/ic_menu_slideshow.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/drawable/side_nav_bar.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/side_nav_bar.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/drawable/side_nav_bar.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/drawable/side_nav_bar.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/activity_main.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/activity_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/activity_main.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/activity_main.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/app_bar_main.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/app_bar_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/app_bar_main.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/app_bar_main.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/content_main.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/content_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/content_main.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/content_main.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_gallery.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_gallery.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_gallery.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_gallery.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_home.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_home.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_home.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_home.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_slideshow.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_slideshow.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_slideshow.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/fragment_slideshow.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/layout/nav_header_main.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/nav_header_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/layout/nav_header_main.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/layout/nav_header_main.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/menu/activity_main_drawer.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/menu/activity_main_drawer.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/menu/activity_main_drawer.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/menu/activity_main_drawer.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/menu/main.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/menu/main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/menu/main.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/menu/main.xml diff --git a/templates-impl/src/main/assets/templates/navDrawer/res/values/dimens.xml b/utilities/templates-impl/src/main/assets/templates/navDrawer/res/values/dimens.xml similarity index 100% rename from templates-impl/src/main/assets/templates/navDrawer/res/values/dimens.xml rename to utilities/templates-impl/src/main/assets/templates/navDrawer/res/values/dimens.xml diff --git a/templates-impl/src/main/assets/templates/tabbed/res/layout/activity_main.xml b/utilities/templates-impl/src/main/assets/templates/tabbed/res/layout/activity_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/tabbed/res/layout/activity_main.xml rename to utilities/templates-impl/src/main/assets/templates/tabbed/res/layout/activity_main.xml diff --git a/templates-impl/src/main/assets/templates/tabbed/res/layout/fragment_main.xml b/utilities/templates-impl/src/main/assets/templates/tabbed/res/layout/fragment_main.xml similarity index 100% rename from templates-impl/src/main/assets/templates/tabbed/res/layout/fragment_main.xml rename to utilities/templates-impl/src/main/assets/templates/tabbed/res/layout/fragment_main.xml diff --git a/templates-impl/src/main/assets/templates/tabbed/res/values/dimens.xml b/utilities/templates-impl/src/main/assets/templates/tabbed/res/values/dimens.xml similarity index 100% rename from templates-impl/src/main/assets/templates/tabbed/res/values/dimens.xml rename to utilities/templates-impl/src/main/assets/templates/tabbed/res/values/dimens.xml diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/ConstraintVerifier.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/ConstraintVerifier.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/ConstraintVerifier.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/ConstraintVerifier.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateProviderImpl.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateProviderImpl.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateProviderImpl.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateProviderImpl.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/TemplateWidgetViewProviderImpl.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/layout.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/layout.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/layout.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/layout.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/material.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/material.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/material.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/material.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/recipe.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/recipe.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/recipe.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/recipe.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/results.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/results.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/results.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/results.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/src.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/src.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/src.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/src.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/themes.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/themes.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/themes.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base/themes.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/basicActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/basicActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/basicActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/basicActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/src.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/src.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/src.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/basicActivity/src.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/bottomNavActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/bottomNavActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/bottomNavActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/bottomNavActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcActivity.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcActivity.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcActivity.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcActivity.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentDashboard.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentDashboard.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentDashboard.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentDashboard.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentHome.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentHome.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentHome.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentHome.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentNotifications.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentNotifications.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentNotifications.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcFragmentNotifications.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelDashboard.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelDashboard.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelDashboard.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelDashboard.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelHome.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelHome.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelHome.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelHome.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelNotifications.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelNotifications.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelNotifications.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcViewModelNotifications.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcXml.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcXml.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcXml.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/bottomNavActivity/srcXml.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/composeActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/composeActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/composeActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/composeActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcActivity.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcActivity.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcActivity.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcActivity.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcTheme.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcTheme.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcTheme.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcTheme.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcThemesXml.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcThemesXml.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcThemesXml.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/srcThemesXml.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/emptyActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/emptyActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/emptyActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/emptyActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/src.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/src.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/src.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/emptyActivity/src.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/navDrawerActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/navDrawerActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/navDrawerActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/navDrawerActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcActivity.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcActivity.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcActivity.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcActivity.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_gallery.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_gallery.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_gallery.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_gallery.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_home.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_home.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_home.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_home.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_slideshow.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_slideshow.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_slideshow.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcFragments_slideshow.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_gallery.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_gallery.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_gallery.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_gallery.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_home.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_home.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_home.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_home.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_slideshow.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_slideshow.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_slideshow.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcViewModel_slideshow.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcXml.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcXml.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcXml.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/navDrawerActivity/srcXml.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noActivity/noActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noActivity/noActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noActivity/noActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noActivity/noActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivity.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivity.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivity.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivity.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXActivityTemplate.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXLayout.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXLayout.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXLayout.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/noAndroidXActivity/noAndroidXLayout.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcActivity.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcActivity.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcActivity.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcActivity.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPageViewModel.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPageViewModel.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPageViewModel.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPageViewModel.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPagerAdapter.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPagerAdapter.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPagerAdapter.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPagerAdapter.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPlaceholderFragment.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPlaceholderFragment.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPlaceholderFragment.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/srcPlaceholderFragment.kt diff --git a/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/tabbedActivityTemplate.kt b/utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/tabbedActivityTemplate.kt similarity index 100% rename from templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/tabbedActivityTemplate.kt rename to utilities/templates-impl/src/main/java/com/itsaky/androidide/templates/impl/tabbedActivity/tabbedActivityTemplate.kt diff --git a/templates-impl/src/main/res/layout/layout_checkbox.xml b/utilities/templates-impl/src/main/res/layout/layout_checkbox.xml similarity index 100% rename from templates-impl/src/main/res/layout/layout_checkbox.xml rename to utilities/templates-impl/src/main/res/layout/layout_checkbox.xml diff --git a/templates-impl/src/main/res/layout/layout_spinner.xml b/utilities/templates-impl/src/main/res/layout/layout_spinner.xml similarity index 100% rename from templates-impl/src/main/res/layout/layout_spinner.xml rename to utilities/templates-impl/src/main/res/layout/layout_spinner.xml diff --git a/templates-impl/src/main/res/layout/layout_textfield.xml b/utilities/templates-impl/src/main/res/layout/layout_textfield.xml similarity index 100% rename from templates-impl/src/main/res/layout/layout_textfield.xml rename to utilities/templates-impl/src/main/res/layout/layout_textfield.xml diff --git a/templates-impl/src/test/java/com/itsaky/androidide/templates/TemplateBuilderTest.kt b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TemplateBuilderTest.kt similarity index 100% rename from templates-impl/src/test/java/com/itsaky/androidide/templates/TemplateBuilderTest.kt rename to utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TemplateBuilderTest.kt diff --git a/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt similarity index 100% rename from templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt rename to utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/TestRecipeExecutor.kt diff --git a/templates-impl/src/test/java/com/itsaky/androidide/templates/UtilTest.kt b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/UtilTest.kt similarity index 100% rename from templates-impl/src/test/java/com/itsaky/androidide/templates/UtilTest.kt rename to utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/UtilTest.kt diff --git a/templates-impl/src/test/java/com/itsaky/androidide/templates/utils.kt b/utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/utils.kt similarity index 100% rename from templates-impl/src/test/java/com/itsaky/androidide/templates/utils.kt rename to utilities/templates-impl/src/test/java/com/itsaky/androidide/templates/utils.kt diff --git a/treeview/.gitignore b/utilities/treeview/.gitignore similarity index 100% rename from treeview/.gitignore rename to utilities/treeview/.gitignore diff --git a/treeview/build.gradle.kts b/utilities/treeview/build.gradle.kts similarity index 92% rename from treeview/build.gradle.kts rename to utilities/treeview/build.gradle.kts index a787e364e..ab2d621d7 100755 --- a/treeview/build.gradle.kts +++ b/utilities/treeview/build.gradle.kts @@ -17,6 +17,10 @@ plugins { id("com.android.library") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "com.unnamed.b.atv" } dependencies { implementation(libs.androidx.appcompat) } diff --git a/treeview/proguard-rules.pro b/utilities/treeview/proguard-rules.pro similarity index 100% rename from treeview/proguard-rules.pro rename to utilities/treeview/proguard-rules.pro diff --git a/treeview/src/main/AndroidManifest.xml b/utilities/treeview/src/main/AndroidManifest.xml similarity index 100% rename from treeview/src/main/AndroidManifest.xml rename to utilities/treeview/src/main/AndroidManifest.xml diff --git a/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java b/utilities/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java similarity index 100% rename from treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java rename to utilities/treeview/src/main/java/com/unnamed/b/atv/holder/SimpleViewHolder.java diff --git a/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java b/utilities/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java similarity index 100% rename from treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java rename to utilities/treeview/src/main/java/com/unnamed/b/atv/model/TreeNode.java diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java b/utilities/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java similarity index 100% rename from treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java rename to utilities/treeview/src/main/java/com/unnamed/b/atv/view/AndroidTreeView.java diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java b/utilities/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java similarity index 100% rename from treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java rename to utilities/treeview/src/main/java/com/unnamed/b/atv/view/TreeNodeWrapperView.java diff --git a/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java b/utilities/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java similarity index 100% rename from treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java rename to utilities/treeview/src/main/java/com/unnamed/b/atv/view/TwoDScrollView.java diff --git a/treeview/src/main/res/values/ids.xml b/utilities/treeview/src/main/res/values/ids.xml similarity index 100% rename from treeview/src/main/res/values/ids.xml rename to utilities/treeview/src/main/res/values/ids.xml diff --git a/templates-impl/.gitignore b/utilities/uidesigner/.gitignore similarity index 100% rename from templates-impl/.gitignore rename to utilities/uidesigner/.gitignore diff --git a/uidesigner/build.gradle.kts b/utilities/uidesigner/build.gradle.kts similarity index 62% rename from uidesigner/build.gradle.kts rename to utilities/uidesigner/build.gradle.kts index 87ccca792..d29e9d39d 100644 --- a/uidesigner/build.gradle.kts +++ b/utilities/uidesigner/build.gradle.kts @@ -6,6 +6,10 @@ plugins { id("kotlin-parcelize") } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.uidesigner" } @@ -22,16 +26,16 @@ dependencies { implementation(libs.common.utilcode) implementation(libs.google.material) - implementation(projects.actions) - implementation(projects.annotations) - implementation(projects.common) - implementation(projects.editor) - implementation(projects.logger) - implementation(projects.lookup) - implementation(projects.lsp.api) - implementation(projects.lsp.xml) - implementation(projects.resources) - implementation(projects.xmlInflater) + implementation(projects.annotation.annotations) + implementation(projects.core.actions) + implementation(projects.core.common) + implementation(projects.core.lspApi) + implementation(projects.core.resources) + implementation(projects.editor.impl) + implementation(projects.logging.logger) + implementation(projects.utilities.lookup) + implementation(projects.utilities.xmlInflater) + implementation(projects.xml.lsp) testImplementation(libs.tests.junit) testImplementation(libs.tests.google.truth) diff --git a/templates-impl/consumer-rules.pro b/utilities/uidesigner/consumer-rules.pro similarity index 100% rename from templates-impl/consumer-rules.pro rename to utilities/uidesigner/consumer-rules.pro diff --git a/uidesigner/proguard-rules.pro b/utilities/uidesigner/proguard-rules.pro similarity index 100% rename from uidesigner/proguard-rules.pro rename to utilities/uidesigner/proguard-rules.pro diff --git a/uidesigner/src/main/AndroidManifest.xml b/utilities/uidesigner/src/main/AndroidManifest.xml similarity index 100% rename from uidesigner/src/main/AndroidManifest.xml rename to utilities/uidesigner/src/main/AndroidManifest.xml diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/UIDesignerActivity.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/UIDesignerActivity.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/UIDesignerActivity.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/UIDesignerActivity.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/RedoAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/RedoAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/RedoAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/RedoAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowHierarchyAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowHierarchyAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowHierarchyAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowHierarchyAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowXmlAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowXmlAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowXmlAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/ShowXmlAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UiDesignerAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UiDesignerAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UiDesignerAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UiDesignerAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UndoAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UndoAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UndoAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/UndoAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/uiDesignerActions.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/uiDesignerActions.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/uiDesignerActions.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/actions/uiDesignerActions.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/AddAttrListAdapter.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/AddAttrListAdapter.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/AddAttrListAdapter.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/AddAttrListAdapter.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsCategoryAdapter.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsCategoryAdapter.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsCategoryAdapter.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsCategoryAdapter.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsItemAdapter.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsItemAdapter.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsItemAdapter.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/WidgetsItemAdapter.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragListener.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragListener.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragListener.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragListener.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragShadowBuilder.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragShadowBuilder.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragShadowBuilder.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetDragShadowBuilder.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetTouchListener.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetTouchListener.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetTouchListener.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drag/WidgetTouchListener.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drawable/UiViewLayeredForeground.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drawable/UiViewLayeredForeground.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drawable/UiViewLayeredForeground.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/drawable/UiViewLayeredForeground.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AddAttrFragment.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AddAttrFragment.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AddAttrFragment.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AddAttrFragment.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AttrValueEditorFragment.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AttrValueEditorFragment.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AttrValueEditorFragment.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/AttrValueEditorFragment.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/DesignerWorkspaceFragment.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/DesignerWorkspaceFragment.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/DesignerWorkspaceFragment.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/DesignerWorkspaceFragment.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoFragment.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoFragment.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoFragment.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoFragment.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoSheet.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoSheet.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoSheet.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/ViewInfoSheet.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WidgetsListFragment.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WidgetsListFragment.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WidgetsListFragment.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WidgetsListFragment.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceLayoutInflationHandler.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceLayoutInflationHandler.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceLayoutInflationHandler.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceLayoutInflationHandler.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewAttrHandler.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewAttrHandler.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewAttrHandler.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewAttrHandler.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewHierarchyHandler.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewHierarchyHandler.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewHierarchyHandler.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/fragments/WorkspaceViewHierarchyHandler.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiView.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiView.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiView.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiView.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiViewImpl.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiViewImpl.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiViewImpl.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/CommonUiViewImpl.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/PlaceholderView.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/PlaceholderView.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/PlaceholderView.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/PlaceholderView.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/RootWorkspaceView.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/RootWorkspaceView.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/RootWorkspaceView.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/RootWorkspaceView.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiView.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiView.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiView.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiView.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiViewGroup.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiViewGroup.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiViewGroup.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiViewGroup.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiWidgetCategory.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiWidgetCategory.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiWidgetCategory.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiWidgetCategory.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAddedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAddedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAddedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrAddedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrRemovedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrRemovedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrRemovedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrRemovedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrUpdatedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrUpdatedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrUpdatedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/AttrUpdatedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/IUiAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/IUiAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/IUiAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/IUiAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/UndoManager.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/UndoManager.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/UndoManager.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/UndoManager.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAddedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAddedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAddedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewAddedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewMovedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewMovedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewMovedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewMovedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewRemovedAction.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewRemovedAction.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewRemovedAction.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/ViewRemovedAction.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/undoUtils.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/undoUtils.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/undoUtils.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/undo/undoUtils.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiInflaterComponentFactory.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiInflaterComponentFactory.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiInflaterComponentFactory.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiInflaterComponentFactory.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiLayoutInflater.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiLayoutInflater.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiLayoutInflater.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/UiLayoutInflater.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ValueCompletionProvider.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ValueCompletionProvider.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ValueCompletionProvider.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ValueCompletionProvider.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ViewToXml.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ViewToXml.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ViewToXml.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/ViewToXml.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/Widgets.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/Widgets.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/Widgets.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/Widgets.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/WorkspaceHierarchyChangeListener.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/WorkspaceHierarchyChangeListener.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/WorkspaceHierarchyChangeListener.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/WorkspaceHierarchyChangeListener.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/designerUtils.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/designerUtils.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/designerUtils.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/utils/designerUtils.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/viewmodel/WorkspaceViewModel.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/viewmodel/WorkspaceViewModel.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/viewmodel/WorkspaceViewModel.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/viewmodel/WorkspaceViewModel.kt diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/views/LayoutHierarchyView.kt b/utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/views/LayoutHierarchyView.kt similarity index 100% rename from uidesigner/src/main/java/com/itsaky/androidide/uidesigner/views/LayoutHierarchyView.kt rename to utilities/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/views/LayoutHierarchyView.kt diff --git a/uidesigner/src/main/res/layout/activity_show_xml.xml b/utilities/uidesigner/src/main/res/layout/activity_show_xml.xml similarity index 100% rename from uidesigner/src/main/res/layout/activity_show_xml.xml rename to utilities/uidesigner/src/main/res/layout/activity_show_xml.xml diff --git a/uidesigner/src/main/res/layout/activity_ui_designer.xml b/utilities/uidesigner/src/main/res/layout/activity_ui_designer.xml similarity index 100% rename from uidesigner/src/main/res/layout/activity_ui_designer.xml rename to utilities/uidesigner/src/main/res/layout/activity_ui_designer.xml diff --git a/uidesigner/src/main/res/layout/fragment_designer_workspace.xml b/utilities/uidesigner/src/main/res/layout/fragment_designer_workspace.xml similarity index 100% rename from uidesigner/src/main/res/layout/fragment_designer_workspace.xml rename to utilities/uidesigner/src/main/res/layout/fragment_designer_workspace.xml diff --git a/uidesigner/src/main/res/layout/fragment_ui_widgets.xml b/utilities/uidesigner/src/main/res/layout/fragment_ui_widgets.xml similarity index 100% rename from uidesigner/src/main/res/layout/fragment_ui_widgets.xml rename to utilities/uidesigner/src/main/res/layout/fragment_ui_widgets.xml diff --git a/uidesigner/src/main/res/layout/layout_add_attr.xml b/utilities/uidesigner/src/main/res/layout/layout_add_attr.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_add_attr.xml rename to utilities/uidesigner/src/main/res/layout/layout_add_attr.xml diff --git a/uidesigner/src/main/res/layout/layout_add_attr_item.xml b/utilities/uidesigner/src/main/res/layout/layout_add_attr_item.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_add_attr_item.xml rename to utilities/uidesigner/src/main/res/layout/layout_add_attr_item.xml diff --git a/uidesigner/src/main/res/layout/layout_attr_value_editor.xml b/utilities/uidesigner/src/main/res/layout/layout_attr_value_editor.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_attr_value_editor.xml rename to utilities/uidesigner/src/main/res/layout/layout_attr_value_editor.xml diff --git a/uidesigner/src/main/res/layout/layout_ui_widgets_category.xml b/utilities/uidesigner/src/main/res/layout/layout_ui_widgets_category.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_ui_widgets_category.xml rename to utilities/uidesigner/src/main/res/layout/layout_ui_widgets_category.xml diff --git a/uidesigner/src/main/res/layout/layout_ui_widgets_item.xml b/utilities/uidesigner/src/main/res/layout/layout_ui_widgets_item.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_ui_widgets_item.xml rename to utilities/uidesigner/src/main/res/layout/layout_ui_widgets_item.xml diff --git a/uidesigner/src/main/res/layout/layout_view_info.xml b/utilities/uidesigner/src/main/res/layout/layout_view_info.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_view_info.xml rename to utilities/uidesigner/src/main/res/layout/layout_view_info.xml diff --git a/uidesigner/src/main/res/layout/layout_view_info_header.xml b/utilities/uidesigner/src/main/res/layout/layout_view_info_header.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_view_info_header.xml rename to utilities/uidesigner/src/main/res/layout/layout_view_info_header.xml diff --git a/uidesigner/src/main/res/layout/layout_view_info_sheet.xml b/utilities/uidesigner/src/main/res/layout/layout_view_info_sheet.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_view_info_sheet.xml rename to utilities/uidesigner/src/main/res/layout/layout_view_info_sheet.xml diff --git a/uidesigner/src/main/res/layout/layout_viewattr_item.xml b/utilities/uidesigner/src/main/res/layout/layout_viewattr_item.xml similarity index 100% rename from uidesigner/src/main/res/layout/layout_viewattr_item.xml rename to utilities/uidesigner/src/main/res/layout/layout_viewattr_item.xml diff --git a/uidesigner/src/main/res/navigation/nav_viewinfo.xml b/utilities/uidesigner/src/main/res/navigation/nav_viewinfo.xml similarity index 100% rename from uidesigner/src/main/res/navigation/nav_viewinfo.xml rename to utilities/uidesigner/src/main/res/navigation/nav_viewinfo.xml diff --git a/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/UiDesignerTest.kt b/utilities/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/UiDesignerTest.kt similarity index 100% rename from uidesigner/src/test/java/com/itsaky/androidide/uidesigner/UiDesignerTest.kt rename to utilities/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/UiDesignerTest.kt diff --git a/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/undo/UndoManagerTest.kt b/utilities/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/undo/UndoManagerTest.kt similarity index 100% rename from uidesigner/src/test/java/com/itsaky/androidide/uidesigner/undo/UndoManagerTest.kt rename to utilities/uidesigner/src/test/java/com/itsaky/androidide/uidesigner/undo/UndoManagerTest.kt diff --git a/termux/termux-app/.gitignore b/utilities/xml-inflater/.gitignore similarity index 100% rename from termux/termux-app/.gitignore rename to utilities/xml-inflater/.gitignore diff --git a/xml-inflater/build.gradle.kts b/utilities/xml-inflater/build.gradle.kts similarity index 69% rename from xml-inflater/build.gradle.kts rename to utilities/xml-inflater/build.gradle.kts index e201f7292..369e79ff4 100644 --- a/xml-inflater/build.gradle.kts +++ b/utilities/xml-inflater/build.gradle.kts @@ -24,23 +24,27 @@ plugins { id("com.google.devtools.ksp") version libs.versions.ksp } +groupConfig { + groupIdSuffix.set("utils") +} + android { namespace = "${BuildConfig.packageName}.inflater" } dependencies { - ksp(projects.annotationProcessorsKsp) + ksp(projects.annotation.processorsKsp) implementation(libs.androidx.appcompat) implementation(libs.common.kotlin) implementation(libs.common.utilcode) - implementation(projects.annotations) - implementation(projects.common) - implementation(projects.subprojects.aaptcompiler) - implementation(projects.subprojects.projects) - implementation(projects.subprojects.xmlUtils) - implementation(projects.resources) + implementation(projects.annotation.annotations) + implementation(projects.core.common) + implementation(projects.core.projects) + implementation(projects.core.resources) + implementation(projects.xml.aaptcompiler) + implementation(projects.xml.utils) - testImplementation(projects.subprojects.projects) - testImplementation(projects.subprojects.testingCommon) - testImplementation(projects.subprojects.testingTooling) + testImplementation(projects.core.projects) + testImplementation(projects.testing.commonTest) + testImplementation(projects.testing.gradleToolingTest) } diff --git a/uidesigner/consumer-rules.pro b/utilities/xml-inflater/consumer-rules.pro similarity index 100% rename from uidesigner/consumer-rules.pro rename to utilities/xml-inflater/consumer-rules.pro diff --git a/templates-impl/proguard-rules.pro b/utilities/xml-inflater/proguard-rules.pro similarity index 100% rename from templates-impl/proguard-rules.pro rename to utilities/xml-inflater/proguard-rules.pro diff --git a/xml-inflater/src/main/AndroidManifest.xml b/utilities/xml-inflater/src/main/AndroidManifest.xml similarity index 100% rename from xml-inflater/src/main/AndroidManifest.xml rename to utilities/xml-inflater/src/main/AndroidManifest.xml diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AbstractParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AbstractParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/AbstractParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AbstractParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AttributeHandlerScope.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AttributeHandlerScope.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/AttributeHandlerScope.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/AttributeHandlerScope.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/DefaultComponentFactory.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/DefaultComponentFactory.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/DefaultComponentFactory.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/DefaultComponentFactory.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ForwardingViewGroup.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ForwardingViewGroup.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/ForwardingViewGroup.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ForwardingViewGroup.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IComponentFactory.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IComponentFactory.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IComponentFactory.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IComponentFactory.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ILayoutInflater.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ILayoutInflater.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/ILayoutInflater.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/ILayoutInflater.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/INamespace.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/INamespace.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/INamespace.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/INamespace.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapterIndex.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapterIndex.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapterIndex.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewAdapterIndex.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroup.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroup.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroup.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroup.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroupAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroupAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroupAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IViewGroupAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/InflateException.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/InflateException.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/InflateException.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/InflateException.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/LayoutStrategy.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/LayoutStrategy.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/LayoutStrategy.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/LayoutStrategy.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/BitmapDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/BitmapDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/BitmapDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/BitmapDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ClipDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ClipDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ClipDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ClipDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/DrawableParserFactory.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/DrawableParserFactory.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/DrawableParserFactory.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/DrawableParserFactory.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/IDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/IDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/IDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/IDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/InsetDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/LayerListParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/LayerListParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/LayerListParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/LayerListParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ScaleDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ShapeDrawableParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ShapeDrawableParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ShapeDrawableParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/ShapeDrawableParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/StateListParser.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/StateListParser.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/StateListParser.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/drawable/StateListParser.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflateEventsListener.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflateEventsListener.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflateEventsListener.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflateEventsListener.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflationEvent.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflationEvent.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflationEvent.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/IInflationEvent.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/inflationEvents.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/inflationEvents.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/inflationEvents.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/events/inflationEvents.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/AttributeImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/AttributeImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/AttributeImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/AttributeImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ErrorView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ErrorView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ErrorView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ErrorView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ForwardingView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ForwardingView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ForwardingView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ForwardingView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableAttributeImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewGroupImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewGroupImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewGroupImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewGroupImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ImmutableViewImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/IncludeView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutFile.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutFile.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutFile.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutFile.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutInflaterImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutInflaterImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutInflaterImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/LayoutInflaterImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/NamespaceImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/NamespaceImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/NamespaceImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/NamespaceImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/SingleChildViewGroup.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/SingleChildViewGroup.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/SingleChildViewGroup.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/SingleChildViewGroup.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewGroupImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewGroupImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewGroupImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewGroupImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewImpl.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewImpl.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewImpl.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ViewImpl.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsListViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsListViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsListViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsListViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSeekBarAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSeekBarAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSeekBarAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSeekBarAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSpinnerAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSpinnerAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSpinnerAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsSpinnerAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AbsoluteLayoutAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AdapterViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AdapterViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AdapterViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AdapterViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AnalogClockAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AutoCompleteTextViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AutoCompleteTextViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AutoCompleteTextViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/AutoCompleteTextViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ButtonAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ButtonAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ButtonAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ButtonAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CalendarViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckBoxAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckBoxAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckBoxAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckBoxAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckedTextViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckedTextViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckedTextViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CheckedTextViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ChronometerAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ChronometerAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ChronometerAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ChronometerAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CompoundButtonAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CompoundButtonAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CompoundButtonAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/CompoundButtonAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/DigitalClockAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/EditTextAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/EditTextAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/EditTextAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/EditTextAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/FrameLayoutAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/FrameLayoutAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/FrameLayoutAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/FrameLayoutAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GestureOverlayViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GestureOverlayViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GestureOverlayViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GestureOverlayViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridLayoutAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridLayoutAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridLayoutAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridLayoutAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/GridViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/HorizontalScrollViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/HorizontalScrollViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/HorizontalScrollViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/HorizontalScrollViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageButtonAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageButtonAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageButtonAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageButtonAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageSwitcherAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageSwitcherAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageSwitcherAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageSwitcherAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ImageViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/LinearLayoutAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/LinearLayoutAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/LinearLayoutAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/LinearLayoutAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ListViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ListViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ListViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ListViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/MultiAutoCompleteTextViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/MultiAutoCompleteTextViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/MultiAutoCompleteTextViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/MultiAutoCompleteTextViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/NumberPickerAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/NumberPickerAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/NumberPickerAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/NumberPickerAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ProgressBarAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ProgressBarAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ProgressBarAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ProgressBarAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/QuickContactBadgeAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/QuickContactBadgeAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/QuickContactBadgeAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/QuickContactBadgeAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioButtonAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioButtonAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioButtonAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioButtonAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioGroupAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioGroupAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioGroupAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RadioGroupAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RatingBarAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RatingBarAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RatingBarAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RatingBarAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RelativeLayoutAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RelativeLayoutAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RelativeLayoutAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/RelativeLayoutAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ScrollViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ScrollViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ScrollViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ScrollViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SeekBarAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SeekBarAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SeekBarAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SeekBarAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpaceAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpinnerAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpinnerAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpinnerAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SpinnerAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SurfaceViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SurfaceViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SurfaceViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SurfaceViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SwitchAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SwitchAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SwitchAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/SwitchAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextClockAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextClockAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextClockAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextClockAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextSwitcherAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextSwitcherAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextSwitcherAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextSwitcherAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextureViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextureViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextureViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/TextureViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ToggleButtonAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ToggleButtonAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ToggleButtonAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ToggleButtonAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/VideoViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/VideoViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/VideoViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/VideoViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAnimatorAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAnimatorAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAnimatorAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewAnimatorAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewFlipperAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewFlipperAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewFlipperAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewFlipperAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewGroupAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewGroupAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewGroupAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewGroupAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewSwitcherAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewSwitcherAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewSwitcherAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/ViewSwitcherAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/WebViewAdapter.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/WebViewAdapter.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/WebViewAdapter.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/WebViewAdapter.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/appcompat/AppCompatTextView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/appcompat/AppCompatTextView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/appcompat/AppCompatTextView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/adapters/appcompat/AppCompatTextView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ui/DesignerTextureView.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ui/DesignerTextureView.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ui/DesignerTextureView.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/ui/DesignerTextureView.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/IDTable.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/IDTable.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/IDTable.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/IDTable.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/TextDrawable.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/TextDrawable.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/TextDrawable.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/TextDrawable.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewFactory.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewFactory.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewFactory.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewFactory.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewUtils.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewUtils.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewUtils.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/ViewUtils.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/basicParseUtils.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/lookup.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/lookup.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/lookup.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/lookup.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/viewParseUtils.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/viewParseUtils.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/viewParseUtils.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/internal/utils/viewParseUtils.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/models/UiWidget.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/models/UiWidget.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/models/UiWidget.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/models/UiWidget.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/inflaterUtils.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/inflaterUtils.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/inflaterUtils.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/inflaterUtils.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/module.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/module.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/module.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/module.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/viewUtils.kt b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/viewUtils.kt similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/viewUtils.kt rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/utils/viewUtils.kt diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/DefaultValues.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/DefaultValues.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/DefaultValues.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/DefaultValues.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterDrawable.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterDrawable.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterDrawable.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterDrawable.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterView.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterView.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterView.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/VectorMasterView.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/enums/TintMode.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/enums/TintMode.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/enums/TintMode.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/enums/TintMode.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/ClipPathModel.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/ClipPathModel.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/ClipPathModel.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/ClipPathModel.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/GroupModel.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/GroupModel.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/GroupModel.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/GroupModel.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/PathModel.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/PathModel.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/PathModel.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/PathModel.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/VectorModel.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/VectorModel.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/VectorModel.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/models/VectorModel.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/Utils.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/Utils.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/Utils.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/Utils.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/legacyparser/PathParser.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/legacyparser/PathParser.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/legacyparser/PathParser.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/legacyparser/PathParser.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/ParserHelper.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/ParserHelper.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/ParserHelper.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/ParserHelper.java diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/PathParser.java b/utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/PathParser.java similarity index 100% rename from xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/PathParser.java rename to utilities/xml-inflater/src/main/java/com/itsaky/androidide/inflater/vectormaster/utilities/parser/PathParser.java diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/AdapterIndexTest.kt diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ExampleUnitTest.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ExampleUnitTest.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/ExampleUnitTest.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ExampleUnitTest.kt diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/LayoutInflaterTest.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/LayoutInflaterTest.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/LayoutInflaterTest.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/LayoutInflaterTest.kt diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/ValueParsersTest.kt diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt b/utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt similarity index 100% rename from xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt rename to utilities/xml-inflater/src/test/java/com/itsaky/androidide/inflater/adapterUtils.kt diff --git a/termux/termux-emulator/.gitignore b/xml/aaptcompiler/.gitignore similarity index 100% rename from termux/termux-emulator/.gitignore rename to xml/aaptcompiler/.gitignore diff --git a/subprojects/aaptcompiler/build.gradle.kts b/xml/aaptcompiler/build.gradle.kts similarity index 90% rename from subprojects/aaptcompiler/build.gradle.kts rename to xml/aaptcompiler/build.gradle.kts index 2fe30cb4c..2e859d6d7 100644 --- a/subprojects/aaptcompiler/build.gradle.kts +++ b/xml/aaptcompiler/build.gradle.kts @@ -24,6 +24,10 @@ plugins { id("com.google.protobuf") } +groupConfig { + groupIdSuffix.set("xml") +} + android { namespace = "${BuildConfig.packageName}.aaptcompiler" @@ -55,8 +59,8 @@ dependencies { implementation(libs.androidx.collection) implementation(libs.composite.jaxp) - implementation(projects.logger) - implementation(projects.shared) + implementation(projects.logging.logger) + implementation(projects.utilities.shared) api(libs.aapt2.annotations) api(libs.aapt2.common) @@ -66,5 +70,5 @@ dependencies { testImplementation(libs.tests.junit) testImplementation(libs.tests.robolectric) testImplementation(libs.tests.google.truth) - testImplementation(projects.shared) + testImplementation(projects.utilities.shared) } \ No newline at end of file diff --git a/subprojects/aaptcompiler/gradle.properties b/xml/aaptcompiler/gradle.properties similarity index 100% rename from subprojects/aaptcompiler/gradle.properties rename to xml/aaptcompiler/gradle.properties diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/AaptResourceType.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/AaptResourceType.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/AaptResourceType.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/AaptResourceType.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/BlameLogger.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/BlameLogger.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/BlameLogger.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/BlameLogger.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescription.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescription.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescription.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescription.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescriptionParsers.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescriptionParsers.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescriptionParsers.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ConfigDescriptionParsers.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Container.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Container.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Container.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Container.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatConstants.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatConstants.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatConstants.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatConstants.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatParsing.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatParsing.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatParsing.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/FloatParsing.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/LocaleValue.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/LocaleValue.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/LocaleValue.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/LocaleValue.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/PseudolocaleGenerator.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/PseudolocaleGenerator.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/PseudolocaleGenerator.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/PseudolocaleGenerator.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Pseudolocalizer.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Pseudolocalizer.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Pseudolocalizer.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Pseudolocalizer.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompilationException.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompilationException.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompilationException.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompilationException.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompiler.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompiler.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompiler.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceCompiler.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceFile.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceFile.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceFile.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceFile.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourcePathData.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourcePathData.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourcePathData.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourcePathData.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceUtils.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceUtils.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceUtils.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceUtils.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceValues.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceValues.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceValues.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceValues.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/SDKConstants.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/SDKConstants.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/SDKConstants.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/SDKConstants.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Source.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Source.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/Source.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/Source.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/StringPool.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/StringPool.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/StringPool.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/StringPool.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/TableExtractor.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/TableExtractor.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/TableExtractor.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/TableExtractor.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ToolFingerprint.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ToolFingerprint.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/ToolFingerprint.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ToolFingerprint.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/UnicodeUtil.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/UnicodeUtil.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/UnicodeUtil.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/UnicodeUtil.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlProcessor.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlProcessor.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlProcessor.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlProcessor.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResource.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResource.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResource.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResource.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResourceBuilder.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResourceBuilder.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResourceBuilder.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlResourceBuilder.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlStringBuilder.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlStringBuilder.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlStringBuilder.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlStringBuilder.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlUtil.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlUtil.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlUtil.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/XmlUtil.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/AConfiguration.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/AConfiguration.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/AConfiguration.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/AConfiguration.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleData.java b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleData.java similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleData.java rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleData.java diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleDataTables.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleDataTables.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleDataTables.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/LocaleDataTables.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Ref.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Ref.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Ref.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Ref.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResTableConfig.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResTableConfig.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResTableConfig.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResTableConfig.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResourceTypes.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResourceTypes.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResourceTypes.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/ResourceTypes.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Util.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Util.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Util.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/android/Util.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/buffer/BigBuffer.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/buffer/BigBuffer.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/buffer/BigBuffer.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/buffer/BigBuffer.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoDeserialize.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoDeserialize.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoDeserialize.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoDeserialize.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoSerialize.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoSerialize.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoSerialize.kt rename to xml/aaptcompiler/src/main/java/com/android/aaptcompiler/proto/ProtoSerialize.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/Resources.kt b/xml/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/Resources.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/Resources.kt rename to xml/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/Resources.kt diff --git a/subprojects/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/logging/IDELogger.kt b/xml/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/logging/IDELogger.kt similarity index 100% rename from subprojects/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/logging/IDELogger.kt rename to xml/aaptcompiler/src/main/java/com/itsaky/androidide/aapt/logging/IDELogger.kt diff --git a/subprojects/aaptcompiler/src/main/proto/com/android/aapt/Configuration.proto b/xml/aaptcompiler/src/main/proto/com/android/aapt/Configuration.proto similarity index 100% rename from subprojects/aaptcompiler/src/main/proto/com/android/aapt/Configuration.proto rename to xml/aaptcompiler/src/main/proto/com/android/aapt/Configuration.proto diff --git a/subprojects/aaptcompiler/src/main/proto/com/android/aapt/README.md b/xml/aaptcompiler/src/main/proto/com/android/aapt/README.md similarity index 100% rename from subprojects/aaptcompiler/src/main/proto/com/android/aapt/README.md rename to xml/aaptcompiler/src/main/proto/com/android/aapt/README.md diff --git a/subprojects/aaptcompiler/src/main/proto/com/android/aapt/Resources.proto b/xml/aaptcompiler/src/main/proto/com/android/aapt/Resources.proto similarity index 100% rename from subprojects/aaptcompiler/src/main/proto/com/android/aapt/Resources.proto rename to xml/aaptcompiler/src/main/proto/com/android/aapt/Resources.proto diff --git a/subprojects/aaptcompiler/src/main/proto/com/android/aapt/ResourcesInternal.proto b/xml/aaptcompiler/src/main/proto/com/android/aapt/ResourcesInternal.proto similarity index 100% rename from subprojects/aaptcompiler/src/main/proto/com/android/aapt/ResourcesInternal.proto rename to xml/aaptcompiler/src/main/proto/com/android/aapt/ResourcesInternal.proto diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/BlameLoggerTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/BlameLoggerTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/BlameLoggerTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/BlameLoggerTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ConfigDescriptionTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ConfigDescriptionTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ConfigDescriptionTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ConfigDescriptionTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/FloatParsingTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/FloatParsingTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/FloatParsingTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/FloatParsingTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/LocaleValueTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/LocaleValueTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/LocaleValueTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/LocaleValueTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocaleGeneratorTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocaleGeneratorTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocaleGeneratorTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocaleGeneratorTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocalizerTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocalizerTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocalizerTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/PseudolocalizerTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceCompilerTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceCompilerTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceCompilerTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceCompilerTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceTableTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceTableTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceTableTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceTableTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceUtilsTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceUtilsTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceUtilsTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/ResourceUtilsTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/StringPoolTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/StringPoolTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/StringPoolTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/StringPoolTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/TableExtractorTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/TableExtractorTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/TableExtractorTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/TableExtractorTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/UnicodeUtilTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/UnicodeUtilTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/UnicodeUtilTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/UnicodeUtilTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlProcessorTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlProcessorTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlProcessorTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlProcessorTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlResourceBuilderTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlResourceBuilderTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlResourceBuilderTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlResourceBuilderTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlStringBuilderTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlStringBuilderTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlStringBuilderTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/XmlStringBuilderTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResTable_configTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResTable_configTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResTable_configTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResTable_configTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResourceTypesTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResourceTypesTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResourceTypesTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/android/ResourceTypesTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/buffer/BigBufferTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/buffer/BigBufferTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/buffer/BigBufferTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/buffer/BigBufferTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/proto/ProtoSerializeTest.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/proto/ProtoSerializeTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/proto/ProtoSerializeTest.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/proto/ProtoSerializeTest.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/Builders.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/Builders.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/Builders.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/Builders.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/ContainerReader.kt b/xml/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/ContainerReader.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/ContainerReader.kt rename to xml/aaptcompiler/src/test/java/com/android/aaptcompiler/testutils/ContainerReader.kt diff --git a/subprojects/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt b/xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt similarity index 100% rename from subprojects/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt rename to xml/aaptcompiler/src/test/java/com/itsaky/androidide/aaptcompiler/CompilerTest.kt diff --git a/subprojects/aaptcompiler/src/test/resources/layout/activity_editor.xml b/xml/aaptcompiler/src/test/resources/layout/activity_editor.xml similarity index 100% rename from subprojects/aaptcompiler/src/test/resources/layout/activity_editor.xml rename to xml/aaptcompiler/src/test/resources/layout/activity_editor.xml diff --git a/termux/termux-view/.gitignore b/xml/dom/.gitignore similarity index 100% rename from termux/termux-view/.gitignore rename to xml/dom/.gitignore diff --git a/subprojects/xml-dom/build.gradle.kts b/xml/dom/build.gradle.kts similarity index 89% rename from subprojects/xml-dom/build.gradle.kts rename to xml/dom/build.gradle.kts index 50fa3c7ac..671f93914 100644 --- a/subprojects/xml-dom/build.gradle.kts +++ b/xml/dom/build.gradle.kts @@ -21,8 +21,12 @@ plugins { id("org.jetbrains.kotlin.jvm") } +groupConfig { + groupIdSuffix.set("xml") +} + dependencies { - implementation(projects.shared) + implementation(projects.utilities.shared) implementation(libs.composite.jaxp) implementation(libs.common.jsoup) diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/BadLocationException.java b/xml/dom/src/main/java/org/eclipse/lemminx/commons/BadLocationException.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/BadLocationException.java rename to xml/dom/src/main/java/org/eclipse/lemminx/commons/BadLocationException.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/ILineTracker.java b/xml/dom/src/main/java/org/eclipse/lemminx/commons/ILineTracker.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/ILineTracker.java rename to xml/dom/src/main/java/org/eclipse/lemminx/commons/ILineTracker.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/Line.java b/xml/dom/src/main/java/org/eclipse/lemminx/commons/Line.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/Line.java rename to xml/dom/src/main/java/org/eclipse/lemminx/commons/Line.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/ListLineTracker.java b/xml/dom/src/main/java/org/eclipse/lemminx/commons/ListLineTracker.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/ListLineTracker.java rename to xml/dom/src/main/java/org/eclipse/lemminx/commons/ListLineTracker.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/TextDocument.java b/xml/dom/src/main/java/org/eclipse/lemminx/commons/TextDocument.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/commons/TextDocument.java rename to xml/dom/src/main/java/org/eclipse/lemminx/commons/TextDocument.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMAttr.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMAttr.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMAttr.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMAttr.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMCDATASection.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMCDATASection.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMCDATASection.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMCDATASection.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMCharacterData.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMCharacterData.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMCharacterData.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMCharacterData.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMComment.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMComment.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMComment.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMComment.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMDocument.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMDocument.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMDocument.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMDocument.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMDocumentType.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMDocumentType.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMDocumentType.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMDocumentType.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMElement.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMElement.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMElement.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMElement.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMNode.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMNode.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMNode.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMNode.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMParser.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMParser.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMParser.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMParser.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMProcessingInstruction.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMProcessingInstruction.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMProcessingInstruction.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMProcessingInstruction.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMRange.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMRange.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMRange.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMRange.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMText.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMText.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DOMText.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DOMText.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDAttlistDecl.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDAttlistDecl.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDAttlistDecl.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDAttlistDecl.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclNode.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclNode.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclNode.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclNode.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclParameter.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclParameter.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclParameter.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDDeclParameter.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDElementDecl.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDElementDecl.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDElementDecl.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDElementDecl.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDEntityDecl.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDEntityDecl.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDEntityDecl.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDEntityDecl.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDNotationDecl.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDNotationDecl.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/DTDNotationDecl.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/DTDNotationDecl.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/LineIndentInfo.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/LineIndentInfo.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/LineIndentInfo.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/LineIndentInfo.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/NoNamespaceSchemaLocation.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/NoNamespaceSchemaLocation.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/NoNamespaceSchemaLocation.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/NoNamespaceSchemaLocation.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocation.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocation.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocation.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocation.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocationHint.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocationHint.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocationHint.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/SchemaLocationHint.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/TargetRange.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/TargetRange.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/TargetRange.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/TargetRange.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/BaseXmlFormattingOptions.kt b/xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/BaseXmlFormattingOptions.kt similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/BaseXmlFormattingOptions.kt rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/BaseXmlFormattingOptions.kt diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/EmptyElements.kt b/xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/EmptyElements.kt similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/EmptyElements.kt rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/EmptyElements.kt diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/IndentedXmlBuilder.kt b/xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/IndentedXmlBuilder.kt similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/IndentedXmlBuilder.kt rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/IndentedXmlBuilder.kt diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/XmlBuilder.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/XmlBuilder.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/XmlBuilder.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/XmlBuilder.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/alias.kt b/xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/alias.kt similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/builder/alias.kt rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/builder/alias.kt diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/Constants.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/Constants.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/Constants.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/Constants.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/MultiLineStream.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/MultiLineStream.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/MultiLineStream.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/MultiLineStream.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/Scanner.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/Scanner.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/Scanner.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/Scanner.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/ScannerState.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/ScannerState.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/ScannerState.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/ScannerState.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/TokenType.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/TokenType.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/TokenType.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/TokenType.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/XMLScanner.java b/xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/XMLScanner.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/dom/parser/XMLScanner.java rename to xml/dom/src/main/java/org/eclipse/lemminx/dom/parser/XMLScanner.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/IExternalGrammarLocationProvider.java b/xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/IExternalGrammarLocationProvider.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/IExternalGrammarLocationProvider.java rename to xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/IExternalGrammarLocationProvider.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/ResolvedURIInfo.java b/xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/ResolvedURIInfo.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/ResolvedURIInfo.java rename to xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/ResolvedURIInfo.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtension.java b/xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtension.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtension.java rename to xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtension.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtensionManager.java b/xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtensionManager.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtensionManager.java rename to xml/dom/src/main/java/org/eclipse/lemminx/uriresolver/URIResolverExtensionManager.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/DOMUtils.java b/xml/dom/src/main/java/org/eclipse/lemminx/utils/DOMUtils.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/DOMUtils.java rename to xml/dom/src/main/java/org/eclipse/lemminx/utils/DOMUtils.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/IOUtils.java b/xml/dom/src/main/java/org/eclipse/lemminx/utils/IOUtils.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/IOUtils.java rename to xml/dom/src/main/java/org/eclipse/lemminx/utils/IOUtils.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/StringUtils.java b/xml/dom/src/main/java/org/eclipse/lemminx/utils/StringUtils.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/StringUtils.java rename to xml/dom/src/main/java/org/eclipse/lemminx/utils/StringUtils.java diff --git a/subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java b/xml/dom/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java similarity index 100% rename from subprojects/xml-dom/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java rename to xml/dom/src/main/java/org/eclipse/lemminx/utils/XMLPositionUtility.java diff --git a/uidesigner/.gitignore b/xml/lsp/.gitignore similarity index 100% rename from uidesigner/.gitignore rename to xml/lsp/.gitignore diff --git a/lsp/xml/build.gradle.kts b/xml/lsp/build.gradle.kts similarity index 68% rename from lsp/xml/build.gradle.kts rename to xml/lsp/build.gradle.kts index 1e42f6a2d..073b5d774 100644 --- a/lsp/xml/build.gradle.kts +++ b/xml/lsp/build.gradle.kts @@ -23,6 +23,10 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("xml") +} + android { namespace = "${BuildConfig.packageName}.lsp.xml" } @@ -35,29 +39,29 @@ kapt { dependencies { - kapt(projects.annotationProcessors) + kapt(projects.annotation.processors) implementation(libs.common.editor) implementation(libs.common.utilcode) implementation(libs.androidide.ts) implementation(libs.androidide.ts.xml) - implementation(projects.actions) - implementation(projects.lsp.api) - implementation(projects.lexers) - implementation(projects.subprojects.xmlDom) - implementation(projects.subprojects.xmlUtils) + implementation(projects.core.actions) + implementation(projects.core.lspApi) + implementation(projects.editor.lexers) + implementation(projects.xml.dom) + implementation(projects.xml.utils) implementation(libs.androidx.core.ktx) implementation(libs.common.kotlin) implementation(libs.google.material) - testImplementation(projects.actions) - testImplementation(projects.subprojects.projects) - testImplementation(projects.subprojects.toolingApi) - testImplementation(projects.subprojects.testingCommon) - testImplementation(projects.subprojects.testingLsp) + testImplementation(projects.core.actions) + testImplementation(projects.core.projects) + testImplementation(projects.tooling.api) + testImplementation(projects.testing.commonTest) + testImplementation(projects.testing.lspTest) - compileOnly(projects.common) + compileOnly(projects.core.common) compileOnly(libs.common.antlr4) } diff --git a/xml-inflater/consumer-rules.pro b/xml/lsp/consumer-rules.pro similarity index 100% rename from xml-inflater/consumer-rules.pro rename to xml/lsp/consumer-rules.pro diff --git a/xml-inflater/proguard-rules.pro b/xml/lsp/proguard-rules.pro similarity index 100% rename from xml-inflater/proguard-rules.pro rename to xml/lsp/proguard-rules.pro diff --git a/lsp/xml/src/main/AndroidManifest.xml b/xml/lsp/src/main/AndroidManifest.xml similarity index 100% rename from lsp/xml/src/main/AndroidManifest.xml rename to xml/lsp/src/main/AndroidManifest.xml diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/XMLLanguageServer.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/XMLLanguageServer.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/XMLLanguageServer.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/XMLLanguageServer.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/AttrValueEditHandler.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/AttrValueEditHandler.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/AttrValueEditHandler.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/AttrValueEditHandler.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/QualifiedValueEditHandler.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/QualifiedValueEditHandler.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/QualifiedValueEditHandler.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/QualifiedValueEditHandler.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/TagEditHandler.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/TagEditHandler.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/edits/TagEditHandler.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/edits/TagEditHandler.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLFormattingOptions.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLFormattingOptions.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLFormattingOptions.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLFormattingOptions.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLServerSettings.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLServerSettings.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLServerSettings.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/models/XMLServerSettings.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/AdvancedEditProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/CodeFormatProvider.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/CodeFormatProvider.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/CodeFormatProvider.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/CodeFormatProvider.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/XmlCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/XmlCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/XmlCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/XmlCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrValueCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrValueCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrValueCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/AttrValueCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/IXmlCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/IXmlCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/IXmlCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/IXmlCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/common/CommonAttrCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/common/CommonAttrCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/common/CommonAttrCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/common/CommonAttrCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/etc/InheritingAttrCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/etc/InheritingAttrCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/etc/InheritingAttrCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/etc/InheritingAttrCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutAttrCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutAttrCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutAttrCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutAttrCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutTagCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutTagCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutTagCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/LayoutTagCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/SimpleTagCompleter.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/SimpleTagCompleter.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/SimpleTagCompleter.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/SimpleTagCompleter.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layoutFileCompletions.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layoutFileCompletions.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layoutFileCompletions.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layoutFileCompletions.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrValueCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrValueCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrValueCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestAttrValueCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestTagCompletionProvider.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestTagCompletionProvider.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestTagCompletionProvider.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifest/ManifestTagCompletionProvider.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifestFileCompletions.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifestFileCompletions.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifestFileCompletions.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/manifestFileCompletions.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/xmlCompletions.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/xmlCompletions.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/xmlCompletions.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/xmlCompletions.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMAttributeFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMAttributeFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMAttributeFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMAttributeFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCDATAFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCDATAFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCDATAFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCDATAFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCommentFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCommentFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCommentFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMCommentFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMDocTypeFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMDocTypeFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMDocTypeFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMDocTypeFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMElementFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMElementFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMElementFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMElementFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMProcessingInstructionFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMProcessingInstructionFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMProcessingInstructionFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMProcessingInstructionFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMTextFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMTextFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMTextFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/DOMTextFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/FormatElementCategory.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/FormatElementCategory.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/FormatElementCategory.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/FormatElementCategory.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/TextEditUtils.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/TextEditUtils.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/TextEditUtils.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/TextEditUtils.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatter.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatter.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatter.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatter.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocument.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocument.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocument.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocument.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocumentNew.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocumentNew.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocumentNew.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormatterDocumentNew.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormattingConstraints.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormattingConstraints.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormattingConstraints.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/format/XMLFormattingConstraints.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetRepository.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetRepository.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetRepository.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetRepository.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetScope.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetScope.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetScope.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/providers/snippet/XmlSnippetScope.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/StringUtils.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/StringUtils.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/StringUtils.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/StringUtils.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/XMLBuilder.java b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/XMLBuilder.java similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/XMLBuilder.java rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/XMLBuilder.java diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/XmlUtils.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/XmlUtils.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/XmlUtils.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/XmlUtils.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/inheritingAttrs.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/inheritingAttrs.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/inheritingAttrs.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/inheritingAttrs.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/tagTransforms.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/tagTransforms.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/tagTransforms.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/tagTransforms.kt diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/xmlCompletionUtils.kt b/xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/xmlCompletionUtils.kt similarity index 100% rename from lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/utils/xmlCompletionUtils.kt rename to xml/lsp/src/main/java/com/itsaky/androidide/lsp/xml/utils/xmlCompletionUtils.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelper.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelper.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelper.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelper.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelperImpl.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelperImpl.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelperImpl.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/CompletionHelperImpl.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/XMLLSPTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/AttributeValueCompletionTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/AttributeValueCompletionTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/AttributeValueCompletionTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/AttributeValueCompletionTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/CommonAttrValueCompletionTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/LayoutAttributeCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/LayoutAttributeCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/LayoutAttributeCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/LayoutAttributeCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestAttrValueCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestTagCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestTagCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestTagCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/ManifestTagCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/XMLCompletionProviderTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/XMLCompletionProviderTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/XMLCompletionProviderTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/providers/completion/XMLCompletionProviderTest.kt diff --git a/lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/utils/TagTransformsTest.kt b/xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/utils/TagTransformsTest.kt similarity index 100% rename from lsp/xml/src/test/java/com/itsaky/androidide/lsp/xml/utils/TagTransformsTest.kt rename to xml/lsp/src/test/java/com/itsaky/androidide/lsp/xml/utils/TagTransformsTest.kt diff --git a/xml-inflater/.gitignore b/xml/utils/.gitignore similarity index 100% rename from xml-inflater/.gitignore rename to xml/utils/.gitignore diff --git a/subprojects/xml-utils/build.gradle.kts b/xml/utils/build.gradle.kts similarity index 85% rename from subprojects/xml-utils/build.gradle.kts rename to xml/utils/build.gradle.kts index 2b35ff39e..38588bfa7 100644 --- a/subprojects/xml-utils/build.gradle.kts +++ b/xml/utils/build.gradle.kts @@ -23,6 +23,10 @@ plugins { id("kotlin-kapt") } +groupConfig { + groupIdSuffix.set("xml") +} + android { namespace = "${BuildConfig.packageName}.xml" } @@ -30,14 +34,15 @@ android { dependencies { kapt(libs.google.auto.service) + api(projects.utilities.lookup) + api(projects.xml.aaptcompiler) + implementation(libs.common.kotlin) - implementation(libs.google.auto.service.annotations) - implementation(projects.common) - implementation(projects.logger) implementation(libs.composite.jdt) - - api(projects.lookup) - api(projects.subprojects.aaptcompiler) + implementation(libs.google.auto.service.annotations) + + implementation(projects.core.common) + implementation(projects.logging.logger) testImplementation(libs.tests.junit) testImplementation(libs.tests.robolectric) diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/ManifestPermissionConstants.java b/xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/ManifestPermissionConstants.java similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/ManifestPermissionConstants.java rename to xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/ManifestPermissionConstants.java diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/Permission.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/Permission.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/Permission.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/Permission.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/PermissionGroup.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/PermissionGroup.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/permissions/PermissionGroup.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/permissions/PermissionGroup.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/registry/XmlRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/registry/XmlRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/registry/XmlRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/registry/XmlRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/utils/patterns.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/utils/patterns.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/utils/patterns.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/utils/patterns.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersions.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersions.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersions.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersions.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ClassInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ClassInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ClassInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/ClassInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/FieldInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/FieldInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/FieldInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/FieldInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/Info.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/Info.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/Info.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/Info.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/MethodInfo.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/versions/MethodInfo.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/MethodInfo.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/versions/MethodInfo.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/Widget.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/Widget.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/Widget.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/Widget.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTable.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTable.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTable.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTable.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistry.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistry.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistry.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistry.kt diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetType.kt b/xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetType.kt similarity index 100% rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetType.kt rename to xml/utils/src/main/java/com/itsaky/androidide/xml/widgets/WidgetType.kt diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt b/xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt similarity index 100% rename from subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt rename to xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/utils.kt b/xml/utils/src/test/java/com/itsaky/androidide/xml/utils.kt similarity index 100% rename from subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/utils.kt rename to xml/utils/src/test/java/com/itsaky/androidide/xml/utils.kt diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistryTest.kt b/xml/utils/src/test/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistryTest.kt similarity index 100% rename from subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistryTest.kt rename to xml/utils/src/test/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistryTest.kt diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt b/xml/utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt similarity index 100% rename from subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt rename to xml/utils/src/test/java/com/itsaky/androidide/xml/widgets/WidgetTableRegistryTest.kt