[RELEASE] Merge DEVELOP into BETA

.editorconfig

@@ -0,0 +1,7 @@
+# Comma-separated list of rules to disable (Since 0.34.0)
+# Note that rules in any ruleset other than the standard ruleset will need to be prefixed
+# by the ruleset identifier.
+
+# Needed to disable due this missing improvement https://github.com/pinterest/ktlint/issues/527
+[*.kt]
+disabled_rules=import-ordering

common/build.gradle

@@ -12,24 +12,23 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
 
-    compile "se.ansman.kotshi:api:${versions.kotshi}"
+    implementation "se.ansman.kotshi:api:${versions.kotshi}"
     kapt "se.ansman.kotshi:compiler:${versions.kotshi}"
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    compile "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
 
-    compile "com.squareup.moshi:moshi:${versions.moshi}"
+    implementation "com.squareup.moshi:moshi:${versions.moshi}"
 
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
-    testCompile "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.12.0'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
-    testCompile 'com.github.luciofm:mockwebserver:852ce0b657'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
+    testImplementation "org.junit.jupiter:junit-jupiter:${versions.junit}"
+    testImplementation "org.mockito:mockito-core:${versions.mockitoCore}"
+    testImplementation "org.assertj:assertj-core:${versions.assertj}"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
 }
 
 compileKotlin {

common/src/main/kotlin/chat/rocket/common/CommonJsonAdapterFactory.kt

@@ -6,6 +6,6 @@ import se.ansman.kotshi.KotshiJsonAdapterFactory
 @KotshiJsonAdapterFactory
 abstract class CommonJsonAdapterFactory : JsonAdapter.Factory {
     companion object {
-        val INSTANCE: CommonJsonAdapterFactory = KotshiCommonJsonAdapterFactory()
+        val INSTANCE: CommonJsonAdapterFactory = KotshiCommonJsonAdapterFactory
     }
 }

common/src/main/kotlin/chat/rocket/common/internal/FallbackSealedClassJsonAdapter.kt

@@ -114,8 +114,8 @@ class FallbackSealedClassJsonAdapter<T>(private val classType: Class<T>,
         /**
          * Builds an adapter that can process sealed classes annotated with [FallbackSealedClass].
          */
-        val ADAPTER_FACTORY: JsonAdapter.Factory = JsonAdapter.Factory { type, annotations, moshi ->
-            if (!annotations.isEmpty()) return@Factory null
+        val ADAPTER_FACTORY: Factory = Factory { type, annotations, moshi ->
+            if (annotations.isNotEmpty()) return@Factory null
 
             val rawType = Types.getRawType(type)
             val annotation = rawType.getAnnotation(FallbackSealedClass::class.java) ?: return@Factory null

common/src/main/kotlin/chat/rocket/common/model/BaseRoom.kt

@@ -5,7 +5,7 @@ import com.squareup.moshi.Json
 
 interface BaseRoom {
     val id: String
-    val type: RoomType
+    val type: RoomType?
     val fullName: String?
     val user: SimpleUser?
     val readonly: Boolean?

common/src/main/kotlin/chat/rocket/common/model/Email.kt

@@ -1,10 +1,6 @@
 package chat.rocket.common.model
 
-import se.ansman.kotshi.JsonDefaultValueBoolean
 import se.ansman.kotshi.JsonSerializable
 
 @JsonSerializable
-data class Email(val address: String,
-                 @JsonDefaultValueBoolean(false)
-                 val verified: Boolean
-)
+data class Email(val address: String, val verified: Boolean)

compat/build.gradle

@@ -12,20 +12,20 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
+    implementation project (':core')
+    implementation project (':common')
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
 
-    compile project (':core')
+    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
-    testCompile "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.10.0'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
-    testCompile 'com.github.luciofm:mockwebserver:852ce0b657'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
+    testImplementation "org.junit.jupiter:junit-jupiter:${versions.junit}"
+    testImplementation "org.mockito:mockito-core:${versions.mockitoCore}"
+    testImplementation "org.assertj:assertj-core:${versions.assertj}"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
 }
 
 compileKotlin {

compat/src/main/kotlin/chat/rocket/core/compat/Call.kt

@@ -6,4 +6,4 @@ class Call(val job: Job) {
     fun cancel() {
         job.cancel()
     }
-}
+}

compat/src/main/kotlin/chat/rocket/core/compat/Server.kt

@@ -10,4 +10,4 @@ import kotlinx.coroutines.Dispatchers
  * Returns the current logged server information.
  * Must be used with a coroutine context (async, launch, etc)
  */
-fun RocketChatClient.serverInfo(future: Callback<ServerInfo>): Call = callback(Dispatchers.IO, future) { serverInfo() }
+fun RocketChatClient.serverInfo(future: Callback<ServerInfo>): Call = callback(Dispatchers.IO, future) { serverInfo() }

compat/src/main/kotlin/chat/rocket/core/compat/User.kt

@@ -10,4 +10,4 @@ import kotlinx.coroutines.Dispatchers
  * Returns the current logged user information, useful to check if the Token from TokenProvider
  * is still valid. Must be used with a coroutine context (async, launch, etc)
  */
-fun RocketChatClient.me(future: Callback<Myself>): Call = callback(Dispatchers.IO, future) { me() }
+fun RocketChatClient.me(future: Callback<Myself>): Call = callback(Dispatchers.IO, future) { me() }

compat/src/main/kotlin/chat/rocket/core/compat/internal/Callback.kt

@@ -6,13 +6,15 @@ import chat.rocket.core.compat.Callback
 import kotlinx.coroutines.AbstractCoroutine
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.newCoroutineContext
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.startCoroutine
 
+@ExperimentalCoroutinesApi
 @JvmOverloads
 fun <T> callback(
     context: CoroutineContext = Dispatchers.Default,
@@ -36,11 +38,11 @@ private class CallbackCoroutine<in T>(
         callback.onSuccess(value)
     }
 
-    override fun onCompletedExceptionally(exception: Throwable) {
-        if (exception is RocketChatException) {
-            callback.onError(exception)
+    override fun onCancelled(cause: Throwable, handled: Boolean) {
+        if (cause is RocketChatException) {
+            callback.onError(cause)
         } else {
-            callback.onError(RocketChatException(exception.message ?: "Unknown Error", exception))
+            callback.onError(RocketChatException(cause.message ?: "Unknown Error", cause))
         }
     }
 }

core/build.gradle

@@ -13,24 +13,27 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile project (':common')
+    implementation project (':common')
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
-    compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
+    implementation  "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
 
-    compile "se.ansman.kotshi:api:${versions.kotshi}"
+    implementation "se.ansman.kotshi:api:${versions.kotshi}"
     kapt "se.ansman.kotshi:compiler:${versions.kotshi}"
 
+    implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
+
     compileOnly 'org.json:json:20090211'
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
-    testCompile "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.12.0'
-    testCompile 'org.assertj:assertj-core:3.8.0'
-    testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
-    testCompile 'com.github.luciofm:mockwebserver:852ce0b657'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${versions.kotlin}"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}"
+    testImplementation "org.junit.jupiter:junit-jupiter:${versions.junit}"
+    testImplementation "org.mockito:mockito-core:${versions.mockitoCore}"
+    testImplementation "org.assertj:assertj-core:${versions.assertj}"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
+    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttpMockWebServer}"
+    testImplementation "io.fabric8:mockwebserver:${versions.mockWebServer}"
 }
 
 compileKotlin {

core/src/main/kotlin/chat/rocket/core/RocketChatClient.kt

@@ -11,13 +11,13 @@ import chat.rocket.common.util.NoOpLogger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.common.util.RealLogger
 import chat.rocket.common.util.ifNull
-import chat.rocket.core.internal.RestResult
-import chat.rocket.core.internal.RestMultiResult
-import chat.rocket.core.internal.SettingsAdapter
 import chat.rocket.core.internal.AttachmentAdapterFactory
-import chat.rocket.core.internal.RoomListAdapterFactory
 import chat.rocket.core.internal.CoreJsonAdapterFactory
 import chat.rocket.core.internal.ReactionsAdapter
+import chat.rocket.core.internal.RestMultiResult
+import chat.rocket.core.internal.RestResult
+import chat.rocket.core.internal.RoomListAdapterFactory
+import chat.rocket.core.internal.SettingsAdapter
 import chat.rocket.core.internal.model.Subscription
 import chat.rocket.core.internal.realtime.socket.Socket
 import chat.rocket.core.internal.realtime.socket.model.State
@@ -27,14 +27,18 @@ import chat.rocket.core.model.Myself
 import chat.rocket.core.model.Room
 import chat.rocket.core.model.url.MetaJsonAdapter
 import com.squareup.moshi.Moshi
+import java.security.InvalidParameterException
+import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
 import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
-import java.security.InvalidParameterException
-import kotlin.coroutines.CoroutineContext
+
+val CONTENT_TYPE_JSON = "application/json; charset=utf-8".toMediaTypeOrNull()
+fun createRocketChatClient(init: RocketChatClient.Builder.() -> Unit) = RocketChatClient.Builder(init).build()
 
 class RocketChatClient private constructor(
     internal val httpClient: OkHttpClient,
@@ -77,7 +81,7 @@ class RocketChatClient private constructor(
         url = sanitizeUrl(baseUrl)
         agent = userAgent
 
-        HttpUrl.parse(url)?.let {
+        url.toHttpUrlOrNull()?.let {
             restUrl = it
         }.ifNull {
             throw InvalidParameterException("You must pass a valid HTTP or HTTPS URL")
@@ -109,12 +113,6 @@ class RocketChatClient private constructor(
         builder.tokenRepository,
         if (builder.enableLogger) RealLogger(builder.platformLogger, builder.restUrl) else NoOpLogger)
 
-    companion object {
-        val CONTENT_TYPE_JSON = MediaType.parse("application/json; charset=utf-8")
-
-        fun create(init: Builder.() -> Unit) = Builder(init).build()
-    }
-
     class Builder private constructor() {
 
         constructor(init: Builder.() -> Unit) : this() {

core/src/main/kotlin/chat/rocket/core/TokenRepository.kt

@@ -9,4 +9,4 @@ interface TokenRepository {
     fun save(url: String, token: Token)
 
     fun get(url: String): Token?
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/AttachmentAdapter.kt

@@ -5,13 +5,13 @@ import chat.rocket.common.util.Logger
 import chat.rocket.core.model.attachment.Attachment
 import chat.rocket.core.model.attachment.Color
 import chat.rocket.core.model.attachment.Field
+import chat.rocket.core.model.attachment.actions.Action
+import chat.rocket.core.model.attachment.actions.ButtonAction
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ButtonAction
 import java.lang.reflect.Type
 
 class AttachmentAdapter(moshi: Moshi, private val logger: Logger) : JsonAdapter<Attachment>() {
@@ -359,4 +359,4 @@ fun JsonReader.nextBooleanOrFalse(): Boolean {
         return false
     }
     return nextBoolean()
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/CoreJsonAdapterFactory.kt

@@ -6,6 +6,6 @@ import se.ansman.kotshi.KotshiJsonAdapterFactory
 @KotshiJsonAdapterFactory
 abstract class CoreJsonAdapterFactory : JsonAdapter.Factory {
     companion object {
-        val INSTANCE: CoreJsonAdapterFactory = KotshiCoreJsonAdapterFactory()
+        val INSTANCE: CoreJsonAdapterFactory = KotshiCoreJsonAdapterFactory
     }
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/ReactionsAdapter.kt

@@ -4,8 +4,8 @@ import chat.rocket.core.model.Reactions
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
-import com.squareup.moshi.ToJson
 import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
 
 class ReactionsAdapter : JsonAdapter<Reactions>() {
 
@@ -97,4 +97,4 @@ class ReactionsAdapter : JsonAdapter<Reactions>() {
             endObject()
         }
     }
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/RoomListAdapter.kt

@@ -64,4 +64,4 @@ internal class RoomListAdapterFactory(private val logger: Logger) : JsonAdapter.
 
         return null
     }
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/SettingsAdapter.kt

@@ -154,4 +154,4 @@ class SettingsAdapter : JsonAdapter<Map<String, Value<Any>>>() {
             throw JsonEncodingException("expected a \"$expected\" value, got \"$name\"")
         }
     }
-}
+}

core/src/main/kotlin/chat/rocket/core/internal/model/CasLoginPayload.kt

@@ -6,4 +6,4 @@ import se.ansman.kotshi.JsonSerializable
 data class CasLoginPayload(val cas: CasData)
 
 @JsonSerializable
-data class CasData(val credentialToken: String)
+data class CasData(val credentialToken: String)

core/src/main/kotlin/chat/rocket/core/internal/model/ChatRoomPayload.kt

@@ -46,4 +46,4 @@ data class ChatRoomJoinCodePayload(val roomId: String, val joinCode: String)
 data class ChatRoomKickPayload(val roomId: String, val userId: String)
 
 @JsonSerializable
-data class ChatRoomFavoritePayload(val roomId: String, val favorite: Boolean)
+data class ChatRoomFavoritePayload(val roomId: String, val favorite: Boolean)

core/src/main/kotlin/chat/rocket/core/internal/model/CommandPayload.kt

@@ -7,4 +7,4 @@ data class CommandPayload(
     val command: String,
     val roomId: String,
     val params: String?
-)
+)

core/src/main/kotlin/chat/rocket/core/internal/model/ConfigurationsPayload.kt

@@ -3,4 +3,4 @@ package chat.rocket.core.internal.model
 import se.ansman.kotshi.JsonSerializable
 
 @JsonSerializable
-data class ConfigurationsPayload(val configurations: List<Map<String, String>>)
+data class ConfigurationsPayload(val configurations: List<Map<String, String>>)

core/src/main/kotlin/chat/rocket/core/internal/model/CreateNewChannelPayload.kt

@@ -8,4 +8,4 @@ data class CreateNewChannelPayload(
     @Json(name = "name") val channelName: String,
     @Json(name = "members") val membersToInvite: List<String>?,
     val readOnly: Boolean?
-)
+)

core/src/main/kotlin/chat/rocket/core/internal/model/DeletePayload.kt

@@ -7,4 +7,4 @@ data class DeletePayload(
     val roomId: String,
     val msgId: String,
     val asUser: Boolean = false
-)
+)

core/src/main/kotlin/chat/rocket/core/internal/model/EmailLoginPayload.kt

@@ -7,4 +7,4 @@ data class EmailLoginPayload(
     val user: String,
     val password: String,
     val code: String? = null
-)
+)

core/src/main/kotlin/chat/rocket/core/internal/model/ForgotPasswordPayload.kt

@@ -3,4 +3,4 @@ package chat.rocket.core.internal.model
 import se.ansman.kotshi.JsonSerializable
 
 @JsonSerializable
-data class ForgotPasswordPayload(val email: String?)
+data class ForgotPasswordPayload(val email: String?)