Updated it to work in the new Android Studio version

app/build.gradle.kts

@@ -43,19 +43,22 @@ android {
 
     signingConfig = signingConfigs.getByName("default")
 
+    resConfigs("en")
+
+    vectorDrawables.useSupportLibrary = true
+
     setProperty("archivesBaseName", "QuasselDroidNG-$versionName")
 
     javaCompileOptions {
       annotationProcessorOptions {
-        arguments = mapOf(
-          "room.schemaLocation" to "$projectDir/schemas"
-        )
+        arguments = mapOf("room.schemaLocation" to "$projectDir/schemas")
       }
     }
 
-    vectorDrawables.useSupportLibrary = true
-
-    resConfigs("en")
+    // Disable test runner analytics
+    testInstrumentationRunnerArguments = mapOf(
+      "disableAnalytics" to "true"
+    )
   }
 
   buildTypes {
@@ -86,9 +89,9 @@ android {
 }
 
 val appCompatVersion = "26.1.0"
-val appArchVersion = "1.0.0-alpha9-1"
+val appArchVersion = "1.0.0-rc1"
 dependencies {
-  implementation(kotlin("stdlib"))
+  implementation(kotlin("stdlib", "1.1.51"))
 
   implementation(appCompat("design"))
   implementation(appCompat("customtabs"))
@@ -100,7 +103,6 @@ dependencies {
 
   implementation("io.reactivex.rxjava2:rxjava:2.1.3")
 
-  implementation(appArch("lifecycle", "runtime", version = "1.0.0"))
   implementation(appArch("lifecycle", "extensions"))
   implementation(appArch("lifecycle", "reactivestreams"))
   kapt(appArch("lifecycle", "compiler"))
@@ -108,23 +110,25 @@ dependencies {
   implementation(appArch("persistence.room", "runtime"))
   kapt(appArch("persistence.room", "compiler"))
 
-  implementation(appArch("paging", "runtime", version = "1.0.0-alpha1")) {
+  implementation(appArch("paging", "runtime", version = "1.0.0-alpha3")) {
     exclude(group = "junit", module = "junit")
   }
 
   implementation("org.threeten:threetenbp:1.3.6")
 
-  implementation("com.jakewharton:butterknife:8.7.0")
-  kapt("com.jakewharton:butterknife-compiler:8.7.0")
+  implementation("com.jakewharton:butterknife:8.8.1")
+  kapt("com.jakewharton:butterknife-compiler:8.8.1")
 
   implementation(project(":lib"))
   implementation(project(":malheur"))
 
-  testImplementation("android.arch.persistence.room:testing:1.0.0-alpha9")
+  testImplementation(appArch("persistence.room", "testing"))
   testImplementation("junit:junit:4.12")
 
-  androidTestImplementation("com.android.support.test:runner:0.5")
-  androidTestImplementation("com.android.support.test:rules:0.5")
+  androidTestImplementation("com.android.support.test:runner:1.0.1")
+  androidTestImplementation("com.android.support.test:rules:1.0.1")
+
+  androidTestImplementation("com.android.support.test.espresso:espresso-core:3.0.1")
 }
 
 tasks.withType(KotlinCompile::class.java) {

app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SlideFragment.kt

@@ -22,14 +22,14 @@ abstract class SlideFragment : Fragment() {
   protected abstract fun isValid(): Boolean
 
   val valid = object : MutableLiveData<Boolean>() {
-    override fun observe(owner: LifecycleOwner?, observer: Observer<Boolean>?) {
+    override fun observe(owner: LifecycleOwner, observer: Observer<Boolean>) {
       super.observe(owner, observer)
-      observer?.onChanged(value)
+      observer.onChanged(value)
     }
 
-    override fun observeForever(observer: Observer<Boolean>?) {
+    override fun observeForever(observer: Observer<Boolean>) {
       super.observeForever(observer)
-      observer?.onChanged(value)
+      observer.onChanged(value)
     }
   }
 
@@ -44,15 +44,12 @@ abstract class SlideFragment : Fragment() {
     viewGroup.addView(onCreateContent(inflater, viewGroup, savedInstanceState))
 
     view.findViewById<TextView>(R.id.title)?.setText(title)
-    view.findViewById<CollapsingToolbarLayout>(R.id.collapsingToolbar)?.title = resources.getString(
-      title)
+    view.findViewById<CollapsingToolbarLayout>(R.id.collapsingToolbar)?.title =
+      resources.getString(title)
     view.findViewById<TextView>(R.id.description).setText(description)
 
-    val data = initData
-    if (data != null)
-      setData(data)
-    if (savedInstanceState != null)
-      setData(savedInstanceState)
+    initData?.let(this::setData)
+    savedInstanceState?.let(this::setData)
     updateValidity()
 
     return view

app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataHelper.kt

@@ -18,12 +18,10 @@ inline fun <X, Y> LiveData<X?>.switchMap(
       if (mSource === newLiveData) {
         return
       }
-      if (mSource != null) {
-        result.removeSource(mSource)
-      }
+      mSource?.let(result::removeSource)
       mSource = newLiveData
-      if (mSource != null) {
-        result.addSource(mSource) { y -> result.value = y }
+      if (newLiveData != null) {
+        result.addSource(newLiveData) { y -> result.value = y }
       } else {
         result.value = null
       }
@@ -46,12 +44,10 @@ inline fun <X, Y> LiveData<X?>.switchMapRx(
       if (mSource === newLiveData) {
         return
       }
-      if (mSource != null) {
-        result.removeSource(mSource)
-      }
+      mSource?.let(result::removeSource)
       mSource = newLiveData
-      if (mSource != null) {
-        result.addSource(mSource) { y -> result.value = y }
+      if (newLiveData != null) {
+        result.addSource(newLiveData) { y -> result.value = y }
       } else {
         result.value = null
       }

build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath("com.android.tools.build:gradle:3.0.0-rc1")
+    classpath("com.android.tools.build:gradle:3.0.0-rc2")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.51")
     classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.1.51")
   }

lib/src/test/java/de/kuschku/libquassel/ConnectionUnitTest.kt

 package de.kuschku.libquassel
 
-import de.kuschku.libquassel.protocol.*
+import de.kuschku.libquassel.protocol.ClientData
+import de.kuschku.libquassel.protocol.Protocol
+import de.kuschku.libquassel.protocol.Protocol_Feature
+import de.kuschku.libquassel.protocol.Quassel_Feature
 import de.kuschku.libquassel.quassel.ProtocolFeature
 import de.kuschku.libquassel.quassel.QuasselFeature
 import de.kuschku.libquassel.session.Session
@@ -28,7 +31,7 @@ class ConnectionUnitTest {
     runTest("localhost", 4242, "user", "pass")
   }
 
-  private fun runTest(host: String, port: UShort, user: String, pass: String) {
+  private fun runTest(host: String, port: Int, user: String, pass: String) {
     val session = Session(ClientData(
       identifier = "libquassel test",
       buildDate = Instant.EPOCH,