diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dbb2019..560fac4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,7 +2,6 @@ plugins { kotlin("kapt") alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) - alias(libs.plugins.hilt.android) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.kotlin.compose) } @@ -19,6 +18,8 @@ android { versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField("String", "API_BASE_URL", "\"https://rickandmortyapi.com/api/\"") } buildTypes { @@ -31,11 +32,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "1.8" } buildFeatures { compose = true @@ -57,14 +58,11 @@ dependencies { implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) implementation(libs.androidx.navigation.compose) - implementation(libs.androidx.hilt.navigation.compose) - implementation(libs.hilt.android) implementation(libs.kotlinx.serialization.json) implementation(libs.coil.kt) implementation(libs.coil.kt.compose) implementation(libs.retrofit2.retrofit) implementation(libs.retrofit.retrofit2.kotlinx.serialization.converter) - kapt(libs.hilt.compiler) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/app/src/main/java/xyz/leomurca/rickandmorty/MainActivity.kt b/app/src/main/java/xyz/leomurca/rickandmorty/MainActivity.kt index 7d810a4..726f9d1 100644 --- a/app/src/main/java/xyz/leomurca/rickandmorty/MainActivity.kt +++ b/app/src/main/java/xyz/leomurca/rickandmorty/MainActivity.kt @@ -5,12 +5,8 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview import xyz.leomurca.rickandmorty.ui.theme.RickAndMortyTheme class MainActivity : ComponentActivity() { diff --git a/app/src/main/java/xyz/leomurca/rickandmorty/MainApplication.kt b/app/src/main/java/xyz/leomurca/rickandmorty/MainApplication.kt new file mode 100644 index 0000000..54c6c6e --- /dev/null +++ b/app/src/main/java/xyz/leomurca/rickandmorty/MainApplication.kt @@ -0,0 +1,5 @@ +package xyz.leomurca.rickandmorty + +import android.app.Application + +class MainApplication : Application() \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index e7928d3..5ba8ae0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,5 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false - alias(libs.plugins.hilt.android) apply false alias(libs.plugins.kotlin.serialization) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ecb30b..136ab71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,8 +8,6 @@ espressoCore = "3.6.1" lifecycleRuntimeKtx = "2.8.7" activityCompose = "1.10.1" composeBom = "2025.03.00" -hiltAndroid = "2.50" -hiltAndroidX = "1.2.0" navigation = "2.8.9" kotlinxSerializationJson = "1.8.0" coil = "3.1.0" @@ -32,9 +30,6 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } -androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltAndroidX" } -hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hiltAndroid" } -hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hiltAndroid" } kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } coil-kt = { group = "io.coil-kt.coil3", name = "coil", version.ref = "coil" } coil-kt-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" } @@ -46,6 +41,5 @@ retrofit-retrofit2-kotlinx-serialization-converter = { group = "com.jakewharton. android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }