Update build tools

* Gradle 4.8
* Android Gradle plugin 3.1.3
* Ktlint Gradle plugin 4.0.0
* Ktlint 0.23.1

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
@@ -18,28 +18,22 @@ buildscript {
 }
 
 plugins {
-    id 'org.jlleitschuh.gradle.ktlint' version '2.2.0'
+    id 'org.jlleitschuh.gradle.ktlint' version '4.0.0'
 }
 
 ktlint {
-    version = '0.9.2'
+    version = '0.23.1'
 }
 
-allprojects {
+subprojects {
     apply plugin: 'org.kordamp.gradle.stats'
     apply plugin: "com.jfrog.artifactory"
     group = 'com.tinder.scarlet'
 
     repositories {
-        mavenCentral()
-        maven { url "https://jitpack.io" }
         google()
         jcenter()
     }
 }
 
-clean {
-    delete rootProject.buildDir
-}
-
-apply from: rootProject.file('dependencies.gradle')
+apply from: rootProject.file('dependencies.gradle')

demo/build.gradle

@@ -3,8 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 repositories {
-    mavenCentral()
-    google()
+    maven { url 'https://jitpack.io' }
 }
 
 android {

demo/src/main/java/com/tinder/app/echo/domain/AuthStatusRepository.kt

@@ -19,5 +19,4 @@ class AuthStatusRepository @Inject constructor() {
     fun observeAuthStatus(): Flowable<AuthStatus> = authStatusProcessor
 
     fun updateAuthStatus(authStatus: AuthStatus) = authStatusProcessor.onNext(authStatus)
-
 }

demo/src/main/java/com/tinder/app/echo/domain/LoggedInLifecycle.kt

@@ -27,5 +27,4 @@ class LoggedInLifecycle constructor(
             }
             .subscribe(lifecycleRegistry)
     }
-
 }

demo/src/main/java/com/tinder/app/echo/inject/EchoBotComponent.kt

@@ -67,5 +67,4 @@ interface EchoBotComponent {
     interface ComponentProvider {
         val echoBotComponent: EchoBotComponent
     }
-
 }

demo/src/main/java/com/tinder/app/gdax/domain/TransactionBook.kt

@@ -16,5 +16,4 @@ class TransactionBook(
         newHistory.transactions[product] = (newHistory.transactions[product] ?: emptyList()) + transaction
         return newHistory
     }
-
 }

demo/src/main/java/com/tinder/app/gdax/domain/TransactionRepository.kt

@@ -68,5 +68,4 @@ class TransactionRepository @Inject constructor(
         transactionBookRef.set(transactionBook)
         transactionBookProcessor.onNext(transactionBook)
     }
-
 }

demo/src/main/java/com/tinder/app/gdax/inject/GdaxComponent.kt

@@ -73,5 +73,4 @@ interface GdaxComponent {
     interface ComponentProvider {
         val gdaxComponent: GdaxComponent
     }
-
 }

demo/src/main/java/com/tinder/app/gdax/target/GdaxTarget.kt

@@ -10,5 +10,4 @@ import com.tinder.app.gdax.domain.Transaction
 interface GdaxTarget {
 
     fun showTransactions(product: Product, transactions: List<Transaction>)
-
 }

demo/src/main/java/com/tinder/app/root/ScarletDemoApplication.kt

@@ -46,5 +46,4 @@ class ScarletDemoApplication : Application(),
         Timber.plant(Timber.DebugTree())
         Stetho.initialize(stethoInitializer)
     }
-
 }

demo/src/main/java/com/tinder/app/root/inject/CommonModule.kt

@@ -16,5 +16,4 @@ class CommonModule {
     fun provideApplicationContext(application: Application): Context {
         return application
     }
-
 }

demo/src/main/java/com/tinder/app/root/inject/StethoModule.kt

@@ -43,5 +43,4 @@ class StethoModule {
     internal fun provideInspectorModulesProvider(application: Application): InspectorModulesProvider {
         return Stetho.defaultInspectorModulesProvider(application)
     }
-
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

scarlet-core-internal/src/test/java/com/tinder/scarlet/utils/FlowableStreamTest.kt

@@ -71,5 +71,4 @@ internal class FlowableStreamTest {
         // Then
         assertThat(processor.hasSubscribers()).isFalse()
     }
-
 }

scarlet-core/src/main/java/com/tinder/scarlet/Lifecycle.kt

@@ -45,4 +45,3 @@ interface Lifecycle : Publisher<Lifecycle.State> {
         object Destroyed : State()
     }
 }
-

scarlet-core/src/main/java/com/tinder/scarlet/Stream.kt

