diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a70c5f4..f7cefdc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("com.google.dagger.hilt.android") + id("org.jetbrains.kotlin.kapt") } android { @@ -29,19 +31,24 @@ android { ) } } + compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } + kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } + buildFeatures { compose = true } + composeOptions { - kotlinCompilerExtensionVersion = "1.4.3" + kotlinCompilerExtensionVersion = "1.4.8" } + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -50,20 +57,18 @@ android { } dependencies { - - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.core:core-ktx:1.10.1") +// implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") implementation("androidx.activity:activity-compose:1.7.2") - implementation(platform("androidx.compose:compose-bom:2023.03.00")) - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.ui:ui-graphics") - implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.compose.material3:material3") - testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00")) - androidTestImplementation("androidx.compose.ui:ui-test-junit4") - debugImplementation("androidx.compose.ui:ui-tooling") - debugImplementation("androidx.compose.ui:ui-test-manifest") + + // Compose + implementation("androidx.compose.ui:ui:1.4.3") + implementation("androidx.compose.ui:ui-graphics:1.4.3") + implementation("androidx.compose.ui:ui-tooling-preview:1.4.3") + implementation("androidx.compose.material3:material3:1.1.1") + + // Hilt: Dependency injection + implementation("androidx.hilt:hilt-navigation-compose:1.0.0") + implementation("com.google.dagger:hilt-android:2.45") + kapt("com.google.dagger:hilt-compiler:2.45") } \ No newline at end of file diff --git a/app/src/androidTest/java/com/pixelized/lexique/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/pixelized/lexique/ExampleInstrumentedTest.kt deleted file mode 100644 index ea6882b..0000000 --- a/app/src/androidTest/java/com/pixelized/lexique/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.pixelized.lexique - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.pixelized.lexique", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f91327d..e8d9d04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools">