Skip to content

Commit dab784a

Browse files
committed
fix: update group IDs for sub-modules; fixes gradle plugin test failures
1 parent 1ed5f77 commit dab784a

File tree

66 files changed

+257
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+257
-281
lines changed

annotation/annotations/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ import com.itsaky.androidide.build.config.BuildConfig
1717
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20+
2021
@Suppress("JavaPluginLanguageLevel")
2122
plugins {
2223
id("java-library")
2324
id("org.jetbrains.kotlin.jvm")
2425
}
2526

26-
groupConfig {
27-
groupIdSuffix.set("annotations")
28-
}
27+
2928

3029
dependencies {
3130
implementation(libs.androidx.annotation)

annotation/processors-ksp/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2021

@@ -23,9 +24,7 @@ plugins {
2324
kotlin("kapt")
2425
}
2526

26-
groupConfig {
27-
groupIdSuffix.set("annotations")
28-
}
27+
2928

3029
dependencies {
3130
kapt(libs.google.auto.service)

annotation/processors/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1920
import com.itsaky.androidide.build.config.BuildConfig
2021

2122
plugins {
2223
kotlin("jvm")
2324
}
2425

25-
groupConfig {
26-
groupIdSuffix.set("annotations")
27-
}
26+
2827

2928
dependencies {
3029
implementation(kotlin("stdlib"))

build.gradle.kts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.itsaky.androidide.build.config.BuildConfig
2121
import com.itsaky.androidide.build.config.FDroidConfig
2222
import com.itsaky.androidide.build.config.publishingVersion
2323
import com.itsaky.androidide.plugins.AndroidIDEPlugin
24-
import com.itsaky.androidide.plugins.GroupConfigPlugin
2524
import com.itsaky.androidide.plugins.conf.configureAndroidModule
2625
import com.itsaky.androidide.plugins.conf.configureJavaModule
2726
import com.itsaky.androidide.plugins.conf.configureMavenPublish
@@ -47,11 +46,21 @@ buildscript {
4746
}
4847
}
4948

49+
// Root project has 'com.itsaky.androidide' as the group ID
50+
project.group = BuildConfig.packageName
51+
5052
subprojects {
53+
if (project != rootProject) {
54+
var group = project.parent!!.group
55+
if (project.parent != rootProject) {
56+
group = "${group}.${project.parent!!.name}"
57+
}
58+
project.group = group
59+
}
60+
5161
// Always load the F-Droid config
5262
FDroidConfig.load(project)
5363

54-
apply { plugin(GroupConfigPlugin::class.java) }
5564
afterEvaluate {
5665
apply { plugin(AndroidIDEPlugin::class.java) }
5766
}

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.itsaky.androidide.plugins.conf
1919

2020
import com.itsaky.androidide.build.config.ProjectConfig
21+
import com.itsaky.androidide.build.config.publishingVersion
2122
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2223
import com.vanniktech.maven.publish.GradlePlugin
2324
import com.vanniktech.maven.publish.JavaLibrary
@@ -32,7 +33,6 @@ import org.gradle.api.tasks.testing.Test
3233
import org.gradle.kotlin.dsl.configure
3334
import org.gradle.kotlin.dsl.create
3435
import org.gradle.kotlin.dsl.withType
35-
import com.itsaky.androidide.build.config.publishingVersion
3636
import java.io.File
3737

3838
private val projectsRequiringMavenLocalForTests = arrayOf(":tooling:plugin")
@@ -55,7 +55,8 @@ fun Project.configureMavenPublish() {
5555
tasks.withType<Test> {
5656
for ((project, _) in mavenLocalRepos) {
5757
dependsOn(
58-
project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository"))
58+
project(project).tasks.getByName("publishAllPublicationsToBuildMavenLocalRepository")
59+
)
5960
}
6061
}
6162
}

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

core/actions/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins{
@@ -23,9 +24,7 @@ plugins{
2324
id("kotlin-kapt")
2425
}
2526

26-
groupConfig {
27-
groupIdSuffix.set("core")
28-
}
27+
2928

3029
android {
3130
namespace = "${BuildConfig.packageName}.actions"

core/app/build.gradle.kts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,27 @@
1+
/*
2+
* This file is part of AndroidIDE.
3+
*
4+
* AndroidIDE is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* AndroidIDE is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
16+
*/
17+
118
@file:Suppress("UnstableApiUsage")
219

320
import com.itsaky.androidide.build.config.BuildConfig
421
import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements
522
import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin
623

24+
725
plugins {
826
id("com.itsaky.androidide.core-app")
927
id("com.android.application")
@@ -26,9 +44,7 @@ buildscript {
2644
}
2745
}
2846

29-
groupConfig {
30-
groupIdSuffix.set("core")
31-
}
47+
3248

3349
android {
3450
namespace = BuildConfig.packageName

core/common/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins {
2122
id("com.android.library")
2223
id("kotlin-android")
2324
}
2425

25-
groupConfig {
26-
groupIdSuffix.set("core")
27-
}
26+
2827

2928
android {
3029
namespace = "${BuildConfig.packageName}.common"

core/database/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins {
@@ -24,9 +25,7 @@ plugins {
2425
id("realm-android")
2526
}
2627

27-
groupConfig {
28-
groupIdSuffix.set("core")
29-
}
28+
3029

3130
android {
3231
namespace = "${BuildConfig.packageName}.database"

core/indexing-api/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins {
@@ -24,9 +25,7 @@ plugins {
2425
id("realm-android")
2526
}
2627

27-
groupConfig {
28-
groupIdSuffix.set("core")
29-
}
28+
3029

3130
android {
3231
namespace = "${BuildConfig.packageName}.indexing.api"

core/indexing-core/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins {
@@ -24,9 +25,7 @@ plugins {
2425
id("realm-android")
2526
}
2627

27-
groupConfig {
28-
groupIdSuffix.set("core")
29-
}
28+
3029

3130
android {
3231
namespace = "${BuildConfig.packageName}.indexing.core"

core/lsp-api/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18+
1819
import com.itsaky.androidide.build.config.BuildConfig
1920

2021
plugins {
@@ -23,9 +24,7 @@ plugins {
2324
id("kotlin-kapt")
2425
}
2526

26-
groupConfig {
27-
groupIdSuffix.set("core")
28-
}
27+
2928

3029
android {
3130
namespace = "${BuildConfig.packageName}.lsp.api"

core/lsp-models/build.gradle.kts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
1+
/*
2+
* This file is part of AndroidIDE.
3+
*
4+
* AndroidIDE is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* AndroidIDE is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
16+
*/
17+
118
import com.itsaky.androidide.build.config.BuildConfig
219

20+
321
plugins {
422
id("com.android.library")
523
id("kotlin-android")
624
}
725

8-
groupConfig {
9-
groupIdSuffix.set("core")
10-
}
26+
1127

1228
android {
1329
namespace = "${BuildConfig.packageName}.lsp.models"

0 commit comments

Comments
 (0)