Merge remote-tracking branch 'github-team/getters-setters-flag'

greenrobot · Aug 24, 2016 · d5a5189 · d5a5189
2 parents b6a24e4 + a30f3ee
commit d5a5189
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/greendao-api/build.gradle b/greendao-api/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 group = 'org.greenrobot'
-version = '3.1.0'
+version = '3.1.1-SNAPSHOT'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

diff --git a/greendao-api/src/main/java/org/greenrobot/greendao/annotation/Entity.java b/greendao-api/src/main/java/org/greenrobot/greendao/annotation/Entity.java
@@ -45,8 +45,13 @@
     boolean active() default false;
 
     /**
-     * Whether constructors should be generated.
+     * Whether an all properties constructor should be generated. A no-args constructor is always required.
      */
     boolean generateConstructors() default true;
 
+    /**
+     * Whether getters and setters for properties should be generated if missing.
+     */
+    boolean generateGettersSetters() default true;
+
 }