Make the sdk targeting android to win time

app/build.gradle

@@ -22,16 +22,17 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(":matrix-sdk-core")
+    implementation project(":matrix-sdk-android")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation "org.koin:koin-core:$koin_version"
-    implementation "org.koin:koin-core-ext:$koin_version"
+
+    implementation "org.koin:koin-android:$koin_version"
+    implementation "org.koin:koin-android-scope:$koin_version"
+    implementation "org.koin:koin-android-viewmodel:$koin_version"
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    compile project(path: ':matrix-sdk-android')
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".Riot"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/java/im/vector/riotredesign/Riot.kt

@@ -1,13 +1,14 @@
 package im.vector.riotredesign
 
 import android.app.Application
+import im.vector.riotredesign.core.di.AppModule
 import org.koin.standalone.StandAloneContext.startKoin
 
 class Riot : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        startKoin(emptyList())
+        startKoin(listOf(AppModule(this)))
     }
 
 }

app/src/main/java/im/vector/riotredesign/core/di/AppModule.kt

@@ -0,0 +1,20 @@
+package im.vector.riotredesign.core.di
+
+import android.content.Context
+import im.vector.matrix.android.api.Matrix
+import im.vector.matrix.android.api.MatrixOptions
+import org.koin.dsl.context.ModuleDefinition
+import org.koin.dsl.module.Module
+import org.koin.dsl.module.module
+
+class AppModule(private val context: Context) : Module {
+
+    override fun invoke(): ModuleDefinition = module {
+
+        single {
+            val matrixOptions = MatrixOptions(context)
+            Matrix(matrixOptions)
+        }
+
+    }.invoke()
+}

app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt

@@ -3,22 +3,21 @@ package im.vector.riotredesign.features.login
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
-import im.vector.matrix.android.thread.MainThreadExecutor
-import im.vector.matrix.core.api.Matrix
-import im.vector.matrix.core.api.MatrixCallback
-import im.vector.matrix.core.api.MatrixOptions
-import im.vector.matrix.core.api.failure.Failure
-import im.vector.matrix.core.api.login.data.Credentials
-import im.vector.matrix.core.api.login.data.HomeServerConnectionConfig
+import im.vector.matrix.android.api.Matrix
+import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.failure.Failure
+import im.vector.matrix.android.api.login.data.Credentials
+import im.vector.matrix.android.api.login.data.HomeServerConnectionConfig
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.RiotActivity
 import im.vector.riotredesign.features.home.HomeActivity
 import kotlinx.android.synthetic.main.activity_login.*
+import org.koin.android.ext.android.inject
 
 class LoginActivity : RiotActivity() {
 
-    private val matrixOptions = MatrixOptions(mainExecutor = MainThreadExecutor())
-    private val matrix = Matrix(matrixOptions)
+    private val matrix by inject<Matrix>()
+
     private val homeServerConnectionConfig = HomeServerConnectionConfig("https://matrix.org/")
     private val session = matrix.createSession(homeServerConnectionConfig)
     private val authenticator = session.authenticator()