diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt index e63564fc..043006ce 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt @@ -9,12 +9,12 @@ import dagger.hilt.android.lifecycle.HiltViewModel import dev.msfjarvis.lobsters.data.local.LobstersPost import dev.msfjarvis.lobsters.data.remote.LobstersPagingSource import dev.msfjarvis.lobsters.data.repo.LobstersRepository +import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import javax.inject.Inject @HiltViewModel class LobstersViewModel @Inject constructor( diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 09c8729d..de70edec 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -39,12 +39,12 @@ internal fun Project.configureForAllProjects() { google() mavenCentral() jcenter() { - content { - // Indirect dependencies - // https://youtrack.jetbrains.com/issue/IDEA-261387 - includeModule("org.jetbrains.trove4j", "trove4j") - includeGroup("org.jetbrains.kotlinx") - } + content { + // Indirect dependencies + // https://youtrack.jetbrains.com/issue/IDEA-261387 + includeModule("org.jetbrains.trove4j", "trove4j") + includeGroup("org.jetbrains.kotlinx") + } } } tasks.withType { diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d1cded46..acd130ea 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -8,7 +8,8 @@ private const val DAGGER_HILT_VERSION = "2.32-alpha" object Plugins { const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha05" const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha05" - const val daggerGradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" + const val daggerGradlePlugin = + "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}" const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" const val jsemver = "com.github.zafarkhaja:java-semver:0.9.0" const val sqldelightGradlePlugin = "com.squareup.sqldelight:gradle-plugin:1.4.4" @@ -37,7 +38,8 @@ object Dependencies { const val activity = "androidx.activity:activity-compose:1.3.0-alpha02" const val compiler = "androidx.compose.compiler:compiler:$COMPOSE_VERSION" - const val constraintLayout = "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha02" + const val constraintLayout = + "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha02" const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION" const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION" const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01" diff --git a/buildSrc/src/main/java/SigningConfig.kt b/buildSrc/src/main/java/SigningConfig.kt index 50b86c47..74979f72 100644 --- a/buildSrc/src/main/java/SigningConfig.kt +++ b/buildSrc/src/main/java/SigningConfig.kt @@ -4,8 +4,8 @@ */ import com.android.build.gradle.internal.dsl.BaseAppModuleExtension -import org.gradle.api.Project import java.util.* +import org.gradle.api.Project private const val KEYSTORE_CONFIG_PATH = "keystore.properties" diff --git a/buildSrc/src/main/java/VersioningPlugin.kt b/buildSrc/src/main/java/VersioningPlugin.kt index 8601f7f1..cbf0ea69 100644 --- a/buildSrc/src/main/java/VersioningPlugin.kt +++ b/buildSrc/src/main/java/VersioningPlugin.kt @@ -6,10 +6,10 @@ import com.android.build.gradle.internal.plugins.AppPlugin import com.github.zafarkhaja.semver.Version -import org.gradle.api.Plugin -import org.gradle.api.Project import java.io.OutputStream import java.util.* +import org.gradle.api.Plugin +import org.gradle.api.Project private const val VERSIONING_PROP_FILE = "version.properties" private const val VERSIONING_PROP_VERSION_NAME = "versioning-plugin.versionName"