refactor: rename module :build-tools to :subprojects

.idea/compiler.xml

@@ -7,19 +7,26 @@
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value/1.10/e97ada61b651d7dff21931c2cc1b158e870cb417/auto-value-1.10.jar" />
         </processorPath>
-        <module name="AndroidIDE.build-tools.google-java-format.main" />
+        <module name="AndroidIDE.subprojects.google-java-format.main" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8">
       <module name="AndroidIDE.annotation-processors-java" target="11" />
       <module name="AndroidIDE.annotation-processors-java.main" target="11" />
       <module name="AndroidIDE.annotation-processors-java.test" target="11" />
+      <module name="AndroidIDE.build-tools.aaptcompiler" target="11" />
       <module name="AndroidIDE.build-tools.aaptcompiler.test" target="11" />
       <module name="AndroidIDE.build-tools.builder-api" target="11" />
       <module name="AndroidIDE.build-tools.builder-model" target="11" />
+      <module name="AndroidIDE.build-tools.builder-model-impl" target="11" />
+      <module name="AndroidIDE.build-tools.builder-model-impl.main" target="11" />
+      <module name="AndroidIDE.build-tools.builder-model-impl.test" target="11" />
       <module name="AndroidIDE.build-tools.caching-jar-fs" target="11" />
       <module name="AndroidIDE.build-tools.caching-jar-fs.main" target="1.7" />
       <module name="AndroidIDE.build-tools.caching-jar-fs.test" target="1.7" />
+      <module name="AndroidIDE.build-tools.classfile" target="11" />
+      <module name="AndroidIDE.build-tools.classfile.main" target="11" />
+      <module name="AndroidIDE.build-tools.classfile.test" target="11" />
       <module name="AndroidIDE.build-tools.eventbus" target="11" />
       <module name="AndroidIDE.build-tools.eventbus-android" target="11" />
       <module name="AndroidIDE.build-tools.eventbus-events" target="11" />
@@ -29,15 +36,52 @@
       <module name="AndroidIDE.build-tools.eventbus-models.test" target="11" />
       <module name="AndroidIDE.build-tools.eventbus.main" target="11" />
       <module name="AndroidIDE.build-tools.eventbus.test" target="11" />
+      <module name="AndroidIDE.build-tools.framework-stubs" target="11" />
+      <module name="AndroidIDE.build-tools.framework-stubs.main" target="11" />
+      <module name="AndroidIDE.build-tools.framework-stubs.test" target="11" />
+      <module name="AndroidIDE.build-tools.fuzzysearch" target="11" />
+      <module name="AndroidIDE.build-tools.fuzzysearch.main" target="11" />
+      <module name="AndroidIDE.build-tools.fuzzysearch.test" target="11" />
+      <module name="AndroidIDE.build-tools.javac-services" target="11" />
+      <module name="AndroidIDE.build-tools.jdt" target="11" />
+      <module name="AndroidIDE.build-tools.jdt.main" target="11" />
+      <module name="AndroidIDE.build-tools.jdt.test" target="11" />
+      <module name="AndroidIDE.build-tools.jsonrpc" target="11" />
+      <module name="AndroidIDE.build-tools.jsonrpc.main" target="11" />
+      <module name="AndroidIDE.build-tools.jsonrpc.test" target="11" />
       <module name="AndroidIDE.build-tools.layoutib-api.main" target="11" />
       <module name="AndroidIDE.build-tools.layoutib-api.test" target="11" />
+      <module name="AndroidIDE.build-tools.layoutlib-api" target="11" />
       <module name="AndroidIDE.build-tools.layoutlib-api.test" target="11" />
       <module name="AndroidIDE.build-tools.logger" target="11" />
       <module name="AndroidIDE.build-tools.logger.main" target="11" />
       <module name="AndroidIDE.build-tools.logger.test" target="11" />
       <module name="AndroidIDE.build-tools.project" target="11" />
+      <module name="AndroidIDE.build-tools.projects" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-events" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-events.main" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-events.test" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-impl" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-impl.main" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-impl.test" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-model" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-model.main" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-model.test" target="11" />
       <module name="AndroidIDE.build-tools.tooling-api-plugin" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-testing" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-testing.main" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api-testing.test" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api.main" target="11" />
