Repository: evant/kotlin-inject
Pull request #115 (2021-04-19 13:46:54)

Move kotlin-compiler modules to a subdir


Patch:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index db8e836..b7d4296 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,9 @@
 # Contributing
  
- ## Creating the Pull Request
+## Creating the Pull Request
 
 To contribute, fork our project on GitHub, then submit a pull request to our `main` branch. Take a look at
-[architecture.md](architecture.md) to get a high-level view how the project is structured.
+[architecture.md](docs/architecture.md) to get a high-level view how the project is structured.
 
 ## Static Code Analysis
 
diff --git a/architecture.md b/docs/architecture.md
similarity index 89%
rename from architecture.md
rename to docs/architecture.md
index 2555ed3..0ecc1da 100644
--- a/architecture.md
+++ b/docs/architecture.md
@@ -15,11 +15,11 @@ we will go through each one of these steps in turn.
 ### Kotlin AST
 
 This represents the kotlin source code. In order to support kapt and ksp, there is a wrapper of the two back-ends. The
-interface is defined in `koltin-inject-compiler-core/Ast` and the implementations are in
-`kotlin-inject-compiler-kapt/ModelAst` and `kotlin-inject-compiler-ksp/KSAst`. Note: the wrappers aren't a full
+interface is defined in `koltin-inject-compiler/core/Ast` and the implementations are in
+`kotlin-inject-compiler/kapt/ModelAst` and `kotlin-inject-compiler/ksp/KSAst`. Note: the wrappers aren't a full
 implementation of the AST but provide only what's necessary for this project. There is additional glue-code in
-`kotlin-inject-compiler-kapt` and `kotlin-inject-compiler-ksp` to run the respective processors. Everything else is in
-`kotlin-inject-compiler-core` and the remainder of these steps will focus on that module exclusively.
+`kotlin-inject-compiler/kapt` and `kotlin-inject-compiler/ksp` to run the respective processors. Everything else is in
+`kotlin-inject-compiler/core` and the remainder of these steps will focus on that module exclusively.
 
 ### Collect Types
 
