Move Rx3 Kotlin extensions to Rx3 module.

Author: greenrobot-team

build.gradle

@@ -21,6 +21,8 @@ buildscript {
 
         junit_version = '4.13'
         mockito_version = '3.3.3'
+        kotlin_version = '1.3.61'
+        dokka_version = '0.10.1'
 
         println "version=$ob_version"
         println "objectboxNativeDependency=$ob_native_dep"
@@ -35,6 +37,8 @@ buildscript {
     }
 
     dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.0.5"
     }
 }

objectbox-kotlin/build.gradle

@@ -1,17 +1,5 @@
 buildscript {
     ext.javadocDir = "$buildDir/docs/javadoc"
-    ext.kotlin_version = '1.3.61'
-    ext.dokka_version = '0.10.1'
-
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
-    }
 }
 
 apply plugin: 'kotlin'

objectbox-rxjava3/build.gradle

@@ -1,19 +1,50 @@
+buildscript {
+    ext.javadocDir = "$buildDir/docs/javadoc"
+}
+
 apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'org.jetbrains.dokka'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
+// Produce Java 8 byte code, would default to Java 6.
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dokka {
+    outputFormat = 'html'
+    outputDirectory = javadocDir
+
+    // Fix "Can't find node by signature": have to manually point to dependencies.
+    // https://github.com/Kotlin/dokka/wiki/faq#dokka-complains-about-cant-find-node-by-signature-
+    configuration{
+        externalDocumentationLink {
+            // Point to web javadoc for objectbox-java packages.
+            url = new URL("https://objectbox.io/docfiles/java/current/")
+            // Note: Using JDK 9+ package-list is now called element-list.
+            packageListUrl = new URL(url, "element-list")
+        }
+    }
+}
+
 dependencies {
     compile project(':objectbox-java')
     compile 'io.reactivex.rxjava3:rxjava:3.0.1'
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
+    testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testCompile "junit:junit:$junit_version"
     testCompile "org.mockito:mockito-core:$mockito_version"
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+task javadocJar(type: Jar, dependsOn: dokka) {
     classifier = 'javadoc'
-    from 'build/docs/javadoc'
+    from "$javadocDir"
 }
 
 task sourcesJar(type: Jar) {

objectbox-kotlin/src/main/kotlin/io/objectbox/kotlin/Query.kt renamed to objectbox-rxjava3/src/main/java/io/objectbox/rx3/Query.kt

@@ -1,7 +1,6 @@
-package io.objectbox.kotlin
+package io.objectbox.rx3
 
 import io.objectbox.query.Query
-import io.objectbox.rx3.RxQuery
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable

objectbox-rxjava3/src/test/java/io/objectbox/rx3/QueryKtxTest.kt

@@ -0,0 +1,30 @@
+package io.objectbox.rx3
+
+import io.objectbox.query.Query
+import org.junit.Assert.assertNotNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnitRunner
+
+@RunWith(MockitoJUnitRunner::class)
+class QueryKtxTest {
+
+    @Test
+    fun flowableFromQuery() {
+        val observable = Mockito.mock(Query::class.java).flowableOneByOne()
+        assertNotNull(observable)
+    }
+
+    @Test
+    fun observableFromQuery() {
+        val observable = Mockito.mock(Query::class.java).observable()
+        assertNotNull(observable)
+    }
+
+    @Test
+    fun singleFromQuery() {
+        val observable = Mockito.mock(Query::class.java).single()
+        assertNotNull(observable)
+    }
+}