diff --git a/annotation-processor/build.gradle.kts b/annotation-processor/build.gradle.kts index e61756f0..c3bf3793 100644 --- a/annotation-processor/build.gradle.kts +++ b/annotation-processor/build.gradle.kts @@ -2,42 +2,8 @@ plugins { kotlin("jvm") } -repositories { - mavenCentral() -} - -java { - withJavadocJar() - withSourcesJar() -} - -publishing { - publications { - named("maven") { - artifactId = "ocpi-annotation-processor" - groupId = "com.izivia" - - from(components["java"]) - - pom { - name.set("OCPI Annotation processor") - artifactId = "ocpi-annotation-processor" - description.set( - "This module processes annotations during compilation time in order to generate some code " + - "(partial representation, etc ...)" - ) - } - } - } -} - dependencies { implementation("com.squareup:kotlinpoet:${Versions.kotlinPoet}") implementation("com.squareup:kotlinpoet-ksp:${Versions.kotlinPoet}") implementation("com.google.devtools.ksp:symbol-processing-api:${Versions.ksp}") - implementation(project(":common")) -} - -tasks.build { - dependsOn(tasks.publishToMavenLocal) } diff --git a/common/src/main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt b/annotation-processor/src/main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt similarity index 100% rename from common/src/main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt rename to annotation-processor/src/main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt diff --git a/common/build.gradle.kts b/common/build.gradle.kts deleted file mode 100644 index c8f756d1..00000000 --- a/common/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ - -java { - withJavadocJar() - withSourcesJar() -} - -publishing { - publications { - named("maven") { - artifactId = "ocpi-common" - from(components["java"]) - - pom { - name.set("OCPI Common") - artifactId = "ocpi-common" - description.set("This module provides some common features") - } - } - } -} diff --git a/ocpi-toolkit-2.2.1/build.gradle.kts b/ocpi-toolkit-2.2.1/build.gradle.kts index 8bd67be8..778c0511 100644 --- a/ocpi-toolkit-2.2.1/build.gradle.kts +++ b/ocpi-toolkit-2.2.1/build.gradle.kts @@ -1,11 +1,10 @@ plugins { id("java-library") - id("maven-publish") id("com.google.devtools.ksp") } dependencies { - implementation(project(":common")) + implementation(project(":annotation-processor")) ksp(project(":annotation-processor")) api(project(":transport")) diff --git a/settings.gradle.kts b/settings.gradle.kts index d0fb6b4f..f4c1444d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,6 @@ pluginManagement { } include( - "common", "annotation-processor", "transport", "ocpi-toolkit-2.2.1" diff --git a/transport/build.gradle.kts b/transport/build.gradle.kts index c2335fff..64504e6c 100644 --- a/transport/build.gradle.kts +++ b/transport/build.gradle.kts @@ -1,8 +1,3 @@ -plugins { - kotlin("jvm") - id("maven-publish") -} - java { withJavadocJar() withSourcesJar()