@@ -40,5 +40,4 @@ interface Stream<T> : Publisher<T> {
 
         fun isDisposed(): Boolean
     }
-
 }

scarlet-core/src/main/java/com/tinder/scarlet/StreamAdapter.kt

@@ -28,6 +28,5 @@ interface StreamAdapter<T, out R> {
          * handled by this factory.
          */
         fun create(type: Type): StreamAdapter<Any, Any>
-
     }
 }

scarlet-core/src/main/java/com/tinder/scarlet/WebSocket.kt

@@ -79,5 +79,4 @@ interface WebSocket {
     interface Factory {
         fun create(): WebSocket
     }
-
 }

scarlet-core/src/test/java/com/tinder/scarlet/utils/TypeUtilsTest.kt

@@ -70,7 +70,6 @@ internal class TypeUtilsTest {
             private fun param(type: Type, expectedHasUnresolvableType: Boolean) =
                 arrayOf(type, expectedHasUnresolvableType)
         }
-
     }
 
     @RunWith(Parameterized::class)
@@ -102,7 +101,6 @@ internal class TypeUtilsTest {
             private fun param(type: ParameterizedType, expectedParameterUpperBound: Array<Type>) =
                 arrayOf(type, expectedParameterUpperBound)
         }
-
     }
 
     private companion object {
@@ -146,5 +144,4 @@ internal class TypeUtilsTest {
             }
         }
     }
-
 }

scarlet-message-adapter-builtin/src/main/java/com/tinder/scarlet/messageadapter/builtin/BuiltInMessageAdapterFactory.kt

@@ -15,5 +15,4 @@ class BuiltInMessageAdapterFactory : MessageAdapter.Factory {
         ByteArray::class.java -> ByteArrayMessageAdapter()
         else -> throw IllegalArgumentException("Type is not supported by this MessageAdapterFactory: $type")
     }
-
 }

scarlet-message-adapter-builtin/src/main/java/com/tinder/scarlet/messageadapter/builtin/ByteArrayMessageAdapter.kt

@@ -15,5 +15,4 @@ class ByteArrayMessageAdapter : MessageAdapter<ByteArray> {
     }
 
     override fun toMessage(data: ByteArray): Message = Message.Bytes(data)
-
 }

scarlet-message-adapter-builtin/src/main/java/com/tinder/scarlet/messageadapter/builtin/TextMessageAdapter.kt

@@ -15,5 +15,4 @@ class TextMessageAdapter : MessageAdapter<String> {
     }
 
     override fun toMessage(data: String): Message = Message.Text(data)
-
 }

scarlet-message-adapter-builtin/src/test/java/com/tinder/scarlet/messageadapter/builtin/BuiltInMessageAdapterFactoryTest.kt

@@ -51,5 +51,4 @@ internal class BuiltInMessageAdapterFactoryTest {
             Collection::class.java
         )
     }
-
 }

scarlet-message-adapter-builtin/src/test/java/com/tinder/scarlet/messageadapter/builtin/ByteArrayMessageAdapterTest.kt

@@ -38,5 +38,4 @@ internal class ByteArrayMessageAdapterTest {
         val (adaptedBytes) = (adaptedMessage as Message.Bytes)
         assertThat(adaptedBytes).isEqualTo(bytes)
     }
-
 }

scarlet-message-adapter-builtin/src/test/java/com/tinder/scarlet/messageadapter/builtin/TextMessageAdapterTest.kt

@@ -37,5 +37,4 @@ internal class TextMessageAdapterTest {
         // Then
         assertThat(adaptedMessage).isEqualTo(textMessage)
     }
-
 }

scarlet-message-adapter-gson/src/main/java/com/tinder/scarlet/messageadapter/gson/GsonMessageAdapter.kt

@@ -55,5 +55,4 @@ class GsonMessageAdapter<T> private constructor(
             private val DEFAULT_GSON = Gson()
         }
     }
-
 }

scarlet-message-adapter-gson/src/test/java/com/tinder/scarlet/messageadapter/gson/GsonMessageAdapterTest.kt

@@ -10,17 +10,17 @@ import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonToken
 import com.google.gson.stream.JsonWriter
-import com.tinder.scarlet.WebSocket.Event
+import com.tinder.scarlet.Lifecycle
 import com.tinder.scarlet.Message
 import com.tinder.scarlet.MessageAdapter
 import com.tinder.scarlet.Scarlet
 import com.tinder.scarlet.Stream
-import com.tinder.scarlet.Lifecycle
+import com.tinder.scarlet.WebSocket.Event
 import com.tinder.scarlet.lifecycle.LifecycleRegistry
 import com.tinder.scarlet.testutils.TestStreamObserver
