diff --git a/README.md b/README.md index 3e8b675d..129b0ecb 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ dependencies { // Remove this: // kapt("com.github.stephanenicolas.toothpick:toothpick-compiler:...") - ksp("fr.outadoc.toothpick-compiler-ksp:toothpick-compiler-ksp:0.0.3") + ksp("fr.outadoc.toothpick-ksp:compiler:0.0.3") } ksp { diff --git a/toothpick-compiler-ksp-core/build.gradle.kts b/compiler-core/build.gradle.kts similarity index 100% rename from toothpick-compiler-ksp-core/build.gradle.kts rename to compiler-core/build.gradle.kts diff --git a/toothpick-compiler-ksp-core/gradle.properties b/compiler-core/gradle.properties similarity index 72% rename from toothpick-compiler-ksp-core/gradle.properties rename to compiler-core/gradle.properties index cc2b524c..eb169654 100644 --- a/toothpick-compiler-ksp-core/gradle.properties +++ b/compiler-core/gradle.properties @@ -1,4 +1,4 @@ -POM_ARTIFACT_ID=toothpick-compiler-ksp-core +POM_ARTIFACT_ID=compiler-core POM_NAME=Toothpick KSP Compiler (Base) POM_DESCRIPTION=Base classes for the Toothpick KSP compiler. POM_PACKAGING=JAR diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/ToothpickOptions.kt b/compiler-core/src/main/java/toothpick/compiler/common/ToothpickOptions.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/ToothpickOptions.kt rename to compiler-core/src/main/java/toothpick/compiler/common/ToothpickOptions.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt b/compiler-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt rename to compiler-core/src/main/java/toothpick/compiler/common/ToothpickProcessor.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/ClassNameExtensions.kt b/compiler-core/src/main/java/toothpick/compiler/common/generators/ClassNameExtensions.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/ClassNameExtensions.kt rename to compiler-core/src/main/java/toothpick/compiler/common/generators/ClassNameExtensions.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/LoggerExtensions.kt b/compiler-core/src/main/java/toothpick/compiler/common/generators/LoggerExtensions.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/LoggerExtensions.kt rename to compiler-core/src/main/java/toothpick/compiler/common/generators/LoggerExtensions.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/TPCodeGenerator.kt b/compiler-core/src/main/java/toothpick/compiler/common/generators/TPCodeGenerator.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/TPCodeGenerator.kt rename to compiler-core/src/main/java/toothpick/compiler/common/generators/TPCodeGenerator.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/TypeExtensions.kt b/compiler-core/src/main/java/toothpick/compiler/common/generators/TypeExtensions.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/TypeExtensions.kt rename to compiler-core/src/main/java/toothpick/compiler/common/generators/TypeExtensions.kt diff --git a/toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt b/compiler-core/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt similarity index 100% rename from toothpick-compiler-ksp-core/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt rename to compiler-core/src/main/java/toothpick/compiler/common/generators/targets/VariableInjectionTarget.kt diff --git a/toothpick-compiler-ksp-factory/build.gradle.kts b/compiler-factory/build.gradle.kts similarity index 80% rename from toothpick-compiler-ksp-factory/build.gradle.kts rename to compiler-factory/build.gradle.kts index c6ee7364..e56ac487 100644 --- a/toothpick-compiler-ksp-factory/build.gradle.kts +++ b/compiler-factory/build.gradle.kts @@ -18,9 +18,9 @@ dependencies { implementation(libs.ksp) implementation(libs.kotlinpoet.core) implementation(libs.kotlinpoet.ksp) - implementation(projects.toothpickCompilerKspCore) + implementation(projects.compilerCore) testImplementation(libs.junit4) testImplementation(libs.compiletesting.kt) - testImplementation(projects.toothpickCompilerTest) + testImplementation(projects.compilerTest) } diff --git a/toothpick-compiler-ksp-factory/gradle.properties b/compiler-factory/gradle.properties similarity index 72% rename from toothpick-compiler-ksp-factory/gradle.properties rename to compiler-factory/gradle.properties index 956ee1f4..dd7f5e82 100644 --- a/toothpick-compiler-ksp-factory/gradle.properties +++ b/compiler-factory/gradle.properties @@ -1,4 +1,4 @@ -POM_ARTIFACT_ID=toothpick-compiler-ksp-factory +POM_ARTIFACT_ID=compiler-factory POM_NAME=Toothpick KSP Compiler (Factory) POM_DESCRIPTION=KSP-based Factory symbol processory for Toothpick. POM_PACKAGING=JAR diff --git a/toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/FactoryProcessor.kt b/compiler-factory/src/main/java/toothpick/compiler/factory/FactoryProcessor.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/FactoryProcessor.kt rename to compiler-factory/src/main/java/toothpick/compiler/factory/FactoryProcessor.kt diff --git a/toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/FactoryProcessorProvider.kt b/compiler-factory/src/main/java/toothpick/compiler/factory/FactoryProcessorProvider.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/FactoryProcessorProvider.kt rename to compiler-factory/src/main/java/toothpick/compiler/factory/FactoryProcessorProvider.kt diff --git a/toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt b/compiler-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt rename to compiler-factory/src/main/java/toothpick/compiler/factory/generators/FactoryGenerator.kt diff --git a/toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/targets/ConstructorInjectionTarget.kt b/compiler-factory/src/main/java/toothpick/compiler/factory/targets/ConstructorInjectionTarget.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/main/java/toothpick/compiler/factory/targets/ConstructorInjectionTarget.kt rename to compiler-factory/src/main/java/toothpick/compiler/factory/targets/ConstructorInjectionTarget.kt diff --git a/toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/FactoryOriginatingElementTest.kt b/compiler-factory/src/test/java/toothpick/compiler/factory/FactoryOriginatingElementTest.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/FactoryOriginatingElementTest.kt rename to compiler-factory/src/test/java/toothpick/compiler/factory/FactoryOriginatingElementTest.kt diff --git a/toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt b/compiler-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt rename to compiler-factory/src/test/java/toothpick/compiler/factory/FactoryTest.kt diff --git a/toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryForSingletonsTest.kt b/compiler-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryForSingletonsTest.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryForSingletonsTest.kt rename to compiler-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryForSingletonsTest.kt diff --git a/toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryWarningsTest.kt b/compiler-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryWarningsTest.kt similarity index 100% rename from toothpick-compiler-ksp-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryWarningsTest.kt rename to compiler-factory/src/test/java/toothpick/compiler/factory/RelaxedFactoryWarningsTest.kt diff --git a/toothpick-compiler-ksp-memberinjector/build.gradle.kts b/compiler-memberinjector/build.gradle.kts similarity index 80% rename from toothpick-compiler-ksp-memberinjector/build.gradle.kts rename to compiler-memberinjector/build.gradle.kts index c6ee7364..e56ac487 100644 --- a/toothpick-compiler-ksp-memberinjector/build.gradle.kts +++ b/compiler-memberinjector/build.gradle.kts @@ -18,9 +18,9 @@ dependencies { implementation(libs.ksp) implementation(libs.kotlinpoet.core) implementation(libs.kotlinpoet.ksp) - implementation(projects.toothpickCompilerKspCore) + implementation(projects.compilerCore) testImplementation(libs.junit4) testImplementation(libs.compiletesting.kt) - testImplementation(projects.toothpickCompilerTest) + testImplementation(projects.compilerTest) } diff --git a/toothpick-compiler-ksp-memberinjector/gradle.properties b/compiler-memberinjector/gradle.properties similarity index 72% rename from toothpick-compiler-ksp-memberinjector/gradle.properties rename to compiler-memberinjector/gradle.properties index 63d5174c..97db24be 100644 --- a/toothpick-compiler-ksp-memberinjector/gradle.properties +++ b/compiler-memberinjector/gradle.properties @@ -1,4 +1,4 @@ -POM_ARTIFACT_ID=toothpick-compiler-ksp-memberinjector +POM_ARTIFACT_ID=compiler-memberinjector POM_NAME=Toothpick KSP Compiler (MemberInjector) POM_DESCRIPTION=KSP-based MemberInjector symbol processory for Toothpick. POM_PACKAGING=JAR diff --git a/toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessor.kt b/compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessor.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessor.kt rename to compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessor.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessorProvider.kt b/compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessorProvider.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessorProvider.kt rename to compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/MemberInjectorProcessorProvider.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt b/compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt rename to compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/generators/MemberInjectorGenerator.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/targets/MethodInjectionTarget.kt b/compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/targets/MethodInjectionTarget.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/main/java/toothpick/compiler/memberinjector/targets/MethodInjectionTarget.kt rename to compiler-memberinjector/src/main/java/toothpick/compiler/memberinjector/targets/MethodInjectionTarget.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.kt b/compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.kt rename to compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/FieldMemberInjectorTest.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/MemberInjectorOriginatingElementTest.kt b/compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/MemberInjectorOriginatingElementTest.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/MemberInjectorOriginatingElementTest.kt rename to compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/MemberInjectorOriginatingElementTest.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.kt b/compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.kt rename to compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/MethodMemberInjectorTest.kt diff --git a/toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/RelaxedMemberInjectorWarningsTest.kt b/compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/RelaxedMemberInjectorWarningsTest.kt similarity index 100% rename from toothpick-compiler-ksp-memberinjector/src/test/java/toothpick/compiler/memberinjector/RelaxedMemberInjectorWarningsTest.kt rename to compiler-memberinjector/src/test/java/toothpick/compiler/memberinjector/RelaxedMemberInjectorWarningsTest.kt diff --git a/toothpick-compiler-test/build.gradle.kts b/compiler-test/build.gradle.kts similarity index 100% rename from toothpick-compiler-test/build.gradle.kts rename to compiler-test/build.gradle.kts diff --git a/toothpick-compiler-test/src/main/java/toothpick/compiler/AssertionUtils.kt b/compiler-test/src/main/java/toothpick/compiler/AssertionUtils.kt similarity index 100% rename from toothpick-compiler-test/src/main/java/toothpick/compiler/AssertionUtils.kt rename to compiler-test/src/main/java/toothpick/compiler/AssertionUtils.kt diff --git a/toothpick-compiler-test/src/main/java/toothpick/compiler/SourceUtils.kt b/compiler-test/src/main/java/toothpick/compiler/SourceUtils.kt similarity index 100% rename from toothpick-compiler-test/src/main/java/toothpick/compiler/SourceUtils.kt rename to compiler-test/src/main/java/toothpick/compiler/SourceUtils.kt diff --git a/toothpick-compiler-ksp/build.gradle.kts b/compiler/build.gradle.kts similarity index 65% rename from toothpick-compiler-ksp/build.gradle.kts rename to compiler/build.gradle.kts index bd7958ae..eca3c25e 100644 --- a/toothpick-compiler-ksp/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -13,10 +13,10 @@ tasks.withType { dependencies { implementation(libs.ksp) - implementation(projects.toothpickCompilerKspFactory) - implementation(projects.toothpickCompilerKspMemberinjector) + implementation(projects.compilerFactory) + implementation(projects.compilerMemberinjector) testImplementation(libs.junit4) testImplementation(libs.compiletesting.kt) - testImplementation(projects.toothpickCompilerTest) + testImplementation(projects.compilerTest) } diff --git a/toothpick-compiler-ksp/gradle.properties b/compiler/gradle.properties similarity index 71% rename from toothpick-compiler-ksp/gradle.properties rename to compiler/gradle.properties index bbd4e413..c9d9818c 100644 --- a/toothpick-compiler-ksp/gradle.properties +++ b/compiler/gradle.properties @@ -1,4 +1,4 @@ -POM_ARTIFACT_ID=toothpick-compiler-ksp +POM_ARTIFACT_ID=compiler POM_NAME=Toothpick KSP Compiler POM_DESCRIPTION=KSP-based compiler for Toothpick. POM_PACKAGING=JAR diff --git a/toothpick-compiler-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider similarity index 100% rename from toothpick-compiler-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider rename to compiler/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/BaseFactoryTest.kt b/compiler/src/test/java/toothpick/compiler/BaseFactoryTest.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/BaseFactoryTest.kt rename to compiler/src/test/java/toothpick/compiler/BaseFactoryTest.kt diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/FactoryAndMemberInjectorTests.kt b/compiler/src/test/java/toothpick/compiler/FactoryAndMemberInjectorTests.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/FactoryAndMemberInjectorTests.kt rename to compiler/src/test/java/toothpick/compiler/FactoryAndMemberInjectorTests.kt diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingFieldsTest.kt b/compiler/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingFieldsTest.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingFieldsTest.kt rename to compiler/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingFieldsTest.kt diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingMethodsTest.kt b/compiler/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingMethodsTest.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingMethodsTest.kt rename to compiler/src/test/java/toothpick/compiler/RelaxedFactoryForClassContainingMethodsTest.kt diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForInjectConstructorTest.kt b/compiler/src/test/java/toothpick/compiler/RelaxedFactoryForInjectConstructorTest.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForInjectConstructorTest.kt rename to compiler/src/test/java/toothpick/compiler/RelaxedFactoryForInjectConstructorTest.kt diff --git a/toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForScopeInstancesTest.kt b/compiler/src/test/java/toothpick/compiler/RelaxedFactoryForScopeInstancesTest.kt similarity index 100% rename from toothpick-compiler-ksp/src/test/java/toothpick/compiler/RelaxedFactoryForScopeInstancesTest.kt rename to compiler/src/test/java/toothpick/compiler/RelaxedFactoryForScopeInstancesTest.kt diff --git a/gradle.properties b/gradle.properties index f5eaaaa4..ad9d780b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ -GROUP=fr.outadoc.toothpick-compiler-ksp +GROUP=fr.outadoc.toothpick-ksp VERSION_NAME=0.0.3 POM_PACKAGING=JAR -POM_URL=https://github.com/outadoc/toothpick-compiler-ksp.git -POM_SCM_URL=https://github.com/outadoc/toothpick-compiler-ksp.git -POM_SCM_CONNECTION=scm:git:git://github.com/outadoc/toothpick-compiler-ksp.git -POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/outadoc/toothpick-compiler-ksp.git +POM_URL=https://github.com/outadoc/toothpick-ksp.git +POM_SCM_URL=https://github.com/outadoc/toothpick-ksp.git +POM_SCM_CONNECTION=scm:git:git://github.com/outadoc/toothpick-ksp.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/outadoc/toothpick-ksp.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/settings.gradle.kts b/settings.gradle.kts index adcdd6d4..1ba782a6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,10 @@ -rootProject.name = "toothpick-compiler-ksp-parent" +rootProject.name = "toothpick-ksp" -include(":toothpick-compiler-ksp") -include(":toothpick-compiler-ksp-core") -include(":toothpick-compiler-ksp-factory") -include(":toothpick-compiler-ksp-memberinjector") -include(":toothpick-compiler-test") +include(":compiler") +include(":compiler-core") +include(":compiler-factory") +include(":compiler-memberinjector") +include(":compiler-test") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")