Merge pull request #33 from AkaZver/feature/fix-protobuf-config

Fix protobuf-spi-impl configuration

Author: AkaZver

README.md

@@ -57,7 +57,7 @@ The plugin automatically:
 |                            | [apache/camel-spring-boot](https://github.com/apache/camel-spring-boot)                           | [org.apache.camel.springboot/camel-mapstruct-starter](https://mvnrepository.com/artifact/org.apache.camel.springboot/camel-mapstruct-starter)                           | `implementation`      |
 |                            | [apache/camel-quarkus](https://github.com/apache/camel-quarkus)                                   | [org.apache.camel.quarkus/camel-quarkus-mapstruct](https://mvnrepository.com/artifact/org.apache.camel.quarkus/camel-quarkus-mapstruct)                                 | `implementation`      |
 | **Quarkus**                | [quarkiverse/quarkus-mapstruct](https://github.com/quarkiverse/quarkus-mapstruct)                 | [io.quarkiverse.mapstruct/quarkus-mapstruct](https://mvnrepository.com/artifact/io.quarkiverse.mapstruct/quarkus-mapstruct)                                             | `implementation`      |
-| **Protobuf**               | [entur/mapstruct-spi-protobuf](https://github.com/entur/mapstruct-spi-protobuf)                   | [no.entur.mapstruct.spi/protobuf-spi-impl](https://mvnrepository.com/artifact/no.entur.mapstruct.spi/protobuf-spi-impl)                                                 | `implementation`      |
+| **Protobuf**               | [entur/mapstruct-spi-protobuf](https://github.com/entur/mapstruct-spi-protobuf)                   | [no.entur.mapstruct.spi/protobuf-spi-impl](https://mvnrepository.com/artifact/no.entur.mapstruct.spi/protobuf-spi-impl)                                                 | `annotationProcessor` |
 
 ## Config
 

src/main/java/io/github/akazver/gradle/plugins/mapstruct/dependency/AdditionalDependency.java

@@ -57,7 +57,7 @@ public class AdditionalDependency extends PluginDependency {
 
     // https://mvnrepository.com/artifact/no.entur.mapstruct.spi/protobuf-spi-impl
     public static final AdditionalDependency PROTOBUF_SPI_IMPL =
-            new AdditionalDependency("implementation", "no.entur.mapstruct.spi:protobuf-spi-impl:1.62.0");
+            new AdditionalDependency("annotationProcessor", "no.entur.mapstruct.spi:protobuf-spi-impl:1.62.0");
 
     public AdditionalDependency(String configuration, String id) {
         super(configuration, id);

src/main/java/io/github/akazver/gradle/plugins/mapstruct/manager/DependencyManager.java

@@ -95,7 +95,7 @@ private void addOptionalDependencies(String processorConfig) {
 
         if (hasProtobuf) {
             LOGGER.lifecycle(ADDING_MESSAGE, "Protobuf");
-            addDependency(PROTOBUF_SPI_IMPL);
+            addDependency(PROTOBUF_SPI_IMPL, processorConfig);
         }
     }
 

src/test/java/io/github/akazver/gradle/plugins/mapstruct/DependencyTest.java

@@ -271,11 +271,11 @@ void addOptionalDependenciesWithProtobuf() {
         evaluate(project);
 
         String[] expectedAnnotationProcessor = {
-                MAPSTRUCT_PROCESSOR.getId()
+                MAPSTRUCT_PROCESSOR.getId(), PROTOBUF_SPI_IMPL.getId()
         };
 
         String[] expectedImplementation = {
-                MAPSTRUCT.getId(), PROTOBUF_JAVA.getId(), PROTOBUF_SPI_IMPL.getId()
+                MAPSTRUCT.getId(), PROTOBUF_JAVA.getId()
         };
 
         optionalDependenciesWithoutSpringTest(project, expectedAnnotationProcessor, expectedImplementation);
@@ -294,11 +294,11 @@ void addOptionalDependenciesWithProtobufPlugin() {
         assertThat(project.getConfigurations().findByName("protobuf")).isNotNull();
 
         String[] expectedAnnotationProcessor = {
-                MAPSTRUCT_PROCESSOR.getId()
+                MAPSTRUCT_PROCESSOR.getId(), PROTOBUF_SPI_IMPL.getId()
         };
 
         String[] expectedImplementation = {
-                MAPSTRUCT.getId(), PROTOBUF_JAVA.getId(), PROTOBUF_SPI_IMPL.getId()
+                MAPSTRUCT.getId(), PROTOBUF_JAVA.getId()
         };
 
         optionalDependenciesWithoutSpringTest(project, expectedAnnotationProcessor, expectedImplementation);