diff --git a/app/build.gradle b/app/build.gradle index bfcdd837..76a5d65b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,95 +1,95 @@ plugins { - id "kotlin-kapt" - id "dagger.hilt.android.plugin" + id "kotlin-kapt" + id "dagger.hilt.android.plugin" } final def keystorePropertiesFile = rootProject.file("keystore.properties") android { - adbOptions { - installOptions = ["--user 0"] - } - defaultConfig { - applicationId "dev.msfjarvis.lobsters" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } + adbOptions { + installOptions = ["--user 0"] + } + defaultConfig { + applicationId "dev.msfjarvis.lobsters" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } - buildTypes { - release { - minifyEnabled true - proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" - } + buildTypes { + release { + minifyEnabled true + proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" } + } - compileOptions.coreLibraryDesugaringEnabled = true + compileOptions.coreLibraryDesugaringEnabled = true - buildFeatures.compose = true + buildFeatures.compose = true - composeOptions { - kotlinCompilerVersion "${kotlin_version}" - kotlinCompilerExtensionVersion "${compose_version}" - } + composeOptions { + kotlinCompilerVersion "${kotlin_version}" + kotlinCompilerExtensionVersion "${compose_version}" + } - if (keystorePropertiesFile.exists()) { - final def keystoreProperties = new Properties() - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + if (keystorePropertiesFile.exists()) { + final def keystoreProperties = new Properties() + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - signingConfigs { - release { - keyAlias keystoreProperties["keyAlias"] - keyPassword keystoreProperties["keyPassword"] - storeFile rootProject.file(keystoreProperties["storeFile"]) - storePassword keystoreProperties["storePassword"] - } - } - buildTypes.debug.signingConfig = signingConfigs.release - buildTypes.release.signingConfig = signingConfigs.release + signingConfigs { + release { + keyAlias keystoreProperties["keyAlias"] + keyPassword keystoreProperties["keyPassword"] + storeFile rootProject.file(keystoreProperties["storeFile"]) + storePassword keystoreProperties["storePassword"] + } } + buildTypes.debug.signingConfig = signingConfigs.release + buildTypes.release.signingConfig = signingConfigs.release + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - freeCompilerArgs += [ - "-Xallow-jvm-ir-dependencies", - "-Xskip-prerelease-check", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - ] - } + kotlinOptions { + freeCompilerArgs += [ + "-Xallow-jvm-ir-dependencies", + "-Xskip-prerelease-check", + "-Xopt-in=kotlin.RequiresOptIn", + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + ] + } } dependencies { - kapt "com.google.dagger:hilt-compiler:$hilt_dagger_version" - kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version" - implementation(project(":data")) - implementation(project(":lobsters-api")) - implementation(project(":model")) - implementation "androidx.core:core-ktx:$core_version" - implementation "androidx.activity:activity-ktx:$activity_version" - implementation "androidx.appcompat:appcompat:$appcompat_version" - implementation "androidx.browser:browser:$browser_version" - implementation "androidx.compose.foundation:foundation:$compose_version" - implementation "androidx.compose.foundation:foundation-layout:$compose_version" - implementation "androidx.compose.foundation:foundation-text:$compose_version" - implementation "androidx.compose.runtime:runtime:$compose_version" - implementation "androidx.compose.material:material:$compose_version" - implementation "androidx.compose.compiler:compiler:$compose_version" - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.ui:ui-text:$compose_version" - implementation "androidx.compose.ui:ui-text-android:$compose_version" - implementation "androidx.compose.ui:ui-unit:$compose_version" - implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_androidx_version" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.navigation:navigation-compose:$nav_compose_version" - implementation "androidx.ui:ui-tooling:$compose_version" - implementation "com.google.android.material:material:$material_version" - implementation "com.google.dagger:hilt-android:$hilt_dagger_version" - implementation "dev.chrisbanes.accompanist:accompanist-coil:$accompanist_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - implementation "saschpe.android:customtabs:$customtabs_version" - androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version" - testImplementation "junit:junit:$junit_version" - androidTestImplementation "androidx.ui:ui-test:$compose_version" - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version" + kapt "com.google.dagger:hilt-compiler:$hilt_dagger_version" + kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version" + implementation(project(":data")) + implementation(project(":lobsters-api")) + implementation(project(":model")) + implementation "androidx.core:core-ktx:$core_version" + implementation "androidx.activity:activity-ktx:$activity_version" + implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation "androidx.browser:browser:$browser_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.foundation:foundation-text:$compose_version" + implementation "androidx.compose.runtime:runtime:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.compiler:compiler:$compose_version" + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.ui:ui-text:$compose_version" + implementation "androidx.compose.ui:ui-text-android:$compose_version" + implementation "androidx.compose.ui:ui-unit:$compose_version" + implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_androidx_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.navigation:navigation-compose:$nav_compose_version" + implementation "androidx.ui:ui-tooling:$compose_version" + implementation "com.google.android.material:material:$material_version" + implementation "com.google.dagger:hilt-android:$hilt_dagger_version" + implementation "dev.chrisbanes.accompanist:accompanist-coil:$accompanist_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" + implementation "saschpe.android:customtabs:$customtabs_version" + androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version" + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.ui:ui-test:$compose_version" + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version" } diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 521df992..b866db9e 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -1,11 +1,12 @@ - - - - + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c07b007..66a49b8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,27 +1,27 @@ + package="dev.msfjarvis.lobsters"> - + - - - - + + + + - - - - + + + + diff --git a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt index 6b53657f..b3d08c98 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Providers import androidx.compose.runtime.getValue import androidx.compose.ui.platform.setContent +import androidx.compose.ui.res.stringResource import androidx.navigation.compose.KEY_ROUTE import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -47,9 +48,8 @@ class MainActivity : AppCompatActivity() { @Composable fun LobstersApp( - viewModel: LobstersViewModel + viewModel: LobstersViewModel, ) { - val urlLauncher = UrlLauncherAmbient.current val navController = rememberNavController() val destinations = arrayOf(Destination.Hottest, Destination.Saved) @@ -68,7 +68,7 @@ fun LobstersApp( } ) }, - label = { Text(screen.label) }, + label = { Text(stringResource(id = screen.labelRes)) }, selected = currentRoute == screen.route, onClick = { // This is the equivalent to popUpTo the start destination diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt index 588a02fd..0c6ebc45 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/Destination.kt @@ -1,12 +1,15 @@ package dev.msfjarvis.lobsters.ui +import androidx.annotation.StringRes +import dev.msfjarvis.lobsters.R + /** * Destinations for navigation within the app. */ sealed class Destination( val route: String, - val label: String, + @StringRes val labelRes: Int, ) { - object Hottest : Destination("hottest", "Hottest") - object Saved : Destination("saved", "Saved") + object Hottest : Destination("hottest", R.string.hottest_posts) + object Saved : Destination("saved", R.string.saved_posts) } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt index b1328f30..06a4fb9d 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/SavedPosts.kt @@ -37,5 +37,3 @@ fun SavedPosts( } } } - - diff --git a/app/src/main/res/drawable/ic_favorite_24px.xml b/app/src/main/res/drawable/ic_favorite_24px.xml index ce351f43..88b91493 100644 --- a/app/src/main/res/drawable/ic_favorite_24px.xml +++ b/app/src/main/res/drawable/ic_favorite_24px.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" /> diff --git a/app/src/main/res/drawable/ic_favorite_border_24px.xml b/app/src/main/res/drawable/ic_favorite_border_24px.xml index e6646709..68b4759e 100644 --- a/app/src/main/res/drawable/ic_favorite_border_24px.xml +++ b/app/src/main/res/drawable/ic_favorite_border_24px.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" /> diff --git a/app/src/main/res/drawable/ic_refresh_24px.xml b/app/src/main/res/drawable/ic_refresh_24px.xml deleted file mode 100644 index aac564c5..00000000 --- a/app/src/main/res/drawable/ic_refresh_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_sync_problem_24px.xml b/app/src/main/res/drawable/ic_sync_problem_24px.xml index fe10eb1f..1d3ad9bc 100644 --- a/app/src/main/res/drawable/ic_sync_problem_24px.xml +++ b/app/src/main/res/drawable/ic_sync_problem_24px.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64l-1.51,1.51c-0.31,0.31 -0.09,0.85 0.36,0.85L8.5,20c0.28,0 0.5,-0.22 0.5,-0.5v-4.29c0,-0.45 -0.54,-0.67 -0.85,-0.35l-1.39,1.39C5.68,15.15 5,13.66 5,12c0,-2.39 1.4,-4.46 3.43,-5.42 0.34,-0.16 0.57,-0.47 0.57,-0.84v-0.19c0,-0.68 -0.71,-1.11 -1.32,-0.82C4.92,5.99 3,8.77 3,12zM11,17h2v-2h-2v2zM19.79,4L15.5,4c-0.28,0 -0.5,0.22 -0.5,0.5v4.29c0,0.45 0.54,0.67 0.85,0.35l1.39,-1.39C18.32,8.85 19,10.34 19,12c0,2.39 -1.4,4.46 -3.43,5.42 -0.34,0.16 -0.57,0.47 -0.57,0.84v0.18c0,0.68 0.71,1.11 1.32,0.82C19.08,18.01 21,15.23 21,12c0,-2.21 -0.91,-4.2 -2.36,-5.64l1.51,-1.51c0.31,-0.31 0.09,-0.85 -0.36,-0.85zM12,13c0.55,0 1,-0.45 1,-1L13,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4c0,0.55 0.45,1 1,1z" /> diff --git a/app/src/main/res/drawable/ic_whatshot_24px.xml b/app/src/main/res/drawable/ic_whatshot_24px.xml index 10cca116..531de533 100644 --- a/app/src/main/res/drawable/ic_whatshot_24px.xml +++ b/app/src/main/res/drawable/ic_whatshot_24px.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3809cb8b..e24e430e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,7 @@ - lobste.rs - Loading posts… - You don\'t have any saved posts + lobste.rs + Loading posts… + You don\'t have any saved posts + Hottest + Saved diff --git a/build.gradle b/build.gradle index d527b85c..b17c18e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,97 +1,97 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext { - accompanist_version = "0.3.2" - activity_version = "1.2.0-beta01" - agp_version = "4.2.0-alpha15" - appcompat_version = "1.3.0-alpha02" - browser_version = "1.3.0-beta01" - compose_version = "1.0.0-alpha06" - core_version = "1.5.0-alpha04" - coroutines_version = "1.4.0" - customtabs_version = "3.0.2" - dagger_version = "2.29.1" - desugar_version = "1.0.10" - hilt_androidx_version = "1.0.0-alpha02" - hilt_dagger_version = "2.29.1-alpha" - junit_version = "4.13.1" - kotlin_version = "1.4.10" - lifecycle_version = "2.3.0-beta01" - material_version = "1.3.0-alpha03" - moshi_version = "1.11.0" - nav_compose_version = "1.0.0-alpha01" - okhttp_version = "4.10.0-RC1" - retrofit_version = "2.9.0" - room_version = "2.3.0-alpha03" - } - repositories { - google() - jcenter() - } - dependencies { - classpath "com.android.tools.build:gradle:$agp_version" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" - } + ext { + accompanist_version = "0.3.2" + activity_version = "1.2.0-beta01" + agp_version = "4.2.0-alpha15" + appcompat_version = "1.3.0-alpha02" + browser_version = "1.3.0-beta01" + compose_version = "1.0.0-alpha06" + core_version = "1.5.0-alpha04" + coroutines_version = "1.4.0" + customtabs_version = "3.0.2" + dagger_version = "2.29.1" + desugar_version = "1.0.10" + hilt_androidx_version = "1.0.0-alpha02" + hilt_dagger_version = "2.29.1-alpha" + junit_version = "4.13.1" + kotlin_version = "1.4.10" + lifecycle_version = "2.3.0-beta01" + material_version = "1.3.0-alpha03" + moshi_version = "1.11.0" + nav_compose_version = "1.0.0-alpha01" + okhttp_version = "4.10.0-RC1" + retrofit_version = "2.9.0" + room_version = "2.3.0-alpha03" + } + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:$agp_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" + } } plugins { - id("com.github.ben-manes.versions") version "0.33.0" + id("com.github.ben-manes.versions") version "0.33.0" } allprojects { - repositories { - google() - jcenter() - } + repositories { + google() + jcenter() + } } subprojects { - repositories { - google() - jcenter() - } - if (name == "app") { - apply plugin: "com.android.application" - } else { - apply plugin: "com.android.library" - } - apply plugin: "kotlin-android" - android { - compileSdkVersion 30 + repositories { + google() + jcenter() + } + if (name == "app") { + apply plugin: "com.android.application" + } else { + apply plugin: "com.android.library" + } + apply plugin: "kotlin-android" + android { + compileSdkVersion 30 - defaultConfig { - minSdkVersion 23 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } + defaultConfig { + minSdkVersion 23 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" } - configurations.all { - resolutionStrategy { - force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - force "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - force "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - } + } + configurations.all { + resolutionStrategy { + force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + force "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + force "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" } + } + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + } } task clean(type: Delete) { - delete rootProject.buildDir + delete rootProject.buildDir } tasks { - wrapper { - gradleVersion = "6.7" - distributionType = Wrapper.DistributionType.ALL - } + wrapper { + gradleVersion = "6.7" + distributionType = Wrapper.DistributionType.ALL + } } diff --git a/data/build.gradle b/data/build.gradle index b44e1a5a..81698f83 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - implementation project(":model") - kapt "androidx.room:room-compiler:$room_version" - api "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" - implementation "com.squareup.moshi:moshi:$moshi_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + implementation project(":model") + kapt "androidx.room:room-compiler:$room_version" + api "androidx.room:room-runtime:$room_version" + implementation "androidx.room:room-ktx:$room_version" + implementation "com.squareup.moshi:moshi:$moshi_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" } diff --git a/lobsters-api/build.gradle b/lobsters-api/build.gradle index 729edf39..14fbb225 100644 --- a/lobsters-api/build.gradle +++ b/lobsters-api/build.gradle @@ -1,14 +1,14 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - implementation project(":model") - implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" - kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" - testImplementation "junit:junit:$junit_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - //noinspection GradleDependency - testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" + implementation project(":model") + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" + kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" + testImplementation "junit:junit:$junit_version" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + //noinspection GradleDependency + testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" } diff --git a/model/build.gradle b/model/build.gradle index 4d9b064a..15922c39 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" - implementation "com.squareup.moshi:moshi:$moshi_version" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" + implementation "com.squareup.moshi:moshi:$moshi_version" }