Change "result" property name in generated model

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
-  ext.KOTLIN_VERSION = "1.3.61"
+  ext.KOTLIN_VERSION = "1.3.72"
   ext.ANDROID_PLUGIN_VERSION = '3.5.3'
 
   repositories {
@@ -14,10 +14,8 @@ buildscript {
     classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
     // Upload with:
-    // ./gradlew assemble sourcesJar javadocsJar androidSourcesJar androidJavadocsJar uploadArchives --no-daemon --no-parallel
-    // Need to use snapshot version and explicitly include javadoc/sources tasks until
-    // https://github.com/vanniktech/gradle-maven-publish-plugin/issues/54 is fixed
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.9.0'
+    // ./gradlew clean uploadArchives --no-daemon --no-parallel
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.11.1'
   }
 }
 

epoxy-adapter/build.gradle

@@ -1,8 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: "com.vanniktech.maven.publish"
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "com.vanniktech.maven.publish"
+
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
 
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION

epoxy-annotations/build.gradle

@@ -1,6 +1,11 @@
 apply plugin: 'java'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 sourceCompatibility = rootProject.JAVA_SOURCE_VERSION
 targetCompatibility = rootProject.JAVA_TARGET_VERSION
 

epoxy-databinding/build.gradle

@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 

epoxy-glide-preloader/build.gradle

@@ -3,6 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+    // must use legacy mode until we update to AGP 3.6.x
+    useLegacyMode = true
+}
+
 android {
     compileSdkVersion rootProject.COMPILE_SDK_VERSION
 

epoxy-litho/build.gradle

@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 

epoxy-modelfactory/build.gradle

@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 

epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java

@@ -290,8 +290,7 @@ public void onVisibilityStateChanged(int visibilityState, final AllTypesModelVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AllTypesModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<AllTypesModelViewModel_, AllTypesModelView> listener) {
     onMutation();
@@ -313,8 +312,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AllTypesModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<AllTypesModelViewModel_, AllTypesModelView> listener) {
     onMutation();
@@ -789,29 +787,29 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + (booleanValue_Boolean ? 1 : 0);
-    result = 31 * result + (boxedBooleanValue_Boolean != null ? boxedBooleanValue_Boolean.hashCode() : 0);
-    result = 31 * result + (charSequenceValue_CharSequence != null ? charSequenceValue_CharSequence.hashCode() : 0);
-    result = 31 * result + (boxedDoubleValue_Double != null ? boxedDoubleValue_Double.hashCode() : 0);
+    _result = 31 * _result + (booleanValue_Boolean ? 1 : 0);
+    _result = 31 * _result + (boxedBooleanValue_Boolean != null ? boxedBooleanValue_Boolean.hashCode() : 0);
+    _result = 31 * _result + (charSequenceValue_CharSequence != null ? charSequenceValue_CharSequence.hashCode() : 0);
+    _result = 31 * _result + (boxedDoubleValue_Double != null ? boxedDoubleValue_Double.hashCode() : 0);
     temp = Double.doubleToLongBits(doubleValue_Double);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + drawableRes_Int;
-    result = 31 * result + (epoxyModelList_List != null ? epoxyModelList_List.hashCode() : 0);
-    result = 31 * result + intValue_Int;
-    result = 31 * result + (boxedIntValue_Integer != null ? boxedIntValue_Integer.hashCode() : 0);
-    result = 31 * result + (int) (longValue_Long ^ (longValue_Long >>> 32));
-    result = 31 * result + (boxedLongValue_Long != null ? boxedLongValue_Long.hashCode() : 0);
-    result = 31 * result + (onClickListener_OnClickListener != null ? 1 : 0);
-    result = 31 * result + rawRes_Int;
-    result = 31 * result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
-    result = 31 * result + (stringList_List != null ? stringList_List.hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + drawableRes_Int;
+    _result = 31 * _result + (epoxyModelList_List != null ? epoxyModelList_List.hashCode() : 0);
+    _result = 31 * _result + intValue_Int;
+    _result = 31 * _result + (boxedIntValue_Integer != null ? boxedIntValue_Integer.hashCode() : 0);
+    _result = 31 * _result + (int) (longValue_Long ^ (longValue_Long >>> 32));
+    _result = 31 * _result + (boxedLongValue_Long != null ? boxedLongValue_Long.hashCode() : 0);
+    _result = 31 * _result + (onClickListener_OnClickListener != null ? 1 : 0);
+    _result = 31 * _result + rawRes_Int;
+    _result = 31 * _result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
+    _result = 31 * _result + (stringList_List != null ? stringList_List.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -890,4 +888,4 @@ public static AllTypesModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}

epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java

@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithFinalAttribute_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BasicModelWithFinalAttribute_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithFinalAttribute_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BasicModelWithFinalAttribute_, Object> listener) {
     onMutation();
@@ -237,13 +235,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -252,4 +250,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}

epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java

@@ -118,8 +118,7 @@ public void onVisibilityStateChanged(int visibilityState, final CallbackPropMode
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CallbackPropModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<CallbackPropModelViewModel_, CallbackPropModelView> listener) {
     onMutation();
@@ -141,8 +140,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CallbackPropModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<CallbackPropModelViewModel_, CallbackPropModelView> listener) {
     onMutation();
@@ -301,13 +299,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onClickListener_OnClickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onClickListener_OnClickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -330,4 +328,4 @@ public static CallbackPropModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}

epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java

@@ -144,8 +144,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_, GroupPropMultipleSupportedAttributeDifferentNameModelView> listener) {
     onMutation();
@@ -168,8 +167,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_, GroupPropMultipleSupportedAttributeDifferentNameModelView> listener) {
     onMutation();
@@ -344,14 +342,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (titleString_String != null ? titleString_String.hashCode() : 0);
-    result = 31 * result + titleInt_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (titleString_String != null ? titleString_String.hashCode() : 0);
+    _result = 31 * _result + titleInt_Int;
+    return _result;
   }
 
   @Override
@@ -378,4 +376,4 @@ public static GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ fr
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}

epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java

@@ -144,8 +144,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeSameNameModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GroupPropMultipleSupportedAttributeSameNameModelViewModel_, GroupPropMultipleSupportedAttributeSameNameModelView> listener) {
     onMutation();
@@ -168,8 +167,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeSameNameModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GroupPropMultipleSupportedAttributeSameNameModelViewModel_, GroupPropMultipleSupportedAttributeSameNameModelView> listener) {
     onMutation();
@@ -342,14 +340,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (titleString_String != null ? titleString_String.hashCode() : 0);
-    result = 31 * result + titleInt_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (titleString_String != null ? titleString_String.hashCode() : 0);
+    _result = 31 * _result + titleInt_Int;
+    return _result;
   }
 
   @Override
@@ -376,4 +374,4 @@ public static GroupPropMultipleSupportedAttributeSameNameModelViewModel_ from(
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}