fix: update group IDs for sub-modules; fixes gradle plugin test failures

annotation/annotations/build.gradle.kts

@@ -17,15 +17,14 @@ import com.itsaky.androidide.build.config.BuildConfig
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("annotations")
-}
+  
 
 dependencies {
     implementation(libs.androidx.annotation)

annotation/processors-ksp/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -23,9 +24,7 @@ plugins {
   kotlin("kapt")
 }
 
-groupConfig {
-  groupIdSuffix.set("annotations")
-}
+
 
 dependencies {
   kapt(libs.google.auto.service)

annotation/processors/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import com.itsaky.androidide.build.config.BuildConfig
 
@@ -22,9 +23,7 @@ plugins {
   kotlin("jvm")
 }
 
-groupConfig {
-  groupIdSuffix.set("annotations")
-}
+
 
 dependencies {
   implementation(kotlin("stdlib"))

build.gradle.kts

@@ -21,7 +21,6 @@ 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
@@ -47,11 +46,21 @@ buildscript {
   }
 }
 
+// Root project has 'com.itsaky.androidide' as the group ID
+project.group = BuildConfig.packageName
+
 subprojects {
+  if (project != rootProject) {
+    var group = project.parent!!.group
+    if (project.parent != rootProject) {
+      group = "${group}.${project.parent!!.name}"
+    }
+    project.group = group
+  }
+
   // Always load the F-Droid config
   FDroidConfig.load(project)
 
-  apply { plugin(GroupConfigPlugin::class.java) }
   afterEvaluate {
     apply { plugin(AndroidIDEPlugin::class.java) }
   }

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

@@ -1,42 +0,0 @@
-/*
- *  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 <https://www.gnu.org/licenses/>.
- */
-
-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<Project> {
-  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}")
-    }
-  }
-}

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

@@ -18,6 +18,7 @@
 package com.itsaky.androidide.plugins.conf
 
 import com.itsaky.androidide.build.config.ProjectConfig
+import com.itsaky.androidide.build.config.publishingVersion
 import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
 import com.vanniktech.maven.publish.GradlePlugin
 import com.vanniktech.maven.publish.JavaLibrary
@@ -32,7 +33,6 @@ import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.withType
-import com.itsaky.androidide.build.config.publishingVersion
 import java.io.File
 
 private val projectsRequiringMavenLocalForTests = arrayOf(":tooling:plugin")
@@ -55,7 +55,8 @@ fun Project.configureMavenPublish() {
         tasks.withType<Test> {
           for ((project, _) in mavenLocalRepos) {
             dependsOn(
-              project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository"))
+              project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository")
+            )
           }
         }
       }

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

@@ -1,47 +0,0 @@
-/*
- *  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 <https://www.gnu.org/licenses/>.
- */
-
-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<String>
-
-  companion object {
-
-    /**
-     * Create the [GroupConfigPluginExtension] for the project.
-     */
-    fun Project.groupConfigExtension(): GroupConfigPluginExtension {
-      return extensions.create<GroupConfigPluginExtension>("groupConfig")
-    }
-  }
-}

