build: reorganize modules to fix dependency resolution issues

.idea/compiler.xml

@@ -153,10 +153,20 @@
       <module name="AndroidIDE.templates-testing.main" target="11" />
       <module name="AndroidIDE.templates-testing.test" target="11" />
       <module name="AndroidIDE.testing-android" target="17" />
+      <module name="AndroidIDE.testing.android" target="17" />
       <module name="AndroidIDE.testing.android.test" target="11" />
+      <module name="AndroidIDE.testing.benchmark" target="17" />
+      <module name="AndroidIDE.testing.common" target="11" />
+      <module name="AndroidIDE.testing.common.main" target="11" />
+      <module name="AndroidIDE.testing.common.test" target="11" />
+      <module name="AndroidIDE.testing.lsp" target="17" />
+      <module name="AndroidIDE.testing.tooling" target="11" />
       <module name="AndroidIDE.testing.tooling-api" target="11" />
       <module name="AndroidIDE.testing.tooling-api.main" target="11" />
       <module name="AndroidIDE.testing.tooling-api.test" target="11" />
+      <module name="AndroidIDE.testing.tooling.main" target="11" />
+      <module name="AndroidIDE.testing.tooling.test" target="11" />
+      <module name="AndroidIDE.testing.unit" target="17" />
       <module name="AndroidIDE.testing.unit.test" target="11" />
       <module name="AndroidIDE.treesitter.test" target="1.7" />
       <module name="ATS.android-tree-sitter" target="17" />

app/build.gradle.kts

@@ -158,6 +158,6 @@ dependencies {
   // So we always copy the latest JAR file to assets
   compileOnly(projects.subprojects.toolingApiImpl)
 
-  testImplementation(projects.testing.unit)
+  testImplementation(projects.subprojects.testingUnit)
-  androidTestImplementation(projects.testing.android)
+  androidTestImplementation(projects.subprojects.testingAndroid)
 }

build-info/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import com.android.SdkConstants
 import com.itsaky.androidide.build.config.AGP_VERSION_MINIMUM
 import com.itsaky.androidide.build.config.BuildConfig
 import com.itsaky.androidide.build.config.CI
@@ -74,7 +75,7 @@ tasks.create("generateBuildInfo") {
 
         "AGP_VERSION_MININUM" to AGP_VERSION_MINIMUM,
         "AGP_VERSION_LATEST" to libs.versions.agp.tooling.get(),
-        "AGP_VERSION_GRADLE_LATEST" to "8.6" /*SdkConstants.GRADLE_LATEST_VERSION*/,
+        "AGP_VERSION_GRADLE_LATEST" to SdkConstants.GRADLE_LATEST_VERSION,
 
         "SNAPSHOTS_REPOSITORY" to VersionUtils.SONATYPE_SNAPSHOTS_REPO,
         "PUBLIC_REPOSITORY" to VersionUtils.SONATYPE_PUBLIC_REPO,

common/build.gradle.kts

@@ -18,8 +18,8 @@
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
-    alias(libs.plugins.android.library)
+    id("com.android.library")
-    alias(libs.plugins.kotlin.android)
+    id("kotlin-android")
 }
 
 android {

composite-builds/build-deps/appintro/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.android.library)
+    id("com.android.library")
-    alias(libs.plugins.kotlin.android)
+    id("kotlin-android")
     id("com.itsaky.androidide.build")
 }
 

composite-builds/build-logic/build.gradle.kts