+import com.tinder.scarlet.testutils.any
 import com.tinder.scarlet.testutils.containingText
 import com.tinder.scarlet.testutils.test
-import com.tinder.scarlet.testutils.any
 import com.tinder.scarlet.websocket.mockwebserver.newWebSocketFactory
 import com.tinder.scarlet.websocket.okhttp.newWebSocketFactory
 import com.tinder.scarlet.ws.Receive
@@ -225,7 +225,6 @@ internal class GsonMessageAdapterTest {
                     else -> throw IllegalArgumentException("$type is not supported.")
                 }
             }
-
         }
 
         internal interface Service {
@@ -244,7 +243,5 @@ internal class GsonMessageAdapterTest {
             @Send
             fun sendAnInterface(impl: AnInterface): Boolean
         }
-
     }
-
 }

scarlet-message-adapter-moshi/src/main/java/com/tinder/scarlet/messageadapter/moshi/MoshiMessageAdapter.kt

@@ -83,7 +83,6 @@ class MoshiMessageAdapter<T> private constructor(
             val serializeNull: Boolean = false,
             val failOnUnknown: Boolean = false
         )
-
     }
 
     private companion object {

scarlet-message-adapter-moshi/src/test/java/com/tinder/scarlet/messageadapter/moshi/MoshiMessageAdapterTest.kt

@@ -302,7 +302,8 @@ internal class MoshiMessageAdapterTest {
 
         class VerifyJsonQualifierJsonAdapterFactory : JsonAdapter.Factory {
             override fun create(
-                type: Type, annotations: Set<Annotation>,
+                type: Type,
+                annotations: Set<Annotation>,
                 moshi: Moshi
             ): JsonAdapter<*>? {
                 for (annotation in annotations) {
@@ -381,7 +382,5 @@ internal class MoshiMessageAdapterTest {
             @NonQualifer
             fun observeAnnotatedString(): Stream<String>
         }
-
     }
-
 }

scarlet-message-adapter-protobuf/src/test/java/com/tinder/scarlet/messageadapter/protobuf/ProtobufMessageAdapterTest.kt

@@ -218,6 +218,5 @@ internal class ProtobufMessageAdapterTest {
             @Receive
             fun receiveWrongClassDeserialization(): Stream<Deserialization<String>>
         }
-
     }
 }

scarlet-stream-adapter-builtin/src/main/java/com/tinder/scarlet/streamadapter/builtin/BuiltInStreamAdapterFactory.kt

@@ -15,5 +15,4 @@ class BuiltInStreamAdapterFactory : StreamAdapter.Factory {
         Stream::class.java -> IdentityStreamAdapter()
         else -> throw IllegalArgumentException("$type is not supported.")
     }
-
 }

scarlet-stream-adapter-builtin/src/main/java/com/tinder/scarlet/streamadapter/builtin/IdentityStreamAdapter.kt

@@ -10,5 +10,4 @@ import com.tinder.scarlet.StreamAdapter
 class IdentityStreamAdapter<T> : StreamAdapter<T, Stream<T>> {
 
     override fun adapt(stream: Stream<T>): Stream<T> = stream
-
 }

scarlet-stream-adapter-builtin/src/test/java/com/tinder/scarlet/streamadapter/builtin/BuiltInStreamAdapterFactoryTest.kt

@@ -44,5 +44,4 @@ internal class BuiltInStreamAdapterFactoryTest {
             Collection::class.java
         )
     }
-
 }

scarlet-stream-adapter-builtin/src/test/java/com/tinder/scarlet/streamadapter/builtin/IdentityStreamAdapterTest.kt

@@ -24,5 +24,4 @@ internal class IdentityStreamAdapterTest {
         // Then
         assertThat(adaptedStream).isSameAs(stream)
     }
-
 }

scarlet-stream-adapter-rxjava/src/main/java/com/tinder/scarlet/streamadapter/rxjava/ObservableStreamAdapter.kt

@@ -35,5 +35,4 @@ class ObservableStreamAdapter<T> : StreamAdapter<T, Observable<T>> {
             }
         }
     }
-
 }

scarlet-stream-adapter-rxjava/src/main/java/com/tinder/scarlet/streamadapter/rxjava/RxJavaStreamAdapterFactory.kt

@@ -18,5 +18,4 @@ class RxJavaStreamAdapterFactory : StreamAdapter.Factory {
         Observable::class.java -> ObservableStreamAdapter()
         else -> throw IllegalArgumentException()
     }
-
 }

scarlet-stream-adapter-rxjava2/src/main/java/com/tinder/scarlet/streamadapter/rxjava2/FlowableStreamAdapter.kt

