Merge pull request #46 from aoudiamoncef/release/next-release

build: release 4.0.2
aoudiamoncef · May 23, 2021 · 75716ad · 75716ad
2 parents 715fd96 + cb856d4
commit 75716ad
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,9 +43,10 @@ jobs:
           export GPG_TTY=$(tty)
           git config user.name "${{ github.event.head_commit.committer.name }}"
           git config user.email "${{ github.event.head_commit.committer.email }}"
-          ./mvnw --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true -Drelease=true deploy
+          ./mvnw --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true -Drelease=true dependency:go-offline deploy
 
       - name: Set up Java for publishing to GitHub Packages
+        continue-on-error: true
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
@@ -55,7 +56,7 @@ jobs:
           export GPG_TTY=$(tty)
           git config user.name "${{ github.event.head_commit.committer.name }}"
           git config user.email "${{ github.event.head_commit.committer.email }}"
-          ./mvnw --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true deploy
+          ./mvnw --no-transfer-progress -B --file pom.xml -Dmaven.site.skip=true dependency:go-offline deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/README.adoc b/README.adoc
@@ -4,7 +4,7 @@
 :project-name:       apollo-client-maven-plugin
 :project-groupId:    com.github.aoudiamoncef
 :project-artifactId: apollo-client-maven-plugin-parent
-:project-version:    4.0.0
+:project-version:    4.0.2
 
 image:https://github.com/{project-owner}/{project-name}/workflows/Build/badge.svg["Build Status", link="https://github.com/{project-owner}/{project-name}/actions"]
 image:https://img.shields.io/maven-central/v/{project-groupId}/{project-artifactId}.svg[Download, link="https://search.maven.org/#search|ga|1|g:{project-groupId} AND a:{project-artifactId}"]
@@ -30,13 +30,13 @@ Maven plugin that calls the https://github.com/apollographql/apollo-android[Apol
    <dependency>
        <groupId>com.apollographql.apollo</groupId>
        <artifactId>apollo-runtime</artifactId>
-       <version>2.5.6</version>
+       <version>2.5.7</version>
    </dependency>
    <!-- Optional, needed only for ANNOTATED nullable type-->
    <dependency>
        <groupId>org.jetbrains</groupId>
        <artifactId>annotations</artifactId>
-       <version>20.1.0</version>
+       <version>21.0.0</version>
    </dependency>
 </dependencies>
 ----
@@ -199,7 +199,7 @@ define mapping configuration then register your custom adapter:
 </configuration>
 ----
 
-Implemenatation of a custom adapter for `java.time.LocalDate`:
+Implementation of a custom adapter for `java.time.LocalDate`:
 
 [source,java]
 ----
@@ -257,8 +257,6 @@ client.query(new GetBooksQuery())
 
 If you miss *apolloCall.execute* method, which execute a query synchronously, you could wrap *apolloCall.enqueue* with a CompletableFuture and call *join* method to wait for the response.
 
-You could achieve the same thing as above with project https://projectreactor.io/docs/core/release/reference/[Reactor] using *Mono* type.
-
 [source,java]
 ----
 public class ApolloClientUtils {
@@ -287,19 +285,6 @@ public class ApolloClientUtils {
         return completableFuture;
     }
 
-    public static <T> Mono<Response<T>> toMono(@NotNull ApolloCall<T> apolloCall) {
-        return Mono.create(sink -> apolloCall.enqueue(new ApolloCall.Callback<T>() {
-            @Override
-            public void onResponse(@NotNull Response<T> response) {
-                sink.success(response);
-            }
-
-            @Override
-            public void onFailure(@NotNull ApolloException e) {
-                sink.error(e);
-            }
-        }));
-    }
 }
 ----
 

diff --git a/apollo-client-maven-plugin-tests/pom.xml b/apollo-client-maven-plugin-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.aoudiamoncef</groupId>
         <artifactId>apollo-client-maven-plugin-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/apollo-client-maven-plugin/pom.xml b/apollo-client-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.aoudiamoncef</groupId>
         <artifactId>apollo-client-maven-plugin-parent</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.aoudiamoncef</groupId>
     <artifactId>apollo-client-maven-plugin-parent</artifactId>
-    <version>4.0.1</version>
+    <version>4.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>apollo-client-maven-plugin-parent</name>
@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-        <kotlin.version>1.4.32</kotlin.version>
+        <kotlin.version>1.5.0</kotlin.version>
         <java.version>1.8</java.version>
         <!--This contends with dokka and creates two javadoc jars...-->
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -28,13 +28,13 @@
         <nexus.url>https://oss.sonatype.org</nexus.url>
         <repository.url>[email protected]:${project.github.repository}.git</repository.url>
 
-        <annotations.version>20.1.0</annotations.version>
-        <ant.version>1.10.9</ant.version>
-        <apollo.version>2.5.6</apollo.version>
+        <annotations.version>21.0.0</annotations.version>
+        <ant.version>1.10.10</ant.version>
+        <apollo.version>2.5.7</apollo.version>
         <assertj-core.version>3.19.0</assertj-core.version>
         <graphql-java-servlet.version>6.1.3</graphql-java-servlet.version>
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
-        <jackson-databind.version>2.12.2</jackson-databind.version>
+        <jackson-databind.version>2.12.3</jackson-databind.version>
         <junit.jupiter.version>5.7.0</junit.jupiter.version>
         <moshi.version>1.12.0</moshi.version>
         <okhttp.version>4.9.0</okhttp.version>
@@ -357,6 +357,11 @@
                     <artifactId>git-commit-id-plugin</artifactId>
                     <version>${version.git.plugin}</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.gantsign.maven</groupId>
+                    <artifactId>ktlint-maven-plugin</artifactId>
+                    <version>${version.ktlint.plugin}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -457,7 +462,6 @@
             <plugin>
                 <groupId>com.github.gantsign.maven</groupId>
                 <artifactId>ktlint-maven-plugin</artifactId>
-                <version>${version.ktlint.plugin}</version>
             </plugin>
         </plugins>
     </reporting>
@@ -492,7 +496,6 @@
                     <plugin>
                         <groupId>com.github.gantsign.maven</groupId>
                         <artifactId>ktlint-maven-plugin</artifactId>
-                        <version>${version.ktlint.plugin}</version>
                         <executions>
                             <execution>
                                 <id>format</id>
@@ -519,7 +522,6 @@
                     <plugin>
                         <groupId>com.github.gantsign.maven</groupId>
                         <artifactId>ktlint-maven-plugin</artifactId>
-                        <version>${version.ktlint.plugin}</version>
                         <executions>
                             <execution>
                                 <id>check</id>
@@ -655,13 +657,4 @@
             </build>
         </profile>
     </profiles>
-
-    <!-- will be removed in next releases -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>jcenter</id>
-            <name>JCenter</name>
-            <url>https://jcenter.bintray.com/</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>