+      <module name="AndroidIDE.build-tools.tooling-api.test" target="11" />
       <module name="AndroidIDE.build-tools.tools-common" target="11" />
+      <module name="AndroidIDE.build-tools.xml-dom" target="11" />
+      <module name="AndroidIDE.build-tools.xml-dom.main" target="11" />
+      <module name="AndroidIDE.build-tools.xml-dom.test" target="11" />
+      <module name="AndroidIDE.build-tools.xml-formatter" target="11" />
+      <module name="AndroidIDE.build-tools.xml-formatter.main" target="11" />
+      <module name="AndroidIDE.build-tools.xml-formatter.test" target="11" />
+      <module name="AndroidIDE.build-tools.xml-utils" target="11" />
       <module name="AndroidIDE.colorschemes" target="11" />
       <module name="AndroidIDE.colorschemes.main" target="11" />
       <module name="AndroidIDE.editor-languages" target="11" />

annotation-processors/build.gradle

@@ -46,5 +46,5 @@ dependencies {
   implementation project(path: ':shared')
   
   kapt google.auto_service
-  kapt project (path: ':build-tools:framework-stubs')
+  kapt project (path: ':subprojects:framework-stubs')
 }

annotations/build.gradle

@@ -24,5 +24,5 @@ dependencies {
     implementation androidx.annotation
     implementation common.jkotlin
     compileOnly project (path: ':shared')
-    compileOnly project (path: ':build-tools:framework-stubs')
+    compileOnly project (path: ':subprojects:framework-stubs')
 }

app/build.gradle

