V3.1.0, javadoc fixes and styling, clean up

greenrobot · Aug 3, 2016 · 6ff4ac4 · 6ff4ac4
1 parent c8f7167
commit 6ff4ac4
Show file tree

Hide file tree

Showing 12 changed files with 615 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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