diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f3c3ea2..17d5c43 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,25 +1,19 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) - kotlin("kapt") + alias(libs.plugins.kotlin.compose) id("com.google.dagger.hilt.android") + id("com.google.devtools.ksp") } android { namespace = "com.androidfactory.simplerick" - compileSdk = libs.versions.compileSdk.get().toInt() + compileSdk = 35 defaultConfig { - applicationId = "com.androidfactory.simplerick" - minSdk = libs.versions.minSdk.get().toInt() - targetSdk = 33 - versionCode = 1 - versionName = "1.0" + minSdk = 26 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary = true - } } buildTypes { @@ -32,55 +26,44 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = "11" } buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.4.3" - } - packaging { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } - } } dependencies { - implementation(project(":network")) - - implementation(platform(libs.compose.bom)) - implementation(libs.bundles.compose) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.foundation) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) - implementation(libs.navigation.compose) + // Dependency injection + implementation(libs.hilt.android) + ksp(libs.dagger.hilt.android.compiler) + implementation(libs.androidx.hilt.navigation.compose) // Image loading implementation(libs.coil.compose) - // Dependency injection - implementation("com.google.dagger:hilt-android:2.44") - kapt("com.google.dagger:hilt-android-compiler:2.44") - implementation("androidx.hilt:hilt-navigation-compose:1.2.0") - - implementation(libs.core.ktx) - implementation(libs.lifecycle.runtime.ktx) - implementation(libs.activity.compose) - - testImplementation(libs.junit) - androidTestImplementation(libs.ext.junit) - androidTestImplementation(libs.espresso.core) - androidTestImplementation(platform(libs.compose.bom)) - androidTestImplementation(libs.compose.ui.test.junit) - debugImplementation(libs.compose.ui.tooling) - debugImplementation(libs.compose.ui.test.manifest) -} - -kapt { - correctErrorTypes = true + // Network Module + implementation(project(":network")) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ecf60ed..822a3c8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + +