Skip to content

Commit e5144a9

Browse files
committed
Switch to manually defining artifact names
There seemd to be an inconsistenty in pulling group/artifact id's with the way they were done previously. Instead we are simply setting the gradle project names to match the artifact names and set the group to the rootProject group. Fixes #222
1 parent 606f1a3 commit e5144a9

File tree

13 files changed

+24
-23
lines changed

13 files changed

+24
-23
lines changed

ast/kapt/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
dependencies {
8-
implementation(project(":ast:core"))
8+
implementation(project(":ast:ast-core"))
99
implementation(libs.kotlinx.metadata.jvm)
1010
compileOnly(libs.jdk.compiler)
1111
}

ast/ksp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
dependencies {
10-
api(project(":ast:core"))
10+
api(project(":ast:ast-core"))
1111
api(libs.ksp)
1212
implementation(libs.kotlinpoet.ksp)
1313
}

build-logic/src/main/kotlin/kotlin-inject.publish.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
}
77

88
version = rootProject.version
9+
group = rootProject.group
910

1011
fun MavenPublication.mavenCentralPom() {
1112
pom {
@@ -41,7 +42,6 @@ publishing {
4142
}
4243
publications.all {
4344
if (this is MavenPublication) {
44-
groupId = rootProject.group.toString()
4545
artifact(javadocJar)
4646
mavenCentralPom()
4747
}
@@ -64,11 +64,6 @@ publishing {
6464
create<MavenPublication>("lib") {
6565
from(components["java"])
6666
mavenCentralPom()
67-
groupId = rootProject.group.toString()
68-
// We want the artifactId to represent the full project path
69-
artifactId = path
70-
.trimStart(':')
71-
.replace(":", "-")
7267
}
7368
}
7469
}

integration-tests/kapt-companion/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ plugins {
88
}
99

1010
dependencies {
11-
kapt(project(":kotlin-inject-compiler:kapt"))
11+
kapt(project(":kotlin-inject-compiler:kotlin-inject-compiler-kapt"))
1212
implementation(project(":kotlin-inject-runtime"))
1313
implementation(project(":integration-tests:module"))
1414

15-
kaptTest(project(":kotlin-inject-compiler:kapt"))
15+
kaptTest(project(":kotlin-inject-compiler:kotlin-inject-compiler-kapt"))
1616
testImplementation(libs.kotlin.test)
1717
testImplementation(libs.javax.inject)
1818
testImplementation(libs.assertk)

integration-tests/kapt/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ plugins {
88
}
99

1010
dependencies {
11-
kapt(project(":kotlin-inject-compiler:kapt"))
11+
kapt(project(":kotlin-inject-compiler:kotlin-inject-compiler-kapt"))
1212
implementation(project(":kotlin-inject-runtime"))
1313
implementation(project(":integration-tests:module"))
1414

15-
kaptTest(project(":kotlin-inject-compiler:kapt"))
15+
kaptTest(project(":kotlin-inject-compiler:kotlin-inject-compiler-kapt"))
1616
testImplementation(libs.kotlin.test)
1717
testImplementation(libs.kotlin.reflect)
1818
testImplementation(libs.kotlinx.coroutines)

integration-tests/ksp-companion/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
dependencies {
11-
ksp(project(":kotlin-inject-compiler:ksp"))
11+
ksp(project(":kotlin-inject-compiler:kotlin-inject-compiler-ksp"))
1212
}
1313

1414
kotlin {

integration-tests/ksp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
ksp(project(":kotlin-inject-compiler:ksp"))
9+
ksp(project(":kotlin-inject-compiler:kotlin-inject-compiler-ksp"))
1010
}
1111

1212
kotlin {

integration-tests/module/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
add("kspMetadata", project(":kotlin-inject-compiler:ksp"))
9+
add("kspMetadata", project(":kotlin-inject-compiler:kotlin-inject-compiler-ksp"))
1010
}
1111

1212
kotlin {

kotlin-inject-compiler/core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
dependencies {
88
implementation(project(":kotlin-inject-runtime"))
9-
api(project(":ast:core"))
9+
api(project(":ast:ast-core"))
1010

1111
testImplementation(libs.kotlin.test)
1212
testImplementation(libs.assertk)

kotlin-inject-compiler/kapt/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ plugins {
66

77
dependencies {
88
implementation(project(":kotlin-inject-runtime"))
9-
implementation(project(":kotlin-inject-compiler:core"))
10-
implementation(project(":ast:kapt"))
9+
implementation(project(":kotlin-inject-compiler:kotlin-inject-compiler-core"))
10+
implementation(project(":ast:ast-kapt"))
1111
implementation(libs.kotlinx.metadata.jvm)
1212
compileOnly(libs.jdk.compiler)
1313
}

0 commit comments

Comments
 (0)