Poke api

README.md

@@ -63,17 +63,17 @@ Also available in Play Store
 - [x] [Navigation](https://developer.android.com/topic/libraries/architecture/navigation)
 - [x] [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel)
 - [x] [Room](https://developer.android.com/topic/libraries/architecture/room)
-- [ ] [Coroutines](https://developer.android.com/topic/libraries/architecture/coroutines)
+- [x] [Coroutines](https://developer.android.com/topic/libraries/architecture/coroutines)
 - [x] [Gradle Kotlin DSL](https://docs.gradle.org/current/userguide/kotlin_dsl.html)
 - [x] [Databinding](https://developer.android.com/topic/libraries/data-binding)
-- [x] [Retrofit](https://square.github.io/retrofit/)
+- [x] [Retrofit](https://square.github.io/retrofit/) (embed in PokeAPI)
 - [x] [Koin](https://insert-koin.io/)
 - [x] [Ktlint](https://ktlint.github.io/)
 - [ ] JUnit
 - [ ] MotionLayout
 - [ ] Transition Animations
 - [ ] DayNight
-- [ ] PokeAPI
+- [x] [RxPokeAPI](https://github.com/PokeAPI/pokekotlin)
 - [ ] ~[Jetpack Compose](https://developer.android.com/jetpack/compose)~ - See [compose-pokedex](https://github.com/zsoltk/compose-pokedex)
 
 ## Features
@@ -105,8 +105,8 @@ Also available in Play Store
 
 ## Contributors
 
-| [<img src="https://avatars3.githubusercontent.com/u/12054216?s=115&v=4" width="48"><br><sub>@zsmb13</sub>](https://github.com/zsmb13) | [<img src="https://avatars0.githubusercontent.com/u/8435541?s=115&v=4" width="48"><br><sub>@aesean</sub>](https://github.com/aesean) | [<img src="https://avatars1.githubusercontent.com/u/988405?s=115&v=4" width="48"><br><sub>@STFBEE</sub>](https://github.com/STFBEE) | [<img src="https://avatars1.githubusercontent.com/u/25616312?s=115&v=4" width="48"><br><sub>@CorneilleEdi</sub>](https://github.com/CorneilleEdi) | [<img src="https://avatars2.githubusercontent.com/u/15768474?s=115&v=4" width="48"><br><sub>@naufalprakoso</sub>](https://github.com/naufalprakoso) | [<img src="https://user-images.githubusercontent.com/95717/60592969-5da81680-9d67-11e9-92a3-8664ee0e2eda.png" width="48"><br><sub>You</sub>](https://github.com/mrcsxsiq/Kotlin-Pokedex/pulls) |
-| :---: |  :---: |  :---: |  :---: |  :---: |  :---: |
+| [<img src="https://avatars3.githubusercontent.com/u/12054216?s=115&v=4" width="48"><br><sub>@zsmb13</sub>](https://github.com/zsmb13) | [<img src="https://avatars0.githubusercontent.com/u/8435541?s=115&v=4" width="48"><br><sub>@aesean</sub>](https://github.com/aesean) | [<img src="https://avatars1.githubusercontent.com/u/988405?s=115&v=4" width="48"><br><sub>@STFBEE</sub>](https://github.com/STFBEE) | [<img src="https://avatars1.githubusercontent.com/u/25616312?s=115&v=4" width="48"><br><sub>@CorneilleEdi</sub>](https://github.com/CorneilleEdi) | [<img src="https://avatars1.githubusercontent.com/u/8194261?s=400&u=71c0850dd7e9e80553420d895d6b0799e05f72df&v=4" width="48"><br><sub>@jloskin</sub>](https://github.com/jloskin) | [<img src="https://avatars2.githubusercontent.com/u/15768474?s=115&v=4" width="48"><br><sub>@naufalprakoso</sub>](https://github.com/naufalprakoso) | [<img src="https://avatars2.githubusercontent.com/u/23139508?s=400&u=55d1e0cb775f025f9c86fdb5bf8b63b0123f18f9&v=4" width="48"><br><sub>@tassiolucas</sub>](https://github.com/tassiolucas) | [<img src="https://user-images.githubusercontent.com/95717/60592969-5da81680-9d67-11e9-92a3-8664ee0e2eda.png" width="48"><br><sub>You</sub>](https://github.com/mrcsxsiq/Kotlin-Pokedex/pulls) |
+| :---: |  :---: |  :---: |  :---: |  :---: |  :---: |  :---: |  :---: |
 
 ## Author
 

app/build.gradle.kts

@@ -9,7 +9,7 @@ apply(from = "../ktlint.gradle.kts")
 
 android {
     compileSdkVersion(29)
-    buildToolsVersion("29.0.3")
+    buildToolsVersion("29.0.2")
     defaultConfig {
         applicationId =  "dev.marcosfarias.pokedex"
         minSdkVersion(23)
@@ -24,6 +24,10 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
     kotlinOptions {
         jvmTarget = "1.8"
     }
@@ -34,7 +38,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72")
 
     // Architecture
-    implementation("androidx.core:core-ktx:1.2.0")
+    implementation("androidx.core:core-ktx:1.3.0")
     implementation("androidx.appcompat:appcompat:1.1.0")
     implementation("androidx.navigation:navigation-ui:2.2.2")
     implementation("androidx.navigation:navigation-ui-ktx:2.2.2")
@@ -43,20 +47,23 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("androidx.constraintlayout:constraintlayout:1.1.3")
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.2.0")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0")
 
     // Material
     implementation("com.google.android.material:material:1.1.0")
 
     // Third Party
     implementation("com.leinardi.android:speed-dial:3.1.1")
 
-    // Retrofit
-    implementation("com.squareup.retrofit2:retrofit:2.6.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.6.0")
-
     // Persistence
-    implementation("android.arch.persistence.room:runtime:1.1.1")
-    kapt("android.arch.persistence.room:compiler:1.1.1")
+    implementation("androidx.room:room-runtime:2.2.5")
+    kapt("androidx.room:room-compiler:2.2.5")
+    implementation("androidx.room:room-ktx:2.2.5")
+
+    // Gson
+    implementation("com.google.code.gson:gson:2.8.6")
 
     // Glide
     kapt("android.arch.lifecycle:compiler:1.1.1")
@@ -68,8 +75,11 @@ dependencies {
     implementation("org.koin:koin-androidx-scope:2.0.1")
     implementation("org.koin:koin-androidx-viewmodel:2.0.1")
 
+    // RxPokeApi with Retrofit
+    implementation("com.github.PokeAPI:pokekotlin:2.3.1")
+
     // Test
-    testImplementation("junit:junit:4.12")
+    testImplementation("junit:junit:4.13")
     androidTestImplementation("androidx.test.ext:junit:1.1.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
 }