From e7ac00cfded231e28b5d7f7b7aeefecd75c47dd4 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Mon, 1 Jul 2024 15:06:35 +0530 Subject: [PATCH] fix: update group IDs for sub-modules; fixes gradle plugin test failures --- annotation/annotations/build.gradle.kts | 5 +- annotation/processors-ksp/build.gradle.kts | 5 +- annotation/processors/build.gradle.kts | 5 +- build.gradle.kts | 13 ++++- .../androidide/plugins/GroupConfigPlugin.kt | 42 ----------------- .../plugins/conf/MavenPublishConf.kt | 5 +- .../exts/GroupConfigPluginExtension.kt | 47 ------------------- core/actions/build.gradle.kts | 5 +- core/app/build.gradle.kts | 22 +++++++-- core/common/build.gradle.kts | 5 +- core/database/build.gradle.kts | 5 +- core/indexing-api/build.gradle.kts | 5 +- core/indexing-core/build.gradle.kts | 5 +- core/lsp-api/build.gradle.kts | 5 +- core/lsp-models/build.gradle.kts | 22 +++++++-- core/projects/build.gradle.kts | 22 +++++++-- core/resources/build.gradle.kts | 5 +- editor/api/build.gradle.kts | 5 +- editor/impl/build.gradle.kts | 22 +++++++-- editor/lexers/build.gradle.kts | 5 +- editor/treesitter/build.gradle.kts | 5 +- event/eventbus-android/build.gradle.kts | 5 +- event/eventbus-events/build.gradle.kts | 5 +- event/eventbus/build.gradle.kts | 5 +- java/javac-services/build.gradle.kts | 22 +++++++-- java/lsp/build.gradle.kts | 5 +- logging/idestats/build.gradle.kts | 5 +- logging/logger/build.gradle.kts | 5 +- logging/logsender-sample/build.gradle.kts | 5 +- logging/logsender/build.gradle.kts | 5 +- termux/application/build.gradle.kts | 6 +-- termux/emulator/build.gradle.kts | 5 +- termux/shared/build.gradle.kts | 5 +- termux/view/build.gradle.kts | 5 +- testing/androidTest/build.gradle.kts | 5 +- testing/benchmarks/build.gradle.kts | 5 +- testing/commonTest/build.gradle.kts | 5 +- testing/gradleToolingTest/build.gradle.kts | 5 +- testing/lspTest/build.gradle.kts | 5 +- testing/unitTest/build.gradle.kts | 5 +- tooling/api/build.gradle.kts | 5 +- tooling/builder-model-impl/build.gradle.kts | 5 +- tooling/events/build.gradle.kts | 5 +- tooling/impl/build.gradle.kts | 5 +- tooling/model/build.gradle.kts | 5 +- tooling/plugin-config/build.gradle.kts | 5 +- tooling/plugin/build.gradle.kts | 5 +- .../gradle/AndroidIDEInitScriptPlugin.kt | 4 +- .../androidide/gradle/LogSenderPlugin.kt | 5 +- .../com/itsaky/androidide/gradle/common.kt | 11 +++-- .../com/itsaky/androidide/gradle/utils.kt | 18 ++++--- utilities/build-info/build.gradle.kts | 5 +- utilities/flashbar/build.gradle.kts | 5 +- utilities/framework-stubs/build.gradle.kts | 5 +- utilities/lookup/build.gradle.kts | 5 +- utilities/preferences/build.gradle.kts | 5 +- utilities/shared/build.gradle.kts | 5 +- utilities/templates-api/build.gradle.kts | 5 +- utilities/templates-impl/build.gradle.kts | 5 +- utilities/treeview/build.gradle.kts | 5 +- utilities/uidesigner/build.gradle.kts | 22 +++++++-- utilities/xml-inflater/build.gradle.kts | 5 +- xml/aaptcompiler/build.gradle.kts | 5 +- xml/dom/build.gradle.kts | 5 +- xml/lsp/build.gradle.kts | 5 +- xml/utils/build.gradle.kts | 5 +- 66 files changed, 257 insertions(+), 281 deletions(-) delete mode 100644 composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/GroupConfigPlugin.kt delete mode 100644 composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/exts/GroupConfigPluginExtension.kt diff --git a/annotation/annotations/build.gradle.kts b/annotation/annotations/build.gradle.kts index 11f769077..487accf0d 100644 --- a/annotation/annotations/build.gradle.kts +++ b/annotation/annotations/build.gradle.kts @@ -17,15 +17,14 @@ import com.itsaky.androidide.build.config.BuildConfig * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("annotations") -} + dependencies { implementation(libs.androidx.annotation) diff --git a/annotation/processors-ksp/build.gradle.kts b/annotation/processors-ksp/build.gradle.kts index 342e9f382..a0b3d3288 100644 --- a/annotation/processors-ksp/build.gradle.kts +++ b/annotation/processors-ksp/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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) diff --git a/annotation/processors/build.gradle.kts b/annotation/processors/build.gradle.kts index 6280bfac6..89c5d9902 100644 --- a/annotation/processors/build.gradle.kts +++ b/annotation/processors/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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")) diff --git a/build.gradle.kts b/build.gradle.kts index 6303342a4..e8d4749f4 100755 --- a/build.gradle.kts +++ b/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) } } 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 deleted file mode 100644 index 2fed0fb94..000000000 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/GroupConfigPlugin.kt +++ /dev/null @@ -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 . - */ - -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/conf/MavenPublishConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt index caf533adf..18c0ae605 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 @@ -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 { for ((project, _) in mavenLocalRepos) { dependsOn( - project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository")) + project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository") + ) } } } 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 deleted file mode 100644 index bd317c6ab..000000000 --- a/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/exts/GroupConfigPluginExtension.kt +++ /dev/null @@ -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 . - */ - -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/core/actions/build.gradle.kts b/core/actions/build.gradle.kts index 221abdc13..70f062997 100644 --- a/core/actions/build.gradle.kts +++ b/core/actions/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/app/build.gradle.kts b/core/app/build.gradle.kts index 84d5f83c8..9f3fc46b5 100755 --- a/core/app/build.gradle.kts +++ b/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 . + */ + @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 diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 442e2a364..08d550276 100755 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index a3f7f010d..969171f1f 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/indexing-api/build.gradle.kts b/core/indexing-api/build.gradle.kts index 1c0dd6055..c9bad0810 100644 --- a/core/indexing-api/build.gradle.kts +++ b/core/indexing-api/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/indexing-core/build.gradle.kts b/core/indexing-core/build.gradle.kts index ef00bab3e..d063b16b5 100644 --- a/core/indexing-core/build.gradle.kts +++ b/core/indexing-core/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/lsp-api/build.gradle.kts b/core/lsp-api/build.gradle.kts index 33222ce16..3c7bd8aa8 100644 --- a/core/lsp-api/build.gradle.kts +++ b/core/lsp-api/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/core/lsp-models/build.gradle.kts b/core/lsp-models/build.gradle.kts index b65ab9aae..481eda8fd 100644 --- a/core/lsp-models/build.gradle.kts +++ b/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 . + */ + 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" diff --git a/core/projects/build.gradle.kts b/core/projects/build.gradle.kts index 293ec9291..53950da7c 100644 --- a/core/projects/build.gradle.kts +++ b/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 . + */ + 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" diff --git a/core/resources/build.gradle.kts b/core/resources/build.gradle.kts index 12db8bd4a..6bdb65cc7 100644 --- a/core/resources/build.gradle.kts +++ b/core/resources/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + import com.itsaky.androidide.build.config.BuildConfig plugins { id("com.android.library") } -groupConfig { - groupIdSuffix.set("core") -} + android { namespace = "${BuildConfig.packageName}.resources" diff --git a/editor/api/build.gradle.kts b/editor/api/build.gradle.kts index 36d7c82f2..4604d9ad2 100644 --- a/editor/api/build.gradle.kts +++ b/editor/api/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/editor/impl/build.gradle.kts b/editor/impl/build.gradle.kts index 30ec47e91..11e16cac2 100644 --- a/editor/impl/build.gradle.kts +++ b/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 . + */ + 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" diff --git a/editor/lexers/build.gradle.kts b/editor/lexers/build.gradle.kts index d6037a14a..7e2a7e40a 100755 --- a/editor/lexers/build.gradle.kts +++ b/editor/lexers/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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 diff --git a/editor/treesitter/build.gradle.kts b/editor/treesitter/build.gradle.kts index 30238d47a..7b1bad01f 100644 --- a/editor/treesitter/build.gradle.kts +++ b/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" diff --git a/event/eventbus-android/build.gradle.kts b/event/eventbus-android/build.gradle.kts index ab284652e..5ecdfe8f6 100644 --- a/event/eventbus-android/build.gradle.kts +++ b/event/eventbus-android/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/event/eventbus-events/build.gradle.kts b/event/eventbus-events/build.gradle.kts index 25253782b..bbe54159e 100644 --- a/event/eventbus-events/build.gradle.kts +++ b/event/eventbus-events/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/event/eventbus/build.gradle.kts b/event/eventbus/build.gradle.kts index 19407efde..1e2ff9d65 100644 --- a/event/eventbus/build.gradle.kts +++ b/event/eventbus/build.gradle.kts @@ -15,15 +15,14 @@ * 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) diff --git a/java/javac-services/build.gradle.kts b/java/javac-services/build.gradle.kts index f65050d26..80d9de740 100644 --- a/java/javac-services/build.gradle.kts +++ b/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 . + */ + 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" diff --git a/java/lsp/build.gradle.kts b/java/lsp/build.gradle.kts index f10078ad9..e17747a5b 100644 --- a/java/lsp/build.gradle.kts +++ b/java/lsp/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/logging/idestats/build.gradle.kts b/logging/idestats/build.gradle.kts index 32155e4bb..38d61eb0a 100644 --- a/logging/idestats/build.gradle.kts +++ b/logging/idestats/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/logging/logger/build.gradle.kts b/logging/logger/build.gradle.kts index 4f531dfb5..2ce0c79c9 100644 --- a/logging/logger/build.gradle.kts +++ b/logging/logger/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/logging/logsender-sample/build.gradle.kts b/logging/logsender-sample/build.gradle.kts index b8e7fb302..4bfea18e0 100644 --- a/logging/logsender-sample/build.gradle.kts +++ b/logging/logsender-sample/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + import com.itsaky.androidide.build.config.BuildConfig plugins { id("com.android.application") } -groupConfig { - groupIdSuffix.set("logging") -} + android { namespace = "${BuildConfig.packageName}.logsender.sample" diff --git a/logging/logsender/build.gradle.kts b/logging/logsender/build.gradle.kts index 730c82faf..81030f250 100644 --- a/logging/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 @@ -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" diff --git a/termux/application/build.gradle.kts b/termux/application/build.gradle.kts index dde74cd0b..3783a3043 100644 --- a/termux/application/build.gradle.kts +++ b/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" diff --git a/termux/emulator/build.gradle.kts b/termux/emulator/build.gradle.kts index d1d2fdc4c..2b168d0c9 100644 --- a/termux/emulator/build.gradle.kts +++ b/termux/emulator/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/termux/shared/build.gradle.kts b/termux/shared/build.gradle.kts index 36522f1de..9ef98bef9 100644 --- a/termux/shared/build.gradle.kts +++ b/termux/shared/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/termux/view/build.gradle.kts b/termux/view/build.gradle.kts index e52e86b0a..fc16f8631 100644 --- a/termux/view/build.gradle.kts +++ b/termux/view/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/testing/androidTest/build.gradle.kts b/testing/androidTest/build.gradle.kts index 4e1213d4d..bbada5339 100644 --- a/testing/androidTest/build.gradle.kts +++ b/testing/androidTest/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/testing/benchmarks/build.gradle.kts b/testing/benchmarks/build.gradle.kts index 1a30a2b45..723f4947b 100644 --- a/testing/benchmarks/build.gradle.kts +++ b/testing/benchmarks/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/testing/commonTest/build.gradle.kts b/testing/commonTest/build.gradle.kts index 9254318db..8a4a2fdb8 100644 --- a/testing/commonTest/build.gradle.kts +++ b/testing/commonTest/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + @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) diff --git a/testing/gradleToolingTest/build.gradle.kts b/testing/gradleToolingTest/build.gradle.kts index 9325376be..fed89e466 100644 --- a/testing/gradleToolingTest/build.gradle.kts +++ b/testing/gradleToolingTest/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("testing") -} + dependencies { api(libs.common.jkotlin) diff --git a/testing/lspTest/build.gradle.kts b/testing/lspTest/build.gradle.kts index 21319b9f5..51a683d56 100644 --- a/testing/lspTest/build.gradle.kts +++ b/testing/lspTest/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/testing/unitTest/build.gradle.kts b/testing/unitTest/build.gradle.kts index 7b75f761d..e35b2ad90 100644 --- a/testing/unitTest/build.gradle.kts +++ b/testing/unitTest/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/tooling/api/build.gradle.kts b/tooling/api/build.gradle.kts index 93503c308..775c68124 100644 --- a/tooling/api/build.gradle.kts +++ b/tooling/api/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("tooling") -} + dependencies { api(projects.logging.logger) diff --git a/tooling/builder-model-impl/build.gradle.kts b/tooling/builder-model-impl/build.gradle.kts index 592fd4838..afb8eac62 100644 --- a/tooling/builder-model-impl/build.gradle.kts +++ b/tooling/builder-model-impl/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("tooling") -} + dependencies { api(libs.tooling.builderModel) diff --git a/tooling/events/build.gradle.kts b/tooling/events/build.gradle.kts index 040d10c07..c2dca4cd9 100644 --- a/tooling/events/build.gradle.kts +++ b/tooling/events/build.gradle.kts @@ -15,15 +15,14 @@ * 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) diff --git a/tooling/impl/build.gradle.kts b/tooling/impl/build.gradle.kts index 6f9929a85..ffb33aeda 100644 --- a/tooling/impl/build.gradle.kts +++ b/tooling/impl/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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 { manifest { attributes("Main-Class" to "${BuildConfig.packageName}.tooling.impl.Main") } diff --git a/tooling/model/build.gradle.kts b/tooling/model/build.gradle.kts index ce57361a6..5f8eb6403 100644 --- a/tooling/model/build.gradle.kts +++ b/tooling/model/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id ("java-library") id ("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("tooling") -} + dependencies { diff --git a/tooling/plugin-config/build.gradle.kts b/tooling/plugin-config/build.gradle.kts index 90c772be6..f9eb30db6 100644 --- a/tooling/plugin-config/build.gradle.kts +++ b/tooling/plugin-config/build.gradle.kts @@ -15,14 +15,13 @@ * along with AndroidIDE. If not, see . */ + 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." \ No newline at end of file diff --git a/tooling/plugin/build.gradle.kts b/tooling/plugin/build.gradle.kts index 7a68ef13b..f7b8d5549 100644 --- a/tooling/plugin/build.gradle.kts +++ b/tooling/plugin/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt index 2e92fbecc..09ec80578 100644 --- a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt +++ b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/AndroidIDEInitScriptPlugin.kt @@ -51,7 +51,7 @@ class AndroidIDEInitScriptPlugin : Plugin { 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 { private fun getTestEnvProps(startParameter: StartParameter): Pair { 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 diff --git a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt index 973ccc9b7..2424abb9a 100644 --- a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt +++ b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/LogSenderPlugin.kt @@ -81,7 +81,10 @@ class LogSenderPlugin : Plugin { 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 diff --git a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt b/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt index f96ac4ea2..7fd08d1f2 100644 --- a/tooling/plugin/src/main/java/com/itsaky/androidide/gradle/common.kt +++ b/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)}") } diff --git a/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt b/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt index 65f14c077..a4cbebbfd 100644 --- a/tooling/plugin/src/test/java/com/itsaky/androidide/gradle/utils.kt +++ b/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) { 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) { } 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)) } diff --git a/utilities/build-info/build.gradle.kts b/utilities/build-info/build.gradle.kts index b83465ae8..0e1751ef1 100644 --- a/utilities/build-info/build.gradle.kts +++ b/utilities/build-info/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/utilities/flashbar/build.gradle.kts b/utilities/flashbar/build.gradle.kts index c9e9d5b19..b1e5555d8 100644 --- a/utilities/flashbar/build.gradle.kts +++ b/utilities/flashbar/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/utilities/framework-stubs/build.gradle.kts b/utilities/framework-stubs/build.gradle.kts index ad87b435e..cd603508a 100644 --- a/utilities/framework-stubs/build.gradle.kts +++ b/utilities/framework-stubs/build.gradle.kts @@ -15,14 +15,13 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") } -groupConfig { - groupIdSuffix.set("utils") -} + dependencies { compileOnlyApi(files ("libs/android.jar")) diff --git a/utilities/lookup/build.gradle.kts b/utilities/lookup/build.gradle.kts index 383ac8e26..1f05892ea 100644 --- a/utilities/lookup/build.gradle.kts +++ b/utilities/lookup/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") @@ -22,9 +23,7 @@ plugins { id("kotlin-kapt") } -groupConfig { - groupIdSuffix.set("utils") -} + dependencies { kapt(libs.google.auto.service) diff --git a/utilities/preferences/build.gradle.kts b/utilities/preferences/build.gradle.kts index 8b6e5c0d5..392eaf958 100644 --- a/utilities/preferences/build.gradle.kts +++ b/utilities/preferences/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/utilities/shared/build.gradle.kts b/utilities/shared/build.gradle.kts index 862256d68..3d6ff349f 100644 --- a/utilities/shared/build.gradle.kts +++ b/utilities/shared/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("utils") -} + dependencies { implementation(libs.androidx.annotation) diff --git a/utilities/templates-api/build.gradle.kts b/utilities/templates-api/build.gradle.kts index bab9833f0..3e0f52861 100644 --- a/utilities/templates-api/build.gradle.kts +++ b/utilities/templates-api/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/utilities/templates-impl/build.gradle.kts b/utilities/templates-impl/build.gradle.kts index feabcf39d..07e49cdbe 100644 --- a/utilities/templates-impl/build.gradle.kts +++ b/utilities/templates-impl/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/utilities/treeview/build.gradle.kts b/utilities/treeview/build.gradle.kts index ab2d621d7..8fd8a69cc 100755 --- a/utilities/treeview/build.gradle.kts +++ b/utilities/treeview/build.gradle.kts @@ -15,11 +15,10 @@ * along with AndroidIDE. If not, see . */ + plugins { id("com.android.library") } -groupConfig { - groupIdSuffix.set("utils") -} + android { namespace = "com.unnamed.b.atv" } diff --git a/utilities/uidesigner/build.gradle.kts b/utilities/uidesigner/build.gradle.kts index d29e9d39d..2a20ceb92 100644 --- a/utilities/uidesigner/build.gradle.kts +++ b/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 . + */ + + 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" diff --git a/utilities/xml-inflater/build.gradle.kts b/utilities/xml-inflater/build.gradle.kts index 369e79ff4..958985e6c 100644 --- a/utilities/xml-inflater/build.gradle.kts +++ b/utilities/xml-inflater/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" } diff --git a/xml/aaptcompiler/build.gradle.kts b/xml/aaptcompiler/build.gradle.kts index 2e859d6d7..ba1abc13b 100644 --- a/xml/aaptcompiler/build.gradle.kts +++ b/xml/aaptcompiler/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/xml/dom/build.gradle.kts b/xml/dom/build.gradle.kts index 671f93914..9158b6773 100644 --- a/xml/dom/build.gradle.kts +++ b/xml/dom/build.gradle.kts @@ -15,15 +15,14 @@ * along with AndroidIDE. If not, see . */ + @Suppress("JavaPluginLanguageLevel") plugins { id("java-library") id("org.jetbrains.kotlin.jvm") } -groupConfig { - groupIdSuffix.set("xml") -} + dependencies { implementation(projects.utilities.shared) diff --git a/xml/lsp/build.gradle.kts b/xml/lsp/build.gradle.kts index 073b5d774..6e9c6df62 100644 --- a/xml/lsp/build.gradle.kts +++ b/xml/lsp/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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" diff --git a/xml/utils/build.gradle.kts b/xml/utils/build.gradle.kts index 6701097d5..8803b8eaf 100644 --- a/xml/utils/build.gradle.kts +++ b/xml/utils/build.gradle.kts @@ -15,6 +15,7 @@ * along with AndroidIDE. If not, see . */ + 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"