diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 58f0dff..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' -} - -android { - compileSdk 33 - - defaultConfig { - applicationId "com.example.tiptime" - minSdk 24 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary true - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - freeCompilerArgs += "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api" - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion compose_compiler_version - } - packagingOptions { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } - namespace 'com.example.tiptime' -} - -dependencies { - - implementation platform('androidx.compose:compose-bom:2023.04.01') - implementation 'androidx.activity:activity-compose:1.7.1' - implementation 'androidx.compose.material3:material3' - implementation 'androidx.compose.ui:ui' - implementation "androidx.compose.ui:ui-tooling" - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.core:core-ktx:1.10.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' - - testImplementation 'junit:junit:4.13.2' - - androidTestImplementation platform('androidx.compose:compose-bom:2023.04.01') - androidTestImplementation 'androidx.compose.ui:ui-test-junit4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - - debugImplementation 'androidx.compose.ui:ui-test-manifest' -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..6ca2beb --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:Suppress("UnstableApiUsage") + +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") +} + +android { + compileSdk = 33 + + defaultConfig { + applicationId = "com.example.tiptime" + minSdk = 24 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = rootProject.extra["compose_compiler_version"].toString() + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } + namespace = "com.example.tiptime" +} + +dependencies { + + implementation(platform("androidx.compose:compose-bom:2023.05.01")) + implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-tooling") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + + testImplementation("junit:junit:4.13.2") + + androidTestImplementation(platform("androidx.compose:compose-bom:2023.05.01")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + + debugImplementation("androidx.compose.ui:ui-test-manifest") +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6e1b1cd..e897dec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,6 @@ android:theme="@style/Theme.TipTime"> - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 2df6da9..bbe5ce2 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -15,6 +15,5 @@ ~ limitations under the License. --> -