@@ -15,6 +15,10 @@
 *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+plugins {
+  alias(libs.plugins.kotlin.jvm) apply false
+}
+
 subprojects {
   plugins.withId("java-library") {
     extensions.getByType(JavaPluginExtension::class.java).apply {

composite-builds/build-logic/common/build.gradle.kts

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   //noinspection JavaPluginLanguageLevel
   id("java-library")
-  alias(libs.plugins.kotlin.jvm)
+  id("org.jetbrains.kotlin.jvm")
 }
 
 tasks.withType<KotlinCompile> {

composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/TerminalBootstrapPackagesPlugin.kt

@@ -46,20 +46,22 @@ class TerminalBootstrapPackagesPlugin : Plugin<Project> {
      */
     private const val BOOTSTRAP_PACKAGES_VERSION = "16.12.2023"
 
-    private const val PACKAGES_DOWNLOAD_URL = "https://github.com/AndroidIDEOfficial/terminal-packages/releases/download/bootstrap-%1\$s/bootstrap-%2\$s.zip"
+    private const val PACKAGES_DOWNLOAD_URL =
+      "https://github.com/AndroidIDEOfficial/terminal-packages/releases/download/bootstrap-%1\$s/bootstrap-%2\$s.zip"
   }
 
   override fun apply(target: Project) {
     target.run {
 
-      val bootstrapOut = project.layout.buildDirectory.file("intermediates/bootstrap-packages")
+      val bootstrapOut = project.layout.buildDirectory.dir("bootstrap-packages")
         .get().asFile
 
       val files = BOOTSTRAP_PACKAGES.map { (arch, sha256) ->
         val file = File(bootstrapOut, "bootstrap-${arch}.zip")
         file.parentFile.mkdirs()
 
-        DownloadUtils.doDownload(file = file,
+        DownloadUtils.doDownload(
+          file = file,
           remoteUrl = PACKAGES_DOWNLOAD_URL.format(BOOTSTRAP_PACKAGES_VERSION, arch),
           expectedChecksum = sha256,
           logger = logger

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.3.0"
+agp = "8.4.1"
-agp-tooling = "8.4.0-rc02"
+agp-tooling = "8.4.1"
 gradle-tooling = "8.6"
 junit-jupiter = "5.10.2"
 kotlin = "1.9.24"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

lsp/java/build.gradle.kts

@@ -45,18 +45,17 @@ dependencies {
 
   implementation(libs.androidide.ts)
   implementation(libs.androidide.ts.java)
+  implementation(libs.androidx.appcompat)
   implementation(libs.common.editor)
   implementation(libs.common.javaparser)
   implementation(libs.common.utilcode)
   implementation(libs.androidx.annotation)
   implementation(libs.google.guava)
   implementation(libs.google.gson)
+  implementation(libs.google.material)
 
-  compileOnly(libs.androidx.appcompat)
+  implementation(projects.actions)
-  compileOnly(libs.google.material)
+  implementation(projects.common)
-  compileOnly(projects.actions)
-  compileOnly(projects.common)
-
   implementation(projects.editorApi)
   implementation(projects.resources)
   implementation(projects.lsp.api)
@@ -71,10 +70,10 @@ dependencies {
 
   implementation(libs.androidx.core.ktx)
   implementation(libs.common.kotlin)
-
+  
-  testImplementation(projects.testing.common)
+  testImplementation(projects.subprojects.testingCommon)
-  testImplementation(projects.testing.lsp)
+  testImplementation(projects.subprojects.testingLsp)
-  androidTestImplementation(projects.testing.android)
+  androidTestImplementation(projects.subprojects.testingAndroid)
   androidTestImplementation(projects.common)
   androidTestImplementation(projects.shared)
 }

lsp/xml/build.gradle.kts

@@ -55,7 +55,8 @@ dependencies {
     testImplementation(projects.actions)
     testImplementation(projects.subprojects.projects)
     testImplementation(projects.subprojects.toolingApi)
-    testImplementation(projects.testing.lsp)
+    testImplementation(projects.subprojects.testingCommon)
+    testImplementation(projects.subprojects.testingLsp)
 
     compileOnly(projects.common)
     compileOnly(libs.common.antlr4)

settings.gradle.kts

@@ -160,6 +160,12 @@ include(
   ":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",
@@ -170,12 +176,6 @@ include(
   ":termux:termux-emulator",
   ":termux:termux-shared",
   ":termux:termux-view",
-  ":testing:android",
-  ":testing:benchmark",
-  ":testing:common",
-  ":testing:lsp",
-  ":testing:tooling",
-  ":testing:unit",
 )
 
 object FDroidConfig {

subprojects/projects/build.gradle.kts

@@ -38,5 +38,5 @@ dependencies {
   implementation(libs.google.auto.service.annotations)
   implementation(libs.google.guava)
 
-  testImplementation(projects.testing.tooling)
+  testImplementation(projects.subprojects.testingTooling)
 }

subprojects/testing-android/build.gradle.kts

@@ -18,8 +18,8 @@
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
-  alias(libs.plugins.android.library)
+  id("com.android.library")
-  alias(libs.plugins.kotlin.android)
+  id("kotlin-android")
 }
 
 android {
@@ -61,5 +61,5 @@ dependencies {
   api(projects.buildInfo)
   api(projects.common)
   api(projects.shared)
-  api(projects.testing.common)
+  api(projects.subprojects.testingCommon)
 }

subprojects/testing-common/build.gradle.kts

@@ -24,10 +24,10 @@ plugins {
 
 dependencies {
   kapt(libs.google.auto.service)
-  implementation(libs.google.auto.service.annotations)
+  api(libs.google.auto.service.annotations)
 
   api(libs.tests.junit)
   api(projects.logger)
 
-  implementation(projects.subprojects.toolingApiImpl)
+  api(projects.subprojects.toolingApiImpl)
 }

subprojects/testing-lsp/build.gradle.kts

@@ -18,8 +18,8 @@
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
-  alias(libs.plugins.android.library)
+  id("com.android.library")
-  alias(libs.plugins.kotlin.android)
+  id("kotlin-android")
 }
 
 android {
@@ -30,15 +30,14 @@ dependencies {
   api(libs.androidx.core.ktx)
   api(libs.common.editor)
   api(libs.common.kotlin)
-
   api(libs.tests.mockito.kotlin)
 
   api(projects.actions)
   api(projects.common)
   api(projects.eventbusAndroid)
   api(projects.lsp.api)
-  api(projects.testing.common)
+  api(projects.subprojects.testingCommon)
-  api(projects.testing.android)
+  api(projects.subprojects.testingAndroid)
-  api(projects.testing.tooling)
+  api(projects.subprojects.testingTooling)
-  api(projects.testing.unit)
+  api(projects.subprojects.testingUnit)
 }

subprojects/testing-tooling/build.gradle.kts

@@ -27,13 +27,11 @@ dependencies {
     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.testing.common)
 
     // build tooling API before tests
     compileOnly(projects.subprojects.toolingApiImpl)

subprojects/testing-unit/build.gradle.kts

@@ -32,10 +32,8 @@ 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.testing.common)
 }

subprojects/tooling-api-impl/build.gradle.kts

@@ -71,7 +71,7 @@ dependencies {
   implementation(libs.xml.apis)
   implementation(libs.tooling.gradleApi)
 
-  testImplementation(projects.testing.tooling)
+  testImplementation(projects.subprojects.testingTooling)
 
   runtimeOnly(libs.tooling.slf4j)
 }

templates-impl/build.gradle.kts

@@ -43,6 +43,6 @@ dependencies {
   testImplementation(projects.templatesApi)
   testImplementation(projects.lsp.api)
   testImplementation(projects.preferences)
-  testImplementation(projects.testing.unit)
+  testImplementation(projects.subprojects.testingUnit)
-  testImplementation(projects.testing.tooling)
+  testImplementation(projects.subprojects.testingTooling)
 }

termux/termux-app/build.gradle.kts

@@ -68,7 +68,7 @@ dependencies {
     implementation(projects.termux.termuxView)
     implementation(projects.termux.termuxShared)
 
-    testImplementation(projects.testing.unit)
+    testImplementation(projects.subprojects.testingUnit)
 }
 
 tasks.register("versionName") {

termux/termux-emulator/build.gradle.kts

@@ -36,5 +36,5 @@ tasks.withType(Test::class.java) {
 
 dependencies {
     implementation(libs.androidx.annotation)
-    testImplementation(projects.testing.unit)
+    testImplementation(projects.subprojects.testingUnit)
 }

termux/termux-shared/build.gradle.kts

@@ -40,6 +40,6 @@ dependencies {
     implementation(projects.preferences)
     implementation(projects.resources)
 
-    testImplementation(projects.testing.unit)
+    testImplementation(projects.subprojects.testingUnit)
-    testImplementation(projects.testing.android)
+    testImplementation(projects.subprojects.testingAndroid)
 }

termux/termux-view/build.gradle.kts

@@ -15,5 +15,5 @@ dependencies {
     implementation(projects.resources)
     api(projects.termux.termuxEmulator)
 
-    testImplementation(projects.testing.unit)
+    testImplementation(projects.subprojects.testingUnit)
 }

xml-inflater/build.gradle.kts

@@ -41,5 +41,6 @@ dependencies {
   implementation(projects.resources)
 
   testImplementation(projects.subprojects.projects)
-  testImplementation(projects.testing.tooling)
+  testImplementation(projects.subprojects.testingCommon)
+  testImplementation(projects.subprojects.testingTooling)
 }