build(*): Bump version to 3.2.2

Upgrade Apollo to 2.2.3
aoudiamoncef · Jul 27, 2020 · 8a1907d · 8a1907d
1 parent f7ddc66
commit 8a1907d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,17 +47,21 @@ jobs:
             - ~/.m2
           key: v1-dependencies-{{ checksum "pom.xml" }}
       - run:
-          name: Deploy the artifacts
+          name: Deploy the artifacts to Bintray
           command: |
             mvn -s ./.circleci/.circleci.settings.xml -DskipTests deploy -P bintray
+      - run:
+          name: Deploy the artifacts to Github
+          command: |
+            mvn deploy -Dregistry=https://maven.pkg.github.com/aoudiamoncef -Dtoken=${GITHUB_TOKEN}
   sync:
     docker:
       - image: byrnedo/alpine-curl:0.1.8
     steps:
       - run:
           name: Sync version Artifacts to Maven Central
           command: |
-            curl -d '{"username": "${SONATYPE_USER_TOKEN}", "password": "${SONATYPE_PASSWORD}"}' -H "Content-Type: application/json" -X POST https://bintray.com/maven_central_sync/sparow199/maven/apollo-client-maven-plugin/3.2.1
+            curl -d '{"username": "${SONATYPE_USER_TOKEN}", "password": "${SONATYPE_PASSWORD}"}' -H "Content-Type: application/json" -X POST https://bintray.com/maven_central_sync/sparow199/maven/apollo-client-maven-plugin/3.2.2
 
 workflows:
   version: 2

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ A full usage example can be found in the [test project](https://github.com/sparo
    <dependency>
        <groupId>com.apollographql.apollo</groupId>
        <artifactId>apollo-runtime</artifactId>
-       <version>2.2.2</version>
+       <version>2.2.3</version>
    </dependency>
     <dependency>
         <groupId>com.squareup.okio</groupId>
@@ -47,7 +47,7 @@ A full usage example can be found in the [test project](https://github.com/sparo
 <plugin>
     <groupId>com.github.sparow199</groupId>
     <artifactId>apollo-client-maven-plugin</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <executions>
         <execution>
             <goals>

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.sparow199</groupId>
         <artifactId>apollo-client-maven-plugin-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -22,8 +22,8 @@
         <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
         <maven.install.skip>true</maven.install.skip>
 
-        <apollo-client-maven-plugin.version>3.2.1</apollo-client-maven-plugin.version>
-        <apollo-runtime.version>2.2.2</apollo-runtime.version>
+        <apollo-client-maven-plugin.version>3.2.2</apollo-client-maven-plugin.version>
+        <apollo-runtime.version>2.2.3</apollo-runtime.version>
         <annotations.version>19.0.0</annotations.version>
         <assertj-core.version>3.16.1</assertj-core.version>
         <graphql-java-servlet.version>6.1.3</graphql-java-servlet.version>

diff --git a/apollo-client-maven-plugin/pom.xml b/apollo-client-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.sparow199</groupId>
         <artifactId>apollo-client-maven-plugin-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
 
         <maven-plugin.version>3.6.0</maven-plugin.version>
         <maven-project.version>2.2.1</maven-project.version>
-        <apollo-compiler.version>2.2.2</apollo-compiler.version>
+        <apollo-compiler.version>2.2.3</apollo-compiler.version>
         <httpclient.version>4.5.11</httpclient.version>
         <okio.version>2.5.0</okio.version>
     </properties>

diff --git a/...-plugin/src/main/kotlin/com/lahzouz/java/graphql/client/maven/plugin/GraphQLClientMojo.kt b/...-plugin/src/main/kotlin/com/lahzouz/java/graphql/client/maven/plugin/GraphQLClientMojo.kt
@@ -4,8 +4,8 @@ import com.apollographql.apollo.compiler.DefaultPackageNameProvider
 import com.apollographql.apollo.compiler.GraphQLCompiler
 import com.apollographql.apollo.compiler.NullableValueType
 import com.apollographql.apollo.compiler.OperationIdGenerator
-import com.apollographql.apollo.compiler.parser.GraphQLDocumentParser
-import com.apollographql.apollo.compiler.parser.Schema
+import com.apollographql.apollo.compiler.parser.graphql.GraphQLDocumentParser
+import com.apollographql.apollo.compiler.parser.introspection.IntrospectionSchema
 import com.lahzouz.java.graphql.client.maven.plugin.Introspection.getIntrospectionSchema
 import org.apache.maven.plugin.AbstractMojo
 import org.apache.maven.plugin.MojoExecutionException
@@ -154,7 +154,9 @@ class GraphQLClientMojo : AbstractMojo() {
             schemaFile = introspectionFile,
             rootPackageName = rootPackageName
         )
-        val graphQLDocumentParser = GraphQLDocumentParser(Schema(introspectionFile), packageNameProvider)
+
+        val introspectionSchema = IntrospectionSchema(introspectionFile)
+        val graphQLDocumentParser = GraphQLDocumentParser(introspectionSchema, packageNameProvider)
         val ir = graphQLDocumentParser.parse(queries)
 
         val compiler = GraphQLCompiler()

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.sparow199</groupId>
     <artifactId>apollo-client-maven-plugin-parent</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.2</version>
     <packaging>pom</packaging>
 
     <name>apollo-client-maven-plugin-parent</name>