core/actions/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins{
@@ -23,9 +24,7 @@ plugins{
     id("kotlin-kapt")
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.actions"

core/app/build.gradle.kts

@@ -1,9 +1,27 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
 @file:Suppress("UnstableApiUsage")
 
 import com.itsaky.androidide.build.config.BuildConfig
 import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements
 import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin
 
+
 plugins {
   id("com.itsaky.androidide.core-app")
   id("com.android.application")
@@ -26,9 +44,7 @@ buildscript {
   }
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = BuildConfig.packageName

core/common/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.common"

core/database/build.gradle.kts

@@ -15,6 +15,7 @@
  *  along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -24,9 +25,7 @@ plugins {
   id("realm-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.database"

core/indexing-api/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -24,9 +25,7 @@ plugins {
   id("realm-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.indexing.api"

core/indexing-core/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -24,9 +25,7 @@ plugins {
   id("realm-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.indexing.core"

core/lsp-api/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
     id("kotlin-kapt")
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.lsp.api"

core/lsp-models/build.gradle.kts

@@ -1,13 +1,29 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
 import com.itsaky.androidide.build.config.BuildConfig
 
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.lsp.models"

core/projects/build.gradle.kts

@@ -1,5 +1,23 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
 import com.itsaky.androidide.build.config.BuildConfig
 
+
 plugins {
   id("com.android.library")
   id("kotlin-android")
@@ -7,9 +25,7 @@ plugins {
   id("kotlin-kapt")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.projects"

core/resources/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
   id("com.android.library")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.resources"

editor/api/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("kotlin-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.editor.api"

editor/impl/build.gradle.kts

@@ -1,5 +1,23 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
 import com.itsaky.androidide.build.config.BuildConfig
 
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -7,9 +25,7 @@ plugins {
     id("com.google.devtools.ksp") version libs.versions.ksp
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.editor"

editor/lexers/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.plugins.LexerGeneratorPlugin
 import com.itsaky.androidide.build.config.BuildConfig
 
@@ -27,9 +28,7 @@ apply {
   plugin(LexerGeneratorPlugin::class.java)
 }
 
-groupConfig {
-  groupIdSuffix.set("core")
-}
+
 
 java {
   sourceCompatibility = BuildConfig.javaVersion

editor/treesitter/build.gradle.kts

@@ -22,14 +22,13 @@
  *     additional information or have any questions
  ******************************************************************************/
 
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("core")
-}
+
 
 android {
     namespace = "io.github.rosemoe.sora.ts"

event/eventbus-android/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("org.jetbrains.kotlin.android")
 }
 
-groupConfig {
-    groupIdSuffix.set("event")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.eventbus.android"

event/eventbus-events/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("event")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.eventbus.events"

event/eventbus/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("event")
-}
+
 
 dependencies {
     implementation(libs.common.jkotlin)

java/javac-services/build.gradle.kts

@@ -1,13 +1,29 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
 import com.itsaky.androidide.build.config.BuildConfig
 
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("java")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.javac.services"

java/lsp/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -24,9 +25,7 @@ plugins {
   id("realm-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("event")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.lsp.java"

logging/idestats/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("org.jetbrains.kotlin.android")
 }
 
-groupConfig {
-  groupIdSuffix.set("logging")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.stats"

logging/logger/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.plugins.NoDesugarPlugin
 
 @Suppress("JavaPluginLanguageLevel")
@@ -27,9 +28,7 @@ apply {
     plugin(NoDesugarPlugin::class.java)
 }
 
-groupConfig {
-    groupIdSuffix.set("logging")
-}
+
 
 description = "AndroidIDE Logging Framework"
 

logging/logsender-sample/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
   id("com.android.application")
 }
 
-groupConfig {
-  groupIdSuffix.set("logging")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.logsender.sample"

logging/logsender/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.plugins.NoDesugarPlugin
 import com.itsaky.androidide.build.config.BuildConfig
 
@@ -27,9 +28,7 @@ apply {
   plugin(NoDesugarPlugin::class.java)
 }
 
-groupConfig {
-  groupIdSuffix.set("logging")
-}
+
 
 description = "LogSender is used to read logs from applications built with AndroidIDE"
 

termux/application/build.gradle.kts

@@ -17,6 +17,8 @@
 
 @file:Suppress("UnstableApiUsage")
 
+
+
 import com.itsaky.androidide.build.config.BuildConfig
 import com.itsaky.androidide.plugins.TerminalBootstrapPackagesPlugin
 
@@ -29,9 +31,7 @@ apply {
     plugin(TerminalBootstrapPackagesPlugin::class.java)
 }
 
-groupConfig {
-    groupIdSuffix.set("termux")
-}
+
 
 val packageVariant = System.getenv("TERMUX_PACKAGE_VARIANT") ?: "apt-android-7" // Default: "apt-android-7"
 

termux/emulator/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("emulator")
-}
+
 
 android {
     namespace = "com.termux.emulator"

termux/shared/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("termux")
-}
+
 
 android {
     namespace = "com.termux.shared"

termux/view/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-android")
 }
 
-groupConfig {
-    groupIdSuffix.set("termux")
-}
+
 
 android {
     namespace = "com.termux.view"

testing/androidTest/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("kotlin-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("testing")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.testing.android"

testing/benchmarks/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
   alias(libs.plugins.benchmark)
 }
 
-groupConfig {
-  groupIdSuffix.set("testing")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.benchmark"

testing/commonTest/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
   id("java-library")
@@ -22,9 +23,7 @@ plugins {
   id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-  groupIdSuffix.set("testing")
-}
+
 
 dependencies {
   kapt(libs.google.auto.service)

testing/gradleToolingTest/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("testing")
-}
+
 
 dependencies {
     api(libs.common.jkotlin)

testing/lspTest/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("kotlin-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("testing")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.lsp.testing"

testing/unitTest/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   kotlin("android")
 }
 
-groupConfig {
-  groupIdSuffix.set("testing")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.testing.unit"

tooling/api/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("tooling")
-}
+
 
 dependencies {
     api(projects.logging.logger)

tooling/builder-model-impl/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
   id("java-library")
   id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-  groupIdSuffix.set("tooling")
-}
+
 
 dependencies {
   api(libs.tooling.builderModel)

tooling/events/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("tooling")
-}
+
 
 dependencies {
     implementation(libs.common.jkotlin)

tooling/impl/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 @Suppress("JavaPluginLanguageLevel")
@@ -25,9 +26,7 @@ plugins {
   id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-  groupIdSuffix.set("tooling")
-}
+
 
 tasks.withType<Jar> {
   manifest { attributes("Main-Class" to "${BuildConfig.packageName}.tooling.impl.Main") }

tooling/model/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
   id ("java-library")
   id ("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-  groupIdSuffix.set("tooling")
-}
+
 
 dependencies {
 

tooling/plugin-config/build.gradle.kts

@@ -15,14 +15,13 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 plugins {
   //noinspection JavaPluginLanguageLevel
   id("java-library")
   id("com.vanniktech.maven.publish.base")
 }
 
-groupConfig {
-  groupIdSuffix.set("tooling")
-}
+
 
 description = "Configuration options for the Tooling API and Gradle Plugin."

tooling/plugin/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.AGP_VERSION_MINIMUM
 import com.itsaky.androidide.build.config.BuildConfig
 import com.itsaky.androidide.build.config.ProjectConfig
@@ -25,9 +26,7 @@ plugins {
   id("com.vanniktech.maven.publish.base")
 }
 
-groupConfig {
-  groupIdSuffix.set("tooling")
-}
+
 
 description = "Gradle Plugin for projects that are built with AndroidIDE"
 

tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt

@@ -51,7 +51,7 @@ class AndroidIDEInitScriptPlugin : Plugin<Gradle> {
     target.rootProject { rootProject ->
       rootProject.buildscript.apply {
         dependencies.apply {
-          val gradlePluginDep = rootProject.ideDependency("gradle-plugin")
+          val gradlePluginDep = rootProject.ideDependency(LIB_GROUP_TOOLING, "plugin")
           if (gradlePluginDep is ExternalModuleDependency) {
             // SNAPSHOT versions of gradle-plugin do not change
             gradlePluginDep.isChanging = false
@@ -108,7 +108,7 @@ class AndroidIDEInitScriptPlugin : Plugin<Gradle> {
   private fun getTestEnvProps(startParameter: StartParameter): Pair<Boolean, String> {
     return startParameter.run {
       val isTestEnv = projectProperties.containsKey(_PROPERTY_IS_TEST_ENV)
-          && projectProperties[_PROPERTY_IS_TEST_ENV].toString().toBoolean()
+        && projectProperties[_PROPERTY_IS_TEST_ENV].toString().toBoolean()
       val mavenLocalRepos = projectProperties.getOrDefault(_PROPERTY_MAVEN_LOCAL_REPOSITORY, "")
 
       isTestEnv to mavenLocalRepos

tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt

@@ -81,7 +81,10 @@ class LogSenderPlugin : Plugin<Project> {
             variant.withRuntimeConfiguration {
 
               val logsenderDependency = project.dependencies.ideDependency(
-                LOGSENDER_DEPENDENCY_ARTIFACT, project.isTestEnv)
+                LIB_GROUP_LOGGING,
+                LOGSENDER_DEPENDENCY_ARTIFACT,
+                project.isTestEnv
+              )
 
               if (logsenderDependency is ExternalModuleDependency) {
                 // a new snapshot is published for each build

tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt

@@ -30,6 +30,9 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 const val APP_PLUGIN = "com.android.application"
 const val LIBRARY_PLUGIN = "com.android.library"
 
+const val LIB_GROUP_LOGGING = "logging"
+const val LIB_GROUP_TOOLING = "tooling"
+
 internal val Project.isTestEnv: Boolean
   get() = hasProperty(_PROPERTY_IS_TEST_ENV) && property(
     _PROPERTY_IS_TEST_ENV).toString().toBoolean()
@@ -42,10 +45,10 @@ internal fun depVersion(testEnv: Boolean): String {
   }
 }
 
-fun Project.ideDependency(artifact: String): Dependency {
-  return dependencies.ideDependency(artifact, isTestEnv)
+fun Project.ideDependency(group: String, artifact: String): Dependency {
+  return dependencies.ideDependency(group, artifact, isTestEnv)
 }
 
-fun DependencyHandler.ideDependency(artifact: String, testEnv: Boolean): Dependency {
-  return create("${BuildInfo.MVN_GROUP_ID}:${artifact}:${depVersion(testEnv)}")
+fun DependencyHandler.ideDependency(group: String, artifact: String, testEnv: Boolean): Dependency {
+  return create("${BuildInfo.MVN_GROUP_ID}.${group}:${artifact}:${depVersion(testEnv)}")
 }

tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt

@@ -69,8 +69,10 @@ internal fun buildProject(
       *args.toTypedArray()
     )
 
-  writeInitScript(initScript.toFile(),
-    PluginUnderTestMetadataReading.readImplementationClasspath())
+  writeInitScript(
+    initScript.toFile(),
+    PluginUnderTestMetadataReading.readImplementationClasspath()
+  )
 
   return runner.build()
 }
@@ -81,12 +83,12 @@ internal fun writeInitScript(file: File, deps: List<File>) {
   val root = FileProvider.projectRoot().pathString
   val depsString = deps.filter { it.absolutePath.startsWith(root) }
     .joinToString(separator = System.lineSeparator()) {
-      val isDir = it.isDirectory
-      "classpath ${if (isDir) "files" else "files"}(\"${it}\")"
+      "classpath files(\"${it}\")"
     }
 
   file.bufferedWriter().use {
-    it.write("""
+    it.write(
+      """
       initscript {
         dependencies {
           // make sure the init script plugin is in classpath
@@ -95,7 +97,8 @@ internal fun writeInitScript(file: File, deps: List<File>) {
       }
       
       apply plugin: com.itsaky.androidide.gradle.AndroidIDEInitScriptPlugin
-    """.trimIndent())
+    """.trimIndent()
+    )
   }
 }
 
@@ -125,7 +128,8 @@ internal fun openProject(
       plugins.joinToString(separator = "\n") { "apply plugin: \"$it\"" }
     }
 
-    projectRoot.resolve("app/build.gradle" + if (useApplyPluginGroovySyntax) "" else ".kts").toFile()
+    projectRoot.resolve("app/build.gradle" + if (useApplyPluginGroovySyntax) "" else ".kts")
+      .toFile()
       .replaceAllPlaceholders(mapOf("PLUGINS" to pluginsText))
   }
 

utilities/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
@@ -34,9 +35,7 @@ plugins {
   id("com.vanniktech.maven.publish.base")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 description = "Information about the AndroidIDE build"
 

utilities/flashbar/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("kotlin-android")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.flashbar"

utilities/framework-stubs/build.gradle.kts

@@ -15,14 +15,13 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
 }
 
-groupConfig {
-    groupIdSuffix.set("utils")
-}
+
 
 dependencies {
     compileOnlyApi(files ("libs/android.jar"))

utilities/lookup/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
@@ -22,9 +23,7 @@ plugins {
     id("kotlin-kapt")
 }
 
-groupConfig {
-    groupIdSuffix.set("utils")
-}
+
 
 dependencies {
     kapt(libs.google.auto.service)

utilities/preferences/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
   id("kotlin-parcelize")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.preferences"

utilities/shared/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("utils")
-}
+
 
 dependencies {
     implementation(libs.androidx.annotation)

utilities/templates-api/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -22,9 +23,7 @@ plugins {
   id("org.jetbrains.kotlin.android")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.templates"

utilities/templates-impl/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
   id("kotlin-kapt")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.templates.impl"

utilities/treeview/build.gradle.kts

@@ -15,11 +15,10 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 plugins { id("com.android.library") }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android { namespace = "com.unnamed.b.atv" }
 

utilities/uidesigner/build.gradle.kts

@@ -1,3 +1,21 @@
+/*
+ *  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 <https://www.gnu.org/licenses/>.
+ */
+
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -6,9 +24,7 @@ plugins {
   id("kotlin-parcelize")
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android {
   namespace = "${BuildConfig.packageName}.uidesigner"

utilities/xml-inflater/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -24,9 +25,7 @@ plugins {
   id("com.google.devtools.ksp") version libs.versions.ksp
 }
 
-groupConfig {
-  groupIdSuffix.set("utils")
-}
+
 
 android { namespace = "${BuildConfig.packageName}.inflater" }
 

xml/aaptcompiler/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.google.protobuf.gradle.id
 import com.itsaky.androidide.build.config.BuildConfig
 
@@ -24,9 +25,7 @@ plugins {
     id("com.google.protobuf")
 }
 
-groupConfig {
-    groupIdSuffix.set("xml")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.aaptcompiler"

xml/dom/build.gradle.kts

@@ -15,15 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 @Suppress("JavaPluginLanguageLevel")
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
 }
 
-groupConfig {
-    groupIdSuffix.set("xml")
-}
+
 
 dependencies {
     implementation(projects.utilities.shared)

xml/lsp/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
     id("kotlin-kapt")
 }
 
-groupConfig {
-    groupIdSuffix.set("xml")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.lsp.xml"

xml/utils/build.gradle.kts

@@ -15,6 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+
 import com.itsaky.androidide.build.config.BuildConfig
 
 plugins {
@@ -23,9 +24,7 @@ plugins {
     id("kotlin-kapt")
 }
 
-groupConfig {
-    groupIdSuffix.set("xml")
-}
+
 
 android {
     namespace = "${BuildConfig.packageName}.xml"