diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c2742a05..f8757bca0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ Please follow the steps below in order to make the changes: ```shell script # This will install the library (including your recent changes) in your local maven repository. - ./gradlew clean install + ./gradlew clean build publishToMavenLocal ``` 4. Build the plugin project with updated `graphql-java-codegen` library. @@ -43,7 +43,7 @@ Please follow the steps below in order to make the changes: ```shell script # Install Gradle plugin cd plugins/graphql-java-codegen-gradle-plugin/graphql-codegen-gradle-plugin - ./gradlew clean install + ./gradlew clean build publishToMavenLocal # Install Maven plugin cd plugins/graphql-java-codegen-maven-plugin diff --git a/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 5c2d1cf01..000000000 Binary files a/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b5dd81f04..000000000 --- a/plugins/graphql-java-codegen-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Sep 16 22:19:34 CDT 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/plugins/graphql-java-codegen-gradle-plugin/gradlew b/plugins/graphql-java-codegen-gradle-plugin/gradlew index 8e25e6c19..63ed722a2 100755 --- a/plugins/graphql-java-codegen-gradle-plugin/gradlew +++ b/plugins/graphql-java-codegen-gradle-plugin/gradlew @@ -80,7 +80,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH=$APP_HOME/../../gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then diff --git a/plugins/graphql-java-codegen-gradle-plugin/gradlew.bat b/plugins/graphql-java-codegen-gradle-plugin/gradlew.bat index 9618d8d96..6f51bda83 100644 --- a/plugins/graphql-java-codegen-gradle-plugin/gradlew.bat +++ b/plugins/graphql-java-codegen-gradle-plugin/gradlew.bat @@ -79,7 +79,7 @@ set CMD_LINE_ARGS=%* :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH=%APP_HOME%\..\..\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/plugins/graphql-java-codegen-gradle-plugin/graphql-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphqlCodegenGradleTask.java b/plugins/graphql-java-codegen-gradle-plugin/graphql-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphqlCodegenGradleTask.java index 4d12a714b..743f48457 100644 --- a/plugins/graphql-java-codegen-gradle-plugin/graphql-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphqlCodegenGradleTask.java +++ b/plugins/graphql-java-codegen-gradle-plugin/graphql-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphqlCodegenGradleTask.java @@ -176,7 +176,7 @@ public void setCustomAnnotationsMapping(Map customAnnotationsMap @Input @Optional - public boolean getGenerateEqualsAndHashCode() { + public Boolean getGenerateEqualsAndHashCode() { return generateEqualsAndHashCode; }