From de411f122b7fc4cd102f9ea518954cb0ea8d8e1a Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 29 Aug 2016 09:06:10 +0200 Subject: [PATCH] V3.1.1 --- DaoCore/build.gradle | 2 +- README.md | 4 +-- build.gradle | 2 +- greendao-api/build.gradle | 2 +- .../test/entityannotation/NotNullThing.java | 27 ++++++++++++++++--- .../entityannotation/TypesInInnerClass.java | 6 ++--- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/DaoCore/build.gradle b/DaoCore/build.gradle index 38d6ee0c8..92c0b6c76 100644 --- a/DaoCore/build.gradle +++ b/DaoCore/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'signing' group = 'org.greenrobot' archivesBaseName = 'greendao' -version = '3.1.0' +version = '3.1.1' sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/README.md b/README.md index 5737699a3..5ea3544ca 100644 --- a/README.md +++ b/README.md @@ -30,14 +30,14 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0' + classpath 'org.greenrobot:greendao-gradle-plugin:3.1.1' } } apply plugin: 'org.greenrobot.greendao' dependencies { - compile 'org.greenrobot:greendao:3.1.0' + compile 'org.greenrobot:greendao:3.1.1' } ``` diff --git a/build.gradle b/build.gradle index f129fe009..b336ef8a7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ ext { // common dependencies for Android projects dep = [ androidPlugin: 'com.android.tools.build:gradle:2.1.3', - greendaoPlugin: 'org.greenrobot:greendao-gradle-plugin:3.1.0', + greendaoPlugin: 'org.greenrobot:greendao-gradle-plugin:3.1.1', appcompat: 'com.android.support:appcompat-v7:23.4.0', recyclerview: 'com.android.support:recyclerview-v7:23.4.0' ] diff --git a/greendao-api/build.gradle b/greendao-api/build.gradle index e4bf80c9f..dfb927e20 100644 --- a/greendao-api/build.gradle +++ b/greendao-api/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'java' group = 'org.greenrobot' -version = '3.1.1-SNAPSHOT' +version = '3.1.1' sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NotNullThing.java b/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NotNullThing.java index 19aa486aa..fbac30d4b 100644 --- a/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NotNullThing.java +++ b/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NotNullThing.java @@ -27,10 +27,10 @@ public class NotNullThing { @Generated(hash = 1109392169) public NotNullThing(Long id, boolean nullableBoolean, int nullableInteger, - Boolean nullableWrappedBoolean, Integer nullableWrappedInteger, - boolean notNullBoolean, int notNullInteger, - @NotNull Boolean notNullWrappedBoolean, - @NotNull Integer notNullWrappedInteger) { + Boolean nullableWrappedBoolean, Integer nullableWrappedInteger, + boolean notNullBoolean, int notNullInteger, + @NotNull Boolean notNullWrappedBoolean, + @NotNull Integer notNullWrappedInteger) { this.id = id; this.nullableBoolean = nullableBoolean; this.nullableInteger = nullableInteger; @@ -41,60 +41,79 @@ public NotNullThing(Long id, boolean nullableBoolean, int nullableInteger, this.notNullWrappedBoolean = notNullWrappedBoolean; this.notNullWrappedInteger = notNullWrappedInteger; } + @Generated(hash = 521031743) public NotNullThing() { } + public Long getId() { return this.id; } + public void setId(Long id) { this.id = id; } + public boolean getNullableBoolean() { return this.nullableBoolean; } + public void setNullableBoolean(boolean nullableBoolean) { this.nullableBoolean = nullableBoolean; } + public int getNullableInteger() { return this.nullableInteger; } + public void setNullableInteger(int nullableInteger) { this.nullableInteger = nullableInteger; } + public Boolean getNullableWrappedBoolean() { return this.nullableWrappedBoolean; } + public void setNullableWrappedBoolean(Boolean nullableWrappedBoolean) { this.nullableWrappedBoolean = nullableWrappedBoolean; } + public Integer getNullableWrappedInteger() { return this.nullableWrappedInteger; } + public void setNullableWrappedInteger(Integer nullableWrappedInteger) { this.nullableWrappedInteger = nullableWrappedInteger; } + public boolean getNotNullBoolean() { return this.notNullBoolean; } + public void setNotNullBoolean(boolean notNullBoolean) { this.notNullBoolean = notNullBoolean; } + public int getNotNullInteger() { return this.notNullInteger; } + public void setNotNullInteger(int notNullInteger) { this.notNullInteger = notNullInteger; } + public Boolean getNotNullWrappedBoolean() { return this.notNullWrappedBoolean; } + public void setNotNullWrappedBoolean(Boolean notNullWrappedBoolean) { this.notNullWrappedBoolean = notNullWrappedBoolean; } + public Integer getNotNullWrappedInteger() { return this.notNullWrappedInteger; } + public void setNotNullWrappedInteger(Integer notNullWrappedInteger) { this.notNullWrappedInteger = notNullWrappedInteger; } diff --git a/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/TypesInInnerClass.java b/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/TypesInInnerClass.java index e8787e107..7f146ec79 100644 --- a/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/TypesInInnerClass.java +++ b/tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/TypesInInnerClass.java @@ -33,16 +33,14 @@ public Long convertToDatabaseValue(MyInnerType entityProperty) { @Id Long id; - // FIXME Remove "TypesInInnerClass." - @Convert(converter = TypesInInnerClass.MyInnerTypeConverter.class, columnType = Long.class) + @Convert(converter = MyInnerTypeConverter.class, columnType = Long.class) TypesInInnerClass.MyInnerType type; public MyInnerType getType() { return this.type; } - // FIXME Remove "TypesInInnerClass." - public void setType(TypesInInnerClass.MyInnerType type) { + public void setType(MyInnerType type) { this.type = type; }