@@ -11,5 +11,4 @@ import io.reactivex.Flowable
 class FlowableStreamAdapter<T> : StreamAdapter<T, Flowable<T>> {
 
     override fun adapt(stream: Stream<T>): Flowable<T> = Flowable.fromPublisher(stream)
-
 }

scarlet-stream-adapter-rxjava2/src/main/java/com/tinder/scarlet/streamadapter/rxjava2/ObservableStreamAdapter.kt

@@ -11,5 +11,4 @@ import io.reactivex.Observable
 class ObservableStreamAdapter<T> : StreamAdapter<T, Observable<T>> {
 
     override fun adapt(stream: Stream<T>): Observable<T> = Observable.fromPublisher(stream)
-
 }

scarlet-stream-adapter-rxjava2/src/test/java/com/tinder/scarlet/streamadapter/rxjava2/ObservableTest.kt

@@ -140,5 +140,4 @@ class ObservableTest {
         @Send
         fun sendBytesAndConfirm(message: ByteArray): Boolean
     }
-
 }

scarlet-websocket-mockwebserver/src/main/java/com/tinder/scarlet/websocket/mockwebserver/MockWebServerOkHttpWebSocketConnectionEstablisher.kt

@@ -16,5 +16,4 @@ class MockWebServerOkHttpWebSocketConnectionEstablisher(
     override fun establishConnection(webSocketListener: WebSocketListener) {
         mockWebServer.enqueue(MockResponse().withWebSocketUpgrade(webSocketListener))
     }
-
 }

scarlet-websocket-mockwebserver/src/main/java/com/tinder/scarlet/websocket/mockwebserver/MockWebServerUtils.kt

@@ -12,4 +12,3 @@ import okhttp3.mockwebserver.MockWebServer
 
 fun MockWebServer.newWebSocketFactory(): WebSocket.Factory =
     OkHttpWebSocket.Factory(MockWebServerOkHttpWebSocketConnectionEstablisher(this))
-

scarlet-websocket-okhttp/src/main/java/com/tinder/scarlet/websocket/okhttp/OkHttpClientWebSocketConnectionEstablisher.kt

@@ -17,5 +17,4 @@ class OkHttpClientWebSocketConnectionEstablisher(
         val request = requestFactory.createRequest()
         okHttpClient.newWebSocket(request, webSocketListener)
     }
-
 }

scarlet-websocket-okhttp/src/main/java/com/tinder/scarlet/websocket/okhttp/OkHttpWebSocketEventObserver.kt

@@ -37,5 +37,4 @@ internal class OkHttpWebSocketEventObserver : WebSocketListener() {
 
     override fun onFailure(webSocket: okhttp3.WebSocket, t: Throwable, response: Response?) =
         processor.onNext(WebSocket.Event.OnConnectionFailed(t))
-
 }

scarlet-websocket-okhttp/src/main/java/com/tinder/scarlet/websocket/okhttp/request/StaticUrlRequestFactory.kt

@@ -16,5 +16,4 @@ internal class StaticUrlRequestFactory(
     override fun createRequest(): Request = Request.Builder()
         .url(url)
         .build()
-
 }

scarlet-websocket-okhttp/src/test/java/com/tinder/scarlet/websocket/okhttp/OkHttpWebSocketEventObserverTest.kt

@@ -51,5 +51,4 @@ internal class OkHttpWebSocketEventObserverTest {
             WebSocket.Event.OnConnectionFailed(throwable)
         )
     }
-
 }

scarlet-websocket-okhttp/src/test/java/com/tinder/scarlet/websocket/okhttp/OkHttpWebSocketIntegrationTest.kt

@@ -233,5 +233,4 @@ internal class OkHttpWebSocketIntegrationTest {
         @Send
         fun sendBytesAndConfirm(message: ByteArray): Boolean
     }
-
 }

scarlet-websocket-okhttp/src/test/java/com/tinder/scarlet/websocket/okhttp/OkHttpWebSocketTest.kt

@@ -180,5 +180,4 @@ internal class OkHttpWebSocketTest {
         // Then
         then(webSocketHolder).should().cancel()
     }
-
 }

scarlet-websocket-okhttp/src/test/java/com/tinder/scarlet/websocket/okhttp/request/StaticUrlRequestFactoryTest.kt

@@ -21,5 +21,4 @@ internal class StaticUrlRequestFactoryTest {
         // Then
         assertThat(request1.url()).isEqualTo(request2.url())
     }
-
 }

scarlet/src/main/java/com/tinder/scarlet/Scarlet.kt

@@ -199,5 +199,4 @@ class Scarlet internal constructor(
             private val DEFAULT_SCHEDULER = Schedulers.computation() // TODO same thread option for debugging
         }
     }
-
 }