From 3214a04c660546117e7b6ea64a9654aa57ec97d7 Mon Sep 17 00:00:00 2001
From: Lilian Gallon <lilian.gallon@4sh.fr>
Date: Wed, 19 Jun 2024 13:32:44 +0200
Subject: [PATCH 1/3] chore(gradle) #112: remove duplicated declarations & a-p
 / common module maven publishing

---
 annotation-processor/build.gradle.kts | 33 ---------------------------
 common/build.gradle.kts               | 20 ----------------
 ocpi-toolkit-2.2.1/build.gradle.kts   |  1 -
 transport/build.gradle.kts            |  5 ----
 4 files changed, 59 deletions(-)

diff --git a/annotation-processor/build.gradle.kts b/annotation-processor/build.gradle.kts
index e61756f0..0e09d0c4 100644
--- a/annotation-processor/build.gradle.kts
+++ b/annotation-processor/build.gradle.kts
@@ -2,42 +2,9 @@ plugins {
     kotlin("jvm")
 }
 
-repositories {
-    mavenCentral()
-}
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-publishing {
-    publications {
-        named<MavenPublication>("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/build.gradle.kts b/common/build.gradle.kts
index c8f756d1..e69de29b 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,20 +0,0 @@
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-publishing {
-    publications {
-        named<MavenPublication>("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..21c3f98a 100644
--- a/ocpi-toolkit-2.2.1/build.gradle.kts
+++ b/ocpi-toolkit-2.2.1/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("java-library")
-    id("maven-publish")
     id("com.google.devtools.ksp")
 }
 
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()

From 44e9f2965f7049c8e1c0e659208626779da8570f Mon Sep 17 00:00:00 2001
From: Lilian Gallon <lilian.gallon@4sh.fr>
Date: Wed, 19 Jun 2024 13:37:06 +0200
Subject: [PATCH 2/3] chore(gradle) #112: moved Partial annotation to
 annotation-processor module

---
 .../main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt  | 0
 ocpi-toolkit-2.2.1/build.gradle.kts                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {common => annotation-processor}/src/main/kotlin/com/izivia/ocpi/toolkit/annotations/Partial.kt (100%)

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/ocpi-toolkit-2.2.1/build.gradle.kts b/ocpi-toolkit-2.2.1/build.gradle.kts
index 21c3f98a..778c0511 100644
--- a/ocpi-toolkit-2.2.1/build.gradle.kts
+++ b/ocpi-toolkit-2.2.1/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":common"))
+    implementation(project(":annotation-processor"))
     ksp(project(":annotation-processor"))
     api(project(":transport"))
 

From b53820c42486eda002e25684eb9ea9a8e4e9777d Mon Sep 17 00:00:00 2001
From: Lilian Gallon <lilian.gallon@4sh.fr>
Date: Wed, 19 Jun 2024 13:37:17 +0200
Subject: [PATCH 3/3] chore(gradle) #112: removed common module

---
 annotation-processor/build.gradle.kts | 1 -
 common/build.gradle.kts               | 0
 settings.gradle.kts                   | 1 -
 3 files changed, 2 deletions(-)
 delete mode 100644 common/build.gradle.kts

diff --git a/annotation-processor/build.gradle.kts b/annotation-processor/build.gradle.kts
index 0e09d0c4..c3bf3793 100644
--- a/annotation-processor/build.gradle.kts
+++ b/annotation-processor/build.gradle.kts
@@ -6,5 +6,4 @@ 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"))
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
deleted file mode 100644
index e69de29b..00000000
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"