upgraded processor to use up-to date prev version of itself to compile

immutables · Jul 7, 2016 · 67f475b · 67f475b
1 parent 260cdaf
commit 67f475b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/value-processor/pom.xml b/value-processor/pom.xml
@@ -62,8 +62,8 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value-standalone</artifactId>
-      <version>1.1</version>
+      <artifactId>value</artifactId>
+      <version>2.2.10</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>

diff --git a/value-processor/src/org/immutables/value/processor/meta/Constitution.java b/value-processor/src/org/immutables/value/processor/meta/Constitution.java
@@ -41,7 +41,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 
-@Value.Nested
+@Value.Enclosing
 @Value.Immutable
 public abstract class Constitution {
   private static final String NA_ERROR = "!should_not_be_used_in_generated_code!";
@@ -498,7 +498,7 @@ public NameForms typeImplementationBuilder() {
   }
 
   @Value.Immutable
-  public static abstract class AppliedNameForms extends NameForms {
+  public static abstract class AppliedNameForms extends AbstractNameForms {
     public abstract NameForms forms();
 
     public abstract String applied();
@@ -566,9 +566,8 @@ private String combineApplied(boolean qualifyWithPackage) {
           : (base + '.' + genericArgs() + applied());
     }
   }
-
-  @Value.Immutable
-  public static abstract class NameForms {
+
+  public static abstract class AbstractNameForms {
     private static final String PUBLIC_MODIFIER_PREFIX = "public ";
     private static final String PRIVATE_MODIFIER_PREFIX = "private ";
 
@@ -609,12 +608,13 @@ public String access() {
       }
     }
 
-    public AppliedNameForms applied(String input) {
-      return ImmutableConstitution.AppliedNameForms.builder()
-          .forms(this)
-          .applied(input)
-          .build();
+    protected String qualifyWithPackage(String reference) {
+      return DOT_JOINER.join(Strings.emptyToNull(packageOf()), reference);
     }
+  }
+
+  @Value.Immutable
+  public static abstract class NameForms extends AbstractNameForms {
 
     /**
      * Fully qualified type name
@@ -626,8 +626,11 @@ public String toString() {
           : qualifyWithPackage(relative());
     }
 
-    protected String qualifyWithPackage(String reference) {
-      return DOT_JOINER.join(Strings.emptyToNull(packageOf()), reference);
+    public AppliedNameForms applied(String input) {
+      return ImmutableConstitution.AppliedNameForms.builder()
+          .forms(this)
+          .applied(input)
+          .build();
     }
   }
 

diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java
@@ -49,7 +49,7 @@
 import org.immutables.value.processor.meta.Styles.UsingName.TypeNames;
 import static com.google.common.base.Verify.verify;
 
-@Value.Nested
+@Value.Enclosing
 public class Proto {
   private Proto() {}
 

diff --git a/value-processor/src/org/immutables/value/processor/meta/package-info.java b/value-processor/src/org/immutables/value/processor/meta/package-info.java
@@ -0,0 +1,5 @@
+@Value.Style(strictBuilder = true)
+package org.immutables.value.processor.meta;
+
+import org.immutables.value.Value;
+