@@ -144,11 +144,11 @@ dependencies {
     implementation project (':eventbus')
     implementation project (':eventbus-android')
     implementation project (':eventbus-events')
-    implementation project (':build-tools:aaptcompiler')
-    implementation project (':build-tools:javac-services')
-    implementation project (':build-tools:xml-utils')
-    implementation project (':build-tools:projects')
-    implementation project (':build-tools:tooling-api')
+    implementation project (':subprojects:aaptcompiler')
+    implementation project (':subprojects:javac-services')
+    implementation project (':subprojects:xml-utils')
+    implementation project (':subprojects:projects')
+    implementation project (':subprojects:tooling-api')
     implementation project (':lsp:api')
     implementation project (':lsp:java')
     implementation project (':lsp:xml')
@@ -166,7 +166,7 @@ dependencies {
     
     // 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 project (path: ':build-tools:tooling-api-impl')
+    compileOnly project (path: ':subprojects:tooling-api-impl')
     
     testImplementation common.editor
     testImplementation tests.junit

app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt

@@ -17,11 +17,8 @@
 
 package com.itsaky.androidide.activities.editor
 
-import android.content.ComponentName
 import android.content.Intent
-import android.content.ServiceConnection
 import android.os.Bundle
-import android.os.IBinder
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.CheckBox
 import androidx.annotation.GravityInt
@@ -49,7 +46,6 @@ import com.itsaky.androidide.projects.ProjectManager.setupProject
 import com.itsaky.androidide.projects.api.Project
 import com.itsaky.androidide.projects.builder.BuildService
 import com.itsaky.androidide.services.GradleBuildService
-import com.itsaky.androidide.services.GradleBuildService.GradleServiceBinder
 import com.itsaky.androidide.services.GradleBuildServiceConnnection
 import com.itsaky.androidide.tooling.api.messages.result.InitializeResult
 import com.itsaky.androidide.utils.DialogUtils.newMaterialDialogBuilder
@@ -77,10 +73,9 @@ abstract class ProjectHandlerActivity : BaseEditorActivity(), IProjectHandler {
     }
 
   protected val mBuildEventListener = EditorBuildEventListener()
-  
+
   companion object {
-    @JvmStatic
-    private val buildServiceConnection = GradleBuildServiceConnnection()
+    @JvmStatic private val buildServiceConnection = GradleBuildServiceConnnection()
   }
 
   abstract fun doCloseAll(runAfter: () -> Unit)
@@ -136,22 +131,28 @@ abstract class ProjectHandlerActivity : BaseEditorActivity(), IProjectHandler {
   }
 
   override fun startServices() {
-  
+
     val service = Lookup.DEFAULT.lookup(BuildService.KEY_BUILD_SERVICE) as GradleBuildService?
     if (viewModel.isBoundToBuildSerice && service != null) {
       log.info("Reusing already started Gradle build service")
       onGradleBuildServiceConnected(service)
       return
     }
-    
+
     buildServiceConnection.onConnected = this::onGradleBuildServiceConnected
-    
-    if (bindService(Intent(this, GradleBuildService::class.java), buildServiceConnection, BIND_AUTO_CREATE or BIND_IMPORTANT)) {
+
+    if (
+      bindService(
+        Intent(this, GradleBuildService::class.java),
+        buildServiceConnection,
+        BIND_AUTO_CREATE or BIND_IMPORTANT
+      )
+    ) {
       log.info("Bind request for Gradle build service was successful...")
     } else {
       log.error("Gradle build service doesn't exist or the IDE is not allowed to access it.")
     }
-    
+
     initLspClient()
   }
 

buildSrc/src/main/java/com/itsaky/androidide/plugins/GoogleJavaFormatPlugin.kt

@@ -40,12 +40,12 @@ class GoogleJavaFormatPlugin : Plugin<Project> {
   companion object {
     private val excludeProjects =
       listOf(
-        ":build-tools:aaptcompiler",
-        ":build-tools:google-java-format",
-        ":build-tools:jaxp",
-        ":build-tools:jdt",
-        ":build-tools:xml-dom",
-        ":build-tools:xml-formatter",
+        ":subprojects:aaptcompiler",
+        ":subprojects:google-java-format",
+        ":subprojects:jaxp",
+        ":subprojects:jdt",
+        ":subprojects:xml-dom",
+        ":subprojects:xml-formatter",
         ":lexers"
       )
   }

logger/build.gradle

@@ -25,7 +25,7 @@ java {
 }
 
 dependencies {
-    compileOnly project (path: ':build-tools:framework-stubs')
+    compileOnly project (path: ':subprojects:framework-stubs')
     
     testImplementation tests.junit
     testImplementation tests.google_truth

lsp/api/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     kapt common.eventbus_ap
     
     implementation common.editor
-    implementation project (':build-tools:fuzzysearch')
+    implementation project (':subprojects:fuzzysearch')
     implementation project (':eventbus-events')
     
     implementation androidx.appcompat
@@ -64,8 +64,8 @@ dependencies {
     implementation common.utilcode
     implementation google.material
     
-    api project (':build-tools:projects')
-    api project (':build-tools:xml-utils')
+    api project (':subprojects:projects')
+    api project (':subprojects:xml-utils')
     api project (':lookup')
     api project (':lsp:models')
     api project (':preferences')

lsp/java/build.gradle

@@ -70,9 +70,9 @@ dependencies {
     
     implementation project (path: ':resources')
     implementation project (path: ':lsp:api')
-    implementation project (path: ':build-tools:javac')
-    implementation project (path: ':build-tools:javac-services')
-    implementation project (path: ':build-tools:google-java-format')
+    implementation project (path: ':subprojects:javac')
+    implementation project (path: ':subprojects:javac-services')
+    implementation project (path: ':subprojects:google-java-format')
     
     implementation androidx.ktx
     implementation common.kotlin
@@ -80,7 +80,7 @@ dependencies {
     testImplementation project (':lsp:testing')
     testImplementation project (':common')
     testImplementation project (':actions')
-    testImplementation project (':build-tools:javac')
+    testImplementation project (':subprojects:javac')
     testImplementation tests.junit
     testImplementation tests.google_truth
     testImplementation tests.robolectric

lsp/models/build.gradle

@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation common.editor
     implementation project (':common')
-    implementation project (':build-tools:fuzzysearch')
+    implementation project (':subprojects:fuzzysearch')
     
     implementation androidx.appcompat
     implementation androidx.ktx

lsp/testing/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     implementation project (':actions')
     implementation project (':common')
     implementation project (':eventbus-android')
-    implementation project (':build-tools:tooling-api-testing')
+    implementation project (':subprojects:tooling-api-testing')
     implementation common.editor
     implementation tests.junit
     implementation tests.google_truth

lsp/xml/build.gradle

@@ -69,16 +69,16 @@ dependencies {
     implementation project (':actions')
     implementation project (':lsp:api')
     implementation project (':lexers')
-    implementation project (':build-tools:xml-dom')
-    implementation project (':build-tools:xml-formatter')
-    implementation project (':build-tools:xml-utils')
+    implementation project (':subprojects:xml-dom')
+    implementation project (':subprojects:xml-formatter')
+    implementation project (':subprojects:xml-utils')
     
     implementation androidx.ktx
     implementation common.kotlin
     implementation google.material
     
-    testImplementation project (':build-tools:projects')
-    testImplementation project (':build-tools:tooling-api')
+    testImplementation project (':subprojects:projects')
+    testImplementation project (':subprojects:tooling-api')
     testImplementation project (':lsp:testing')
     testImplementation project (':common')
     testImplementation project (':actions')

settings.gradle

@@ -4,6 +4,7 @@ include ':annotations'
 include ':actions'
 include ':app'
 include ':common'
+include ':editor'
 include ':emulatorview'
 include ':eventbus'
 include ':eventbus-android'
@@ -11,8 +12,12 @@ include ':eventbus-events'
 include ':lexers'
 include ':logger'
 include ':lookup'
+include ':preferences'
+include ':resources'
 include ':shared'
 include ':treeview'
+include ':uidesigner'
+include ':xml-inflater'
 
 include ':gradle-plugin'
 
@@ -22,29 +27,24 @@ include ':lsp:java'
 include ':lsp:xml'
 include ':lsp:testing'
 
-include ':build-tools:aaptcompiler'
-include ':build-tools:builder-model-impl'
-include ':build-tools:classfile'
-include ':build-tools:framework-stubs'
-include ':build-tools:fuzzysearch'
-include ':build-tools:google-java-format'
-include ':build-tools:javac'
-include ':build-tools:javac-services'
-include ':build-tools:jaxp'
-include ':build-tools:jdt'
-include ':build-tools:jsonrpc'
-include ':build-tools:layoutlib-api'
-include ':build-tools:projects'
-include ':build-tools:tooling-api'
-include ':build-tools:tooling-api-events'
-include ':build-tools:tooling-api-impl'
-include ':build-tools:tooling-api-model'
-include ':build-tools:tooling-api-testing'
-include ':build-tools:xml-dom'
-include ':build-tools:xml-formatter'
-include ':build-tools:xml-utils'
-include ':editor'
-include ':preferences'
-include ':resources'
-include ':uidesigner'
-include ':xml-inflater'
+include ':subprojects:aaptcompiler'
+include ':subprojects:builder-model-impl'
+include ':subprojects:classfile'
+include ':subprojects:framework-stubs'
+include ':subprojects:fuzzysearch'
+include ':subprojects:google-java-format'
+include ':subprojects:javac'
+include ':subprojects:javac-services'
+include ':subprojects:jaxp'
+include ':subprojects:jdt'
+include ':subprojects:jsonrpc'
+include ':subprojects:layoutlib-api'
+include ':subprojects:projects'
+include ':subprojects:tooling-api'
+include ':subprojects:tooling-api-events'
+include ':subprojects:tooling-api-impl'
+include ':subprojects:tooling-api-model'
+include ':subprojects:tooling-api-testing'
+include ':subprojects:xml-dom'
+include ':subprojects:xml-formatter'
+include ':subprojects:xml-utils'

subprojects/aaptcompiler/build.gradle

@@ -56,13 +56,13 @@ android {
 dependencies {
     implementation common.kotlin
     implementation project (':logger')
-    implementation project (':build-tools:jaxp')
+    implementation project (':subprojects:jaxp')
     
     api aapt.annotations
     api aapt.common
     api aapt.proto
     api google.protobuf
-    api project (':build-tools:layoutlib-api')
+    api project (':subprojects:layoutlib-api')
     
     testImplementation tests.junit
     testImplementation tests.robolectric

subprojects/builder-model-impl/src/main/java/com/itsaky/androidide/builder/model/DefaultLibrary.kt

@@ -45,7 +45,7 @@ class DefaultLibrary : Library, Serializable {
 
   /**
    * The package name of this library. MUST NOT be accesed directly. Use
-   * `DefaultLibrary.findPackageName()` method defined in the `:build-tools:tooling-api-models`
+   * `DefaultLibrary.findPackageName()` method defined in the `:subprojects:tooling-api-models`
    * module.
    */
   var packageName: String = ""