Skip to content

Commit de411f1

Browse files
committed
V3.1.1
1 parent d5a5189 commit de411f1

File tree

6 files changed

+30
-13
lines changed

6 files changed

+30
-13
lines changed

DaoCore/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'signing'
44

55
group = 'org.greenrobot'
66
archivesBaseName = 'greendao'
7-
version = '3.1.0'
7+
version = '3.1.1'
88
sourceCompatibility = 1.7
99
targetCompatibility = 1.7
1010

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ buildscript {
3030
mavenCentral()
3131
}
3232
dependencies {
33-
classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0'
33+
classpath 'org.greenrobot:greendao-gradle-plugin:3.1.1'
3434
}
3535
}
3636
3737
apply plugin: 'org.greenrobot.greendao'
3838
3939
dependencies {
40-
compile 'org.greenrobot:greendao:3.1.0'
40+
compile 'org.greenrobot:greendao:3.1.1'
4141
}
4242
```
4343

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ext {
1212
// common dependencies for Android projects
1313
dep = [
1414
androidPlugin: 'com.android.tools.build:gradle:2.1.3',
15-
greendaoPlugin: 'org.greenrobot:greendao-gradle-plugin:3.1.0',
15+
greendaoPlugin: 'org.greenrobot:greendao-gradle-plugin:3.1.1',
1616
appcompat: 'com.android.support:appcompat-v7:23.4.0',
1717
recyclerview: 'com.android.support:recyclerview-v7:23.4.0'
1818
]

greendao-api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22

33
group = 'org.greenrobot'
4-
version = '3.1.1-SNAPSHOT'
4+
version = '3.1.1'
55

66
sourceCompatibility = 1.7
77
targetCompatibility = 1.7

tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/NotNullThing.java

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public class NotNullThing {
2727

2828
@Generated(hash = 1109392169)
2929
public NotNullThing(Long id, boolean nullableBoolean, int nullableInteger,
30-
Boolean nullableWrappedBoolean, Integer nullableWrappedInteger,
31-
boolean notNullBoolean, int notNullInteger,
32-
@NotNull Boolean notNullWrappedBoolean,
33-
@NotNull Integer notNullWrappedInteger) {
30+
Boolean nullableWrappedBoolean, Integer nullableWrappedInteger,
31+
boolean notNullBoolean, int notNullInteger,
32+
@NotNull Boolean notNullWrappedBoolean,
33+
@NotNull Integer notNullWrappedInteger) {
3434
this.id = id;
3535
this.nullableBoolean = nullableBoolean;
3636
this.nullableInteger = nullableInteger;
@@ -41,60 +41,79 @@ public NotNullThing(Long id, boolean nullableBoolean, int nullableInteger,
4141
this.notNullWrappedBoolean = notNullWrappedBoolean;
4242
this.notNullWrappedInteger = notNullWrappedInteger;
4343
}
44+
4445
@Generated(hash = 521031743)
4546
public NotNullThing() {
4647
}
48+
4749
public Long getId() {
4850
return this.id;
4951
}
52+
5053
public void setId(Long id) {
5154
this.id = id;
5255
}
56+
5357
public boolean getNullableBoolean() {
5458
return this.nullableBoolean;
5559
}
60+
5661
public void setNullableBoolean(boolean nullableBoolean) {
5762
this.nullableBoolean = nullableBoolean;
5863
}
64+
5965
public int getNullableInteger() {
6066
return this.nullableInteger;
6167
}
68+
6269
public void setNullableInteger(int nullableInteger) {
6370
this.nullableInteger = nullableInteger;
6471
}
72+
6573
public Boolean getNullableWrappedBoolean() {
6674
return this.nullableWrappedBoolean;
6775
}
76+
6877
public void setNullableWrappedBoolean(Boolean nullableWrappedBoolean) {
6978
this.nullableWrappedBoolean = nullableWrappedBoolean;
7079
}
80+
7181
public Integer getNullableWrappedInteger() {
7282
return this.nullableWrappedInteger;
7383
}
84+
7485
public void setNullableWrappedInteger(Integer nullableWrappedInteger) {
7586
this.nullableWrappedInteger = nullableWrappedInteger;
7687
}
88+
7789
public boolean getNotNullBoolean() {
7890
return this.notNullBoolean;
7991
}
92+
8093
public void setNotNullBoolean(boolean notNullBoolean) {
8194
this.notNullBoolean = notNullBoolean;
8295
}
96+
8397
public int getNotNullInteger() {
8498
return this.notNullInteger;
8599
}
100+
86101
public void setNotNullInteger(int notNullInteger) {
87102
this.notNullInteger = notNullInteger;
88103
}
104+
89105
public Boolean getNotNullWrappedBoolean() {
90106
return this.notNullWrappedBoolean;
91107
}
108+
92109
public void setNotNullWrappedBoolean(Boolean notNullWrappedBoolean) {
93110
this.notNullWrappedBoolean = notNullWrappedBoolean;
94111
}
112+
95113
public Integer getNotNullWrappedInteger() {
96114
return this.notNullWrappedInteger;
97115
}
116+
98117
public void setNotNullWrappedInteger(Integer notNullWrappedInteger) {
99118
this.notNullWrappedInteger = notNullWrappedInteger;
100119
}

tests/DaoTestEntityAnnotation/src/main/java/org/greenrobot/greendao/test/entityannotation/TypesInInnerClass.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ public Long convertToDatabaseValue(MyInnerType entityProperty) {
3333
@Id
3434
Long id;
3535

36-
// FIXME Remove "TypesInInnerClass."
37-
@Convert(converter = TypesInInnerClass.MyInnerTypeConverter.class, columnType = Long.class)
36+
@Convert(converter = MyInnerTypeConverter.class, columnType = Long.class)
3837
TypesInInnerClass.MyInnerType type;
3938

4039
public MyInnerType getType() {
4140
return this.type;
4241
}
4342

44-
// FIXME Remove "TypesInInnerClass."
45-
public void setType(TypesInInnerClass.MyInnerType type) {
43+
public void setType(MyInnerType type) {
4644
this.type = type;
4745
}
4846

0 commit comments

Comments
 (0)