From 6ff4ac48a04969ea282d59d0036b8f6b98a76161 Mon Sep 17 00:00:00 2001
From: Markus <markus@greenrobot>
Date: Wed, 3 Aug 2016 21:42:25 +0200
Subject: [PATCH] V3.1.0, javadoc fixes and styling, clean up

---
 DaoCore/build.gradle                          |  17 +-
 .../greendao/internal/FastCursor.java         |   1 +
 .../org/greenrobot/greendao/rx/RxBase.java    |   4 -
 DaoExample/build.gradle                       |   6 +-
 DaoGenerator/build.gradle                     |  10 +-
 greendao-api/build.gradle                     |   9 +-
 javadoc-style/background.gif                  | Bin 0 -> 2313 bytes
 javadoc-style/stylesheet.css                  | 574 ++++++++++++++++++
 settings.gradle                               |   3 +-
 tests/DaoTestEntityAnnotation/build.gradle    |   7 +-
 .../src/main/AndroidManifest.xml              |   2 +-
 .../entityannotation/TypesInInnerClass.java   |  16 +-
 12 files changed, 615 insertions(+), 34 deletions(-)
 create mode 100644 javadoc-style/background.gif
 create mode 100644 javadoc-style/stylesheet.css

diff --git a/DaoCore/build.gradle b/DaoCore/build.gradle
index 81387b808..38d6ee0c8 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-SNAPSHOT'
+version = '3.1.0'
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
@@ -25,13 +25,20 @@ dependencies {
 }
 
 javadoc {
-    def srcApi = project(':greendao-api').file('src/main/java/')
-    if (!srcApi.directory) throw new GradleScriptException("Not a directory: ${srcApi}", null)
     failOnError = false
     title = " greenDAO ${version} API"
     options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
-    excludes = ['de/greenrobot/dao/internal', 'de/greenrobot/dao/Internal*']
-    includes += srcApi.absolutePath
+
+    excludes = ['org/greenrobot/dao/internal', 'org/greenrobot/dao/Internal*']
+    def srcApi = project(':greendao-api').file('src/main/java/')
+    if (!srcApi.directory) throw new GradleScriptException("Not a directory: ${srcApi}", null)
+    source += srcApi
+    doLast {
+        copy {
+            from '../javadoc-style'
+            into "build/docs/javadoc/"
+        }
+    }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/DaoCore/src/main/java/org/greenrobot/greendao/internal/FastCursor.java b/DaoCore/src/main/java/org/greenrobot/greendao/internal/FastCursor.java
index 344a5abee..bab191208 100644
--- a/DaoCore/src/main/java/org/greenrobot/greendao/internal/FastCursor.java
+++ b/DaoCore/src/main/java/org/greenrobot/greendao/internal/FastCursor.java
@@ -182,6 +182,7 @@ public double getDouble(int columnIndex) {
         return window.getDouble(position, columnIndex);
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean isNull(int columnIndex) {
         return window.isNull(position, columnIndex);
diff --git a/DaoCore/src/main/java/org/greenrobot/greendao/rx/RxBase.java b/DaoCore/src/main/java/org/greenrobot/greendao/rx/RxBase.java
index 6a06041ab..47aa355c2 100644
--- a/DaoCore/src/main/java/org/greenrobot/greendao/rx/RxBase.java
+++ b/DaoCore/src/main/java/org/greenrobot/greendao/rx/RxBase.java
@@ -16,11 +16,9 @@
 
 package org.greenrobot.greendao.rx;
 
-import org.greenrobot.greendao.AbstractDao;
 import org.greenrobot.greendao.annotation.apihint.Experimental;
 import org.greenrobot.greendao.annotation.apihint.Internal;
 
-import java.util.List;
 import java.util.concurrent.Callable;
 
 import rx.Observable;
@@ -52,8 +50,6 @@ class RxBase {
 
     /**
      * The default scheduler (or null) used for wrapping.
-     *
-     * @return
      */
     @Experimental
     public Scheduler getScheduler() {
diff --git a/DaoExample/build.gradle b/DaoExample/build.gradle
index bc06c341b..7f7e5b41c 100644
--- a/DaoExample/build.gradle
+++ b/DaoExample/build.gradle
@@ -5,17 +5,13 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.2'
-        classpath 'org.greenrobot:greendao-gradle-plugin:3.0.0'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0'
     }
 }
 
 apply plugin: 'org.greenrobot.greendao'
 apply plugin: 'com.android.application'
 
-repositories {
-    mavenCentral()
-}
-
 android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
diff --git a/DaoGenerator/build.gradle b/DaoGenerator/build.gradle
index eb91e684a..7142bc737 100644
--- a/DaoGenerator/build.gradle
+++ b/DaoGenerator/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'signing'
 
 group = 'org.greenrobot'
 archivesBaseName = 'greendao-generator'
-version = '3.1.0-SNAPSHOT'
+version = '3.1.0'
 sourceCompatibility = 1.7
 
 repositories {
@@ -45,8 +45,14 @@ javadoc {
     failOnError = false
     title = "greenDAO Generator ${version} API"
     // Unfinished APIs:
-    excludes = ['de/greenrobot/daogenerator/Query*']
+    excludes = ['org/greenrobot/daogenerator/Query*']
     options.bottom = 'Available under the GPLv3 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
+    doLast {
+        copy {
+            from '../javadoc-style/'
+            into "build/docs/javadoc/"
+        }
+    }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/greendao-api/build.gradle b/greendao-api/build.gradle
index 9d63fb8ad..b1b04cbe6 100644
--- a/greendao-api/build.gradle
+++ b/greendao-api/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 group = 'org.greenrobot'
-version = '3.1.0-SNAPSHOT'
+version = '3.1.0'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -10,7 +10,12 @@ javadoc {
     failOnError = false
     title = " greenDAO API ${version} API"
     options.bottom = 'Available under the Apache License, Version 2.0 - <i>Copyright &#169; 2011-2016 <a href="http://greenrobot.org/">greenrobot.org</a>. All Rights Reserved.</i>'
-    excludes = ['de/greenrobot/dao/internal', 'de/greenrobot/dao/Internal*']
+    doLast {
+        copy {
+            from '../javadoc-style'
+            into "build/docs/javadoc/"
+        }
+    }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/javadoc-style/background.gif b/javadoc-style/background.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ec068a06a33ef106d7b41bce36211482ff9ccd68
GIT binary patch
literal 2313
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

literal 0
HcmV?d00001

diff --git a/javadoc-style/stylesheet.css b/javadoc-style/stylesheet.css
new file mode 100644
index 000000000..c12603afa
--- /dev/null
+++ b/javadoc-style/stylesheet.css
@@ -0,0 +1,574 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+
+body {
+    background-color:#ffffff;
+    color:#353833;
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+    text-decoration:none;
+    color:#4A6782;
+}
+a:hover, a:focus {
+    text-decoration:none;
+    color:#bb7a2a;
+}
+a:active {
+    text-decoration:none;
+    color:#4A6782;
+}
+a[name] {
+    color:#353833;
+}
+a[name]:hover {
+    text-decoration:none;
+    color:#353833;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#FFFFFF;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#bb7a2a;
+}
+.tab {
+    background-color:#0066FF;
+    color:#ffffff;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#4D974D;
+    color:#FFFFFF;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#4D974D;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px; 
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#4D974D;
+    color:#FFFFFF;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#dee3e9;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#FFFFFF;
+    text-decoration:none;
+    text-transform:uppercase;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:#bb7a2a;
+    text-transform:uppercase;
+}
+.navBarCell1Rev {
+    background-color:#F8981D;
+    color:#253441;
+    margin: auto 5px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:5px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#2c4557;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#dee3e9;
+    border:1px solid #d0d9e0;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #ededed; 
+    background-color:#f8f8f8;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    background-color:#ffffff;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border-left:1px solid #EEE; 
+    border-right:1px solid #EEE; 
+    border-bottom:1px solid #EEE; 
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    color:#FFFFFF;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    border: none;
+    height:16px;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#F8981D;
+    height:16px;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:#4D974D;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative; 
+    float:left;
+    background-color:#F8981D;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#4D974D;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+    width:100%;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#dee3e9;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+    font-size:13px;
+}
+td.colLast, th.colLast {
+    font-size:13px;
+}
+td.colOne, th.colOne {
+    font-size:13px;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#EEEEFF;
+}
+.altColor {
+    background-color:#FFFFFF;
+}
+.rowColor {
+    background-color:#EEEEEF;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+    color:#474747;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
diff --git a/settings.gradle b/settings.gradle
index 9375406bf..1914c7a8b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,8 +2,7 @@ include 'greendao-api'
 include 'DaoCore'
 include 'DaoGenerator'
 include 'tests'
-// Disable until new plugins are pushed:
-//include 'DaoExample'
+include 'DaoExample'
 
 include 'tests:DaoTestBase'
 include 'tests:DaoTest'
diff --git a/tests/DaoTestEntityAnnotation/build.gradle b/tests/DaoTestEntityAnnotation/build.gradle
index 274d06362..2ec0fa3a7 100644
--- a/tests/DaoTestEntityAnnotation/build.gradle
+++ b/tests/DaoTestEntityAnnotation/build.gradle
@@ -1,22 +1,17 @@
 buildscript {
     repositories {
-        mavenLocal()
         mavenCentral()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.2'
-        classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0-SNAPSHOT'
+        classpath 'org.greenrobot:greendao-gradle-plugin:3.1.0'
     }
 }
 
 apply plugin: 'org.greenrobot.greendao'
 apply plugin: 'com.android.application'
 
-repositories {
-    mavenCentral()
-}
-
 android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
diff --git a/tests/DaoTestEntityAnnotation/src/main/AndroidManifest.xml b/tests/DaoTestEntityAnnotation/src/main/AndroidManifest.xml
index 83e7c132e..fc236c441 100644
--- a/tests/DaoTestEntityAnnotation/src/main/AndroidManifest.xml
+++ b/tests/DaoTestEntityAnnotation/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.greenrobot.greendao.entityannotation">
+    package="org.greenrobot.greendao.test.entityannotation">
 
     <application
         android:name="org.greenrobot.greendao.test.entityannotation.App"
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 4a2a7f049..e8787e107 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
@@ -21,26 +21,28 @@ static class MyInnerTypeConverter implements PropertyConverter<MyInnerType, Long
 
         @Override
         public MyInnerType convertToEntityProperty(Long databaseValue) {
-            return databaseValue!=null? new MyInnerType(Long.toHexString(databaseValue)): null;
+            return databaseValue != null ? new MyInnerType(Long.toHexString(databaseValue)) : null;
         }
 
         @Override
         public Long convertToDatabaseValue(MyInnerType entityProperty) {
-            return entityProperty!= null? Long.parseLong(entityProperty.value, 16): null;
+            return entityProperty != null ? Long.parseLong(entityProperty.value, 16) : null;
         }
     }
 
     @Id
     Long id;
 
-    @Convert(converter = MyInnerTypeConverter.class, columnType = Long.class)
-    MyInnerType type;
+    // FIXME Remove "TypesInInnerClass."
+    @Convert(converter = TypesInInnerClass.MyInnerTypeConverter.class, columnType = Long.class)
+    TypesInInnerClass.MyInnerType type;
 
     public MyInnerType getType() {
         return this.type;
     }
 
-    public void setType(MyInnerType type) {
+    // FIXME Remove "TypesInInnerClass."
+    public void setType(TypesInInnerClass.MyInnerType type) {
         this.type = type;
     }
 
@@ -52,8 +54,8 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    @Generated(hash = 1322981681)
-    public TypesInInnerClass(Long id, MyInnerType type) {
+    @Generated(hash = 582873426)
+    public TypesInInnerClass(Long id, TypesInInnerClass.MyInnerType type) {
         this.id = id;
         this.type = type;
     }