diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e2d1e8c..0d0da79 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,19 +29,16 @@ android { ) } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = "1.8" } - buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" - } + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -53,11 +50,12 @@ dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) - implementation(libs.androidx.material3) implementation(libs.androidx.appcompat) implementation(libs.material) implementation(libs.androidx.activity) implementation(libs.androidx.constraintlayout) + +// implementation(libs.androidx.material3) // testImplementation(libs.junit) // androidTestImplementation(libs.androidx.junit) // androidTestImplementation(libs.androidx.espresso.core) diff --git a/app/src/androidTest/java/kky/flab/lookaround/ExampleInstrumentedTest.kt b/app/src/androidTest/java/kky/flab/lookaround/ExampleInstrumentedTest.kt deleted file mode 100644 index 6bc6da2..0000000 --- a/app/src/androidTest/java/kky/flab/lookaround/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package kky.flab.lookaround - -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("kky.flab.lookaround", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/test/java/kky/flab/lookaround/ExampleUnitTest.kt b/app/src/test/java/kky/flab/lookaround/ExampleUnitTest.kt deleted file mode 100644 index 5836573..0000000 --- a/app/src/test/java/kky/flab/lookaround/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package kky.flab.lookaround - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d6167c..4d2e58c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,13 +18,13 @@ junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +#androidx-ui = { group = "androidx.compose.ui", name = "ui" } +#androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +#androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +#androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +#androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +#androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +#androidx-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }