Update dependencies (#88)

* Bump deps versions

Can't update Kotlin version yet because of the following issue: google/dagger#1478

* Move Resource to shared model package

* Call dashboardViewModel.save() in onPause

When it was called in onStop, sometimes, the dashboard wasn't saved.

android/app/build.gradle

@@ -128,7 +128,7 @@ dependencies {
     kapt "androidx.lifecycle:lifecycle-compiler:$versions.lifecycle"
     implementation "android.arch.navigation:navigation-fragment-ktx:$versions.navigation"
     implementation "android.arch.navigation:navigation-ui-ktx:$versions.navigation"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-alpha03"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycle_viewmodel_ktx"
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin_version"

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/CheckUserCredentialsValidUseCase.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.extension.isDeviceConnected
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.InfoEtudiantRepository
 import model.Etudiant
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCourseEvaluationsCompletedUseCase.kt

@@ -2,10 +2,10 @@ package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationCoursRepository
 import model.Cours
 import model.EvaluationCours
+import model.Resource
 import model.SignetsUserCredentials
 import javax.inject.Inject
 

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionGradesCoursesUseCase.kt

@@ -2,7 +2,7 @@ package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import javax.inject.Inject
 

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionSeancesUseCase.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SeanceRepository
 import model.Seance
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchCurrentSessionUseCase.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SessionRepository
 import ca.etsmtl.applets.repository.util.timeInSeconds
 import model.Session

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchEtudiantUseCase.kt

@@ -1,7 +1,7 @@
 package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.InfoEtudiantRepository
 import model.Etudiant
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchFutureSeancesUseCase.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Seance
 import model.Session
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesGroupedBySessionUseCase.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import javax.inject.Inject
 

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesCoursesUseCase.kt

@@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.CoursRepository
 import model.Cours
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchGradesDetailsUseCase.kt

@@ -6,10 +6,10 @@ import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.extension.isDeviceConnected
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationRepository
 import ca.etsmtl.applets.repository.util.replaceCommaAndParseToDouble
 import model.Cours
+import model.Resource
 import model.SignetsUserCredentials
 import model.SommaireEtEvaluations
 import javax.inject.Inject

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchProgrammesUseCase.kt

@@ -1,7 +1,7 @@
 package ca.etsmtl.applets.etsmobile.domain
 
 import androidx.lifecycle.LiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.ProgrammeRepository
 import model.Programme
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionSeancesUseCase.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SeanceRepository
 import model.Seance
 import model.Session

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchSessionsUseCase.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.SessionRepository
 import model.Session
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/FetchTodaySeancesUseCase.kt

@@ -3,9 +3,9 @@ package ca.etsmtl.applets.etsmobile.domain
 import androidx.lifecycle.LiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
 import model.Seance
 import java.util.Calendar
 import javax.inject.Inject

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/domain/UpdateGradesForCoursesUseCase.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.presentation.App
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.data.repository.signets.EvaluationRepository
 import model.Cours
 import model.SignetsUserCredentials

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/extension/ResourceExt.kt

@@ -3,7 +3,7 @@ package ca.etsmtl.applets.etsmobile.extension
 import android.content.Context
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * Created by Sonphil on 03-11-18.

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/DashboardFragment.kt

@@ -125,9 +125,9 @@ class DashboardFragment : DaggerFragment() {
         dashboardViewModel.load()
     }
 
-    override fun onStop() {
+    override fun onPause() {
         dashboardViewModel.save()
 
-        super.onStop()
+        super.onPause()
     }
 }

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/grades/GradesCardViewModel.kt

@@ -10,8 +10,8 @@ import ca.etsmtl.applets.etsmobile.extension.adjustCoteForDisplay
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
 import model.Cours
+import model.Resource
 import presentation.ViewModel
 import javax.inject.Inject
 

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/dashboard/card/todayschedule/TodayScheduleCardViewModel.kt

@@ -4,12 +4,12 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchTodaySeancesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
 import javax.inject.Inject
 
 /**

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/grades/GradesViewModel.kt

@@ -12,10 +12,10 @@ import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
 import model.Cours
+import model.Resource
 import javax.inject.Inject
 
 /**

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/gradesdetails/GradesDetailsViewModel.kt

@@ -9,11 +9,10 @@ import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchGradesDetailsUseCase
+import ca.etsmtl.applets.etsmobile.extension.toLocalizedString
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.etsmobile.extension.toLocalizedString
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.util.zeroIfNullOrBlank
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
@@ -22,6 +21,7 @@ import com.xwray.groupie.Group
 import com.xwray.groupie.Section
 import model.Cours
 import model.Evaluation
+import model.Resource
 import model.SommaireElementsEvaluation
 import model.SommaireEtEvaluations
 import java.util.Date

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/login/LoginViewModel.kt

@@ -15,7 +15,7 @@ import ca.etsmtl.applets.etsmobile.domain.SaveSignetsUserCredentialsUseCase
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.extension.call
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.SignetsUserCredentials
 import model.UniversalCode
 import javax.inject.Inject

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/profile/ProfileViewModel.kt

@@ -8,16 +8,16 @@ import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchEtudiantUseCase
 import ca.etsmtl.applets.etsmobile.domain.FetchProgrammesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
-import ca.etsmtl.applets.repository.data.model.Resource
 import ca.etsmtl.applets.repository.util.zipResourceTo
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
 import model.Etudiant
 import model.Programme
+import model.Resource
 import javax.inject.Inject
 
 /**

android/app/src/main/kotlin/ca/etsmtl/applets/etsmobile/presentation/schedule/ScheduleViewModel.kt

@@ -9,14 +9,14 @@ import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModel
 import ca.etsmtl.applets.etsmobile.R
 import ca.etsmtl.applets.etsmobile.domain.FetchFutureSeancesUseCase
+import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.presentation.App
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.etsmobile.extension.getGenericErrorMessage
 import ca.etsmtl.applets.etsmobile.util.RefreshableLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
-import model.Seance
 import com.shopify.livedataktx.map
 import com.shopify.livedataktx.nonNull
+import model.Resource
+import model.Seance
 import java.util.Calendar
 import javax.inject.Inject
 

android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/GradesViewModelTest.kt

@@ -8,7 +8,7 @@ import ca.etsmtl.applets.etsmobile.domain.FetchGradesCoursesGroupedBySessionUseC
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
 import ca.etsmtl.applets.etsmobile.presentation.grades.GradesViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.verify

android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/LoginViewModelTest.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.etsmobile.presentation.login.LoginViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.EventObserver
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock

android/app/src/test/kotlin/ca/etsmtl/applets/etsmobile/presentation/ProfileViewModelTest.kt

@@ -14,7 +14,7 @@ import ca.etsmtl.applets.etsmobile.presentation.profile.ProfileViewModel
 import ca.etsmtl.applets.etsmobile.util.Event
 import ca.etsmtl.applets.etsmobile.util.EventObserver
 import ca.etsmtl.applets.etsmobile.extension.mockNetwork
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.capture
 import com.nhaarman.mockito_kotlin.mock

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/NetworkBoundResource.kt

@@ -22,7 +22,7 @@ import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
 import ca.etsmtl.applets.repository.AppExecutors
 import ca.etsmtl.applets.repository.data.api.ApiResponse
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * A generic class that can provide a resource backed by both the sqlite database and the network.

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/CoursRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDeCours
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.CoursDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toCours
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.SignetsUserCredentials
 import javax.inject.Inject

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationCoursRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeEvaluation
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.EvaluationCoursDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEvaluationCours
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.EvaluationCours
 import model.SignetsUserCredentials

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/EvaluationRepository.kt

@@ -15,7 +15,7 @@ import ca.etsmtl.applets.repository.data.db.dao.signets.EvaluationDao
 import ca.etsmtl.applets.repository.data.db.dao.signets.SommaireElementsEvaluationDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEvaluations
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSommaireEvaluation
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Cours
 import model.SignetsUserCredentials
 import model.SommaireElementsEvaluation

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/HoraireExamenFinalRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeHoraireExa
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.HoraireExamenFinalDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toHorairesExamensFinaux
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.HoraireExamenFinal
 import model.Session
 import model.SignetsUserCredentials

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/InfoEtudiantRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiEtudiant
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.EtudiantDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toEtudiant
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Etudiant
 import model.SignetsUserCredentials
 import javax.inject.Inject

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/JourRemplaceRepository.kt

@@ -10,7 +10,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeJoursRempl
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.JourRemplaceDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toJoursRemplaces
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.JourRemplace
 import model.Session
 import javax.inject.Inject

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SeanceRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDesSeances
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.SeanceDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSeances
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import ca.etsmtl.applets.repository.util.unixToDefaultSignetsDate
 import model.Cours
 import model.Seance

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/data/repository/signets/SessionRepository.kt

@@ -11,7 +11,7 @@ import ca.etsmtl.applets.repository.data.api.response.signets.ApiListeDeSessions
 import ca.etsmtl.applets.repository.data.api.response.signets.ApiSignetsModel
 import ca.etsmtl.applets.repository.data.db.dao.signets.SessionDao
 import ca.etsmtl.applets.repository.data.db.entity.mapper.toSessions
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 import model.Session
 import model.SignetsUserCredentials
 import javax.inject.Inject

android/repository/src/main/kotlin/ca/etsmtl/applets/repository/util/LiveDataExt.kt

@@ -2,7 +2,7 @@ package ca.etsmtl.applets.repository.util
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import ca.etsmtl.applets.repository.data.model.Resource
+import model.Resource
 
 /**
  * Created by Sonphil on 01-11-18.