Moved 'eventbus*' modules from 'build-tools' module to root project

.idea/compiler.xml

@@ -13,9 +13,15 @@
     <bytecodeTargetLevel target="1.8">
       <module name="AndroidIDE.build-tools.builder-api" target="11" />
       <module name="AndroidIDE.build-tools.builder-model" 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" />
+      <module name="AndroidIDE.build-tools.eventbus-events.main" target="11" />
       <module name="AndroidIDE.build-tools.eventbus-events.test" target="11" />
       <module name="AndroidIDE.build-tools.eventbus-models.main" target="11" />
       <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.project" target="11" />
       <module name="AndroidIDE.build-tools.tooling-api-plugin" target="11" />
       <module name="AndroidIDE.google-java-format" target="1.8" />

app/build.gradle

@@ -126,8 +126,8 @@ dependencies {
     implementation common.kotlin
     
     // Local projects here
-    implementation project (':build-tools:eventbus-android')
-    implementation project (':build-tools:eventbus-events')
+    implementation project (':eventbus-android')
+    implementation project (':eventbus-events')
     implementation project (':build-tools:projects')
     implementation project (':build-tools:tooling-api')
     implementation project (':treeview')

build-tools/projects/build.gradle

@@ -44,8 +44,8 @@ dependencies {
     
     kapt common.eventbus_ap
     
-    api project (path: ':build-tools:eventbus')
-    api project (path: ':build-tools:eventbus-events')
+    api project (path: ':eventbus')
+    api project (path: ':eventbus-events')
     api project (path: ':build-tools:tooling-api')
     
     implementation project (path: ':shared')

common/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     implementation androidx.ktx
     implementation common.kotlin
     
-    implementation project (path: ':build-tools:eventbus-events')
+    implementation project (path: ':eventbus-events')
     
     api androidx.multidex
     

eventbus-android/build.gradle

@@ -46,5 +46,5 @@ android {
 }
 
 dependencies {
-    api project(path: ':build-tools:eventbus')
+    api project(path: ':eventbus')
 }

eventbus-events/build.gradle

@@ -48,5 +48,5 @@ dependencies {
     implementation project (path: ':shared')
     implementation project (path: ':build-tools:logger')
     
-    api project (path: ':build-tools:eventbus')
+    api project (path: ':eventbus')
 }

lsp/api/build.gradle

@@ -52,7 +52,7 @@ kapt {
 dependencies {
     implementation common.editor
     implementation project (':build-tools:fuzzysearch')
-    implementation project (':build-tools:eventbus-events')
+    implementation project (':eventbus-events')
     
     implementation androidx.appcompat
     implementation androidx.ktx

lsp/testing/build.gradle

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

settings.gradle

@@ -3,6 +3,9 @@ include ':actions'
 include ':app'
 include ':common'
 include ':emulatorview'
+include ':eventbus'
+include ':eventbus-android'
+include ':eventbus-events'
 include ':lexers'
 include ':sdk-info'
 include ':treeview'
@@ -29,9 +32,6 @@ include ':build-tools:fuzzysearch'
 include ':build-tools:builder-model-impl'
 include ':build-tools:jsonrpc'
 include ':build-tools:projects'
-include ':build-tools:eventbus'
-include ':build-tools:eventbus-android'
-include ':build-tools:eventbus-events'
 include ':build-tools:tooling-api-testing'
 include ':build-tools:javac-services'
 include ':lsp:models'