diff --git a/kotlin-inject-compiler-kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors b/kotlin-inject-compiler-kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors
deleted file mode 100644
index 2c91629..0000000
--- a/kotlin-inject-compiler-kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors
+++ /dev/null
@@ -1,1 +0,0 @@
-me.tatarka.inject.compiler.kapt.InjectCompiler,isolating
diff --git a/kotlin-inject-compiler-core/.gitignore b/kotlin-inject-compiler/core/.gitignore
similarity index 100%
rename from kotlin-inject-compiler-core/.gitignore
rename to kotlin-inject-compiler/core/.gitignore
diff --git a/kotlin-inject-compiler-core/build.gradle b/kotlin-inject-compiler/core/build.gradle
similarity index 79%
rename from kotlin-inject-compiler-core/build.gradle
rename to kotlin-inject-compiler/core/build.gradle
index 5dc3de3..febf59f 100644
--- a/kotlin-inject-compiler-core/build.gradle
+++ b/kotlin-inject-compiler/core/build.gradle
@@ -15,4 +15,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-apply from: '../publish.gradle'
+ext.artifactId = 'kotlin-inject-compiler-core'
+
+apply from: "$rootProject.projectDir/publish.gradle"
\ No newline at end of file
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Ast.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Ast.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Ast.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Ast.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/AstVisibility.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/AstVisibility.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/AstVisibility.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/AstVisibility.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Context.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Context.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Context.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Context.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/CreateGenerator.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/CreateGenerator.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/CreateGenerator.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/CreateGenerator.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/CycleDetector.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/CycleDetector.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/CycleDetector.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/CycleDetector.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/FailedToGenerateException.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/FailedToGenerateException.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/FailedToGenerateException.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/FailedToGenerateException.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/InjectGenerator.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/InjectGenerator.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/InjectGenerator.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/InjectGenerator.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Options.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Options.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Options.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Options.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Profiler.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Profiler.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Profiler.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Profiler.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeCollector.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeCollector.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeCollector.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeCollector.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeKey.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeKey.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeKey.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeKey.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResult.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResult.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResult.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResult.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultGenerator.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultGenerator.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultGenerator.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultGenerator.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultOptimizer.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/TypeResultResolver.kt
diff --git a/kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Util.kt b/kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Util.kt
similarity index 100%
rename from kotlin-inject-compiler-core/src/main/kotlin/me/tatarka/inject/compiler/Util.kt
rename to kotlin-inject-compiler/core/src/main/kotlin/me/tatarka/inject/compiler/Util.kt
diff --git a/kotlin-inject-compiler-kapt/.gitignore b/kotlin-inject-compiler/kapt/.gitignore
similarity index 100%
rename from kotlin-inject-compiler-kapt/.gitignore
rename to kotlin-inject-compiler/kapt/.gitignore
diff --git a/kotlin-inject-compiler-kapt/build.gradle b/kotlin-inject-compiler/kapt/build.gradle
similarity index 74%
rename from kotlin-inject-compiler-kapt/build.gradle
rename to kotlin-inject-compiler/kapt/build.gradle
index e4df8cb..836e409 100644
--- a/kotlin-inject-compiler-kapt/build.gradle
+++ b/kotlin-inject-compiler/kapt/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation project(':kotlin-inject-runtime')
-    implementation project(':kotlin-inject-compiler-core')
+    implementation project(':kotlin-inject-compiler:core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation 'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0'
     compileOnly 'io.earcam.wrapped:jdk.compiler:1.8.132'
@@ -17,4 +17,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-apply from: '../publish.gradle'
+ext.artifactId = 'kotlin-inject-compiler-kapt'
+
+apply from: "$rootProject.projectDir/publish.gradle"
\ No newline at end of file
diff --git a/kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/BaseInjectCompiler.kt b/kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/BaseInjectCompiler.kt
similarity index 100%
rename from kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/BaseInjectCompiler.kt
rename to kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/BaseInjectCompiler.kt
diff --git a/kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/InjectCompiler.kt b/kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/InjectCompiler.kt
similarity index 100%
rename from kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/InjectCompiler.kt
rename to kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/InjectCompiler.kt
diff --git a/kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/ModelAst.kt b/kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/ModelAst.kt
similarity index 100%
rename from kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/ModelAst.kt
rename to kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/ModelAst.kt
diff --git a/kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/Util.kt b/kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/Util.kt
similarity index 100%
rename from kotlin-inject-compiler-kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/Util.kt
rename to kotlin-inject-compiler/kapt/src/main/kotlin/me/tatarka/inject/compiler/kapt/Util.kt
diff --git a/kotlin-inject-compiler/kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors b/kotlin-inject-compiler/kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors
new file mode 100644
index 0000000..41bc87d
--- /dev/null
+++ b/kotlin-inject-compiler/kapt/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1,1 @@
+me.tatarka.inject.compiler.kapt.InjectCompiler,isolating
\ No newline at end of file
diff --git a/kotlin-inject-compiler-kapt/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/kotlin-inject-compiler/kapt/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from kotlin-inject-compiler-kapt/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to kotlin-inject-compiler/kapt/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/kotlin-inject-compiler-ksp/.gitignore b/kotlin-inject-compiler/ksp/.gitignore
similarity index 100%
rename from kotlin-inject-compiler-ksp/.gitignore
rename to kotlin-inject-compiler/ksp/.gitignore
diff --git a/kotlin-inject-compiler-ksp/build.gradle b/kotlin-inject-compiler/ksp/build.gradle
similarity index 78%
rename from kotlin-inject-compiler-ksp/build.gradle
rename to kotlin-inject-compiler/ksp/build.gradle
index 174c098..0e45324 100644
--- a/kotlin-inject-compiler-ksp/build.gradle
+++ b/kotlin-inject-compiler/ksp/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation project(':kotlin-inject-runtime')
-    implementation project(':kotlin-inject-compiler-core')
+    implementation project(':kotlin-inject-compiler:core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     // for access to CompilationErrorException until ksp properly fails on errors
     implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
@@ -18,4 +18,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-apply from: '../publish.gradle'
+ext.artifactId = 'kotlin-inject-compiler-ksp'
+
+apply from: "$rootProject.projectDir/publish.gradle"
\ No newline at end of file
diff --git a/kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/InjectProcessor.kt b/kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/InjectProcessor.kt
similarity index 100%
rename from kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/InjectProcessor.kt
rename to kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/InjectProcessor.kt
diff --git a/kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/KSAst.kt b/kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/KSAst.kt
similarity index 100%
rename from kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/KSAst.kt
rename to kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/KSAst.kt
diff --git a/kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt b/kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt
similarity index 100%
rename from kotlin-inject-compiler-ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt
rename to kotlin-inject-compiler/ksp/src/main/kotlin/me/tatarka/inject/compiler/ksp/Util.kt
diff --git a/kotlin-inject-compiler-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor b/kotlin-inject-compiler/ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor
similarity index 100%
rename from kotlin-inject-compiler-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor
rename to kotlin-inject-compiler/ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessor
diff --git a/publish.gradle b/publish.gradle
index d8994de..f1a679c 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -23,9 +23,14 @@ nexusPublishing {
     connectTimeout.set(Duration.ofMinutes(5))
 }
 
+def customArtifactId = project.ext.find("artifactId")
+
 publishing {
     publications {
         lib(MavenPublication) {
+            if (customArtifactId != null) {
+                artifactId customArtifactId
+            }
             from components.java
             artifact sourcesJar
             artifact javadocJar
diff --git a/settings.gradle b/settings.gradle
index 3ba513a..0463ad1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,13 +5,15 @@ pluginManagement {
     }
 }
 
-include ':kotlin-inject-compiler-core'
-include ':kotlin-inject-compiler-kapt'
-include ':kotlin-inject-compiler-ksp'
+rootProject.name='kotlin-inject'
+
 include ':kotlin-inject-runtime'
+include ':kotlin-inject-compiler:core'
+include ':kotlin-inject-compiler:kapt'
+include ':kotlin-inject-compiler:ksp'
 include ':compiler-tests'
 include ':integration-tests:kapt'
 include ':integration-tests:ksp'
 include ':integration-tests:module'
 include ':integration-tests:kapt-companion'
-include ':integration-tests:ksp-companion'
+include ':integration-tests:ksp-companion'
\ No newline at end of file


Test patch:
diff --git a/compiler-tests/build.gradle b/compiler-tests/build.gradle
index aa0ca6c..0b4296e 100644
--- a/compiler-tests/build.gradle
+++ b/compiler-tests/build.gradle
@@ -5,9 +5,9 @@ plugins {
 dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 
-    implementation project(':kotlin-inject-compiler-core')
-    implementation project(':kotlin-inject-compiler-kapt')
-    implementation project(':kotlin-inject-compiler-ksp')
+    implementation project(':kotlin-inject-compiler:core')
+    implementation project(':kotlin-inject-compiler:kapt')
+    implementation project(':kotlin-inject-compiler:ksp')
 
     implementation 'com.github.tschuchortdev:kotlin-compile-testing-ksp:1.3.5'
     implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
@@ -28,4 +28,4 @@ targetCompatibility = 1.8
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
-}
+}
\ No newline at end of file
diff --git a/integration-tests/kapt-companion/build.gradle b/integration-tests/kapt-companion/build.gradle
index 4300b13..e92dd08 100644
--- a/integration-tests/kapt-companion/build.gradle
+++ b/integration-tests/kapt-companion/build.gradle
@@ -5,14 +5,13 @@ plugins {
 }
 
 dependencies {
-    kapt project(':kotlin-inject-compiler-kapt')
+    kapt project(':kotlin-inject-compiler:kapt')
     implementation project(':kotlin-inject-runtime')
     implementation project(':integration-tests:module')
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 
-    kaptTest project(':kotlin-inject-compiler-kapt')
-
+    kaptTest project(':kotlin-inject-compiler:kapt')
     testImplementation "org.jetbrains.kotlin:kotlin-test"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
     testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
diff --git a/integration-tests/kapt/build.gradle b/integration-tests/kapt/build.gradle
index bd8762a..ca90770 100644
--- a/integration-tests/kapt/build.gradle
+++ b/integration-tests/kapt/build.gradle
@@ -5,14 +5,13 @@ plugins {
 }
 
 dependencies {
-    kapt project(':kotlin-inject-compiler-kapt')
+    kapt project(':kotlin-inject-compiler:kapt')
     implementation project(':kotlin-inject-runtime')
     implementation project(':integration-tests:module')
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 
-    kaptTest project(':kotlin-inject-compiler-kapt')
-
+    kaptTest project(':kotlin-inject-compiler:kapt')
     testImplementation "org.jetbrains.kotlin:kotlin-test"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
     testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
diff --git a/integration-tests/ksp-companion/build.gradle b/integration-tests/ksp-companion/build.gradle
index 532ad40..7915c7d 100644
--- a/integration-tests/ksp-companion/build.gradle
+++ b/integration-tests/ksp-companion/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    kspTest project(':kotlin-inject-compiler-ksp')
+    kspTest project(':kotlin-inject-compiler:ksp')
     implementation project(':kotlin-inject-runtime')
     implementation project(':integration-tests:module')
 
@@ -33,4 +33,4 @@ targetCompatibility = 1.8
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
-}
+}
\ No newline at end of file
diff --git a/integration-tests/ksp/build.gradle b/integration-tests/ksp/build.gradle
index 6e42648..48b206b 100644
--- a/integration-tests/ksp/build.gradle
+++ b/integration-tests/ksp/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    kspTest project(':kotlin-inject-compiler-ksp')
+    kspTest project(':kotlin-inject-compiler:ksp')
     implementation project(':kotlin-inject-runtime')
     implementation project(':integration-tests:module')
 
@@ -35,4 +35,4 @@ targetCompatibility = 1.8
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions.jvmTarget = "1.8"
-}
+}
\ No newline at end of file