Skip to content

Commit f7e34c9

Browse files
committed
Update JCodeModel to 3.0.1
1 parent ea7d89d commit f7e34c9

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,17 @@ private AbstractJClass typeMirrorToJClass(WildcardType wildcardType, Map<String,
127127
if (bound == null) {
128128
bound = wildcardType.getSuperBound();
129129
if (bound == null) {
130-
return environment.getClasses().OBJECT.wildcard();
130+
return environment.getClasses().OBJECT.wildcardExtends();
131131
}
132132
return typeMirrorToJClass(bound, substitute).wildcardSuper();
133133
}
134134

135135
TypeMirror extendsBound = wildcardType.getExtendsBound();
136136

137137
if (extendsBound == null) {
138-
return environment.getClasses().OBJECT.wildcard();
138+
return environment.getClasses().OBJECT.wildcardExtends();
139139
} else {
140-
return typeMirrorToJClass(extendsBound, substitute).wildcard();
140+
return typeMirrorToJClass(extendsBound, substitute).wildcardExtends();
141141
}
142142
}
143143

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/ResourceCodeWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ResourceCodeWriter extends AbstractCodeWriter {
3131
private final Filer filer;
3232

3333
public ResourceCodeWriter(Filer filer, Charset charset) {
34-
super(charset);
34+
super(charset, getDefaultNewLine());
3535
this.filer = filer;
3636
}
3737

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void write(int arg0) throws IOException {
4646
}
4747

4848
public SourceCodeWriter(Filer filer, OriginatingElements originatingElements, Charset charset) {
49-
super(charset);
49+
super(charset, getDefaultNewLine());
5050
this.filer = filer;
5151
this.originatingElements = originatingElements;
5252
}

‎AndroidAnnotations/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<dependency>
178178
<groupId>com.helger</groupId>
179179
<artifactId>jcodemodel</artifactId>
180-
<version>2.8.6</version>
180+
<version>3.0.1</version>
181181
</dependency>
182182
<dependency>
183183
<groupId>junit</groupId>

0 commit comments

Comments
 (0)