diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6250ef286..6710a7c19 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,14 +10,14 @@ plugins { android { namespace = "com.terning.point" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { applicationId = "com.terning.point" - minSdk = 28 - targetSdk = 34 - versionCode = 1 - versionName = "1.0" + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() + versionCode = libs.versions.versionCode.get().toInt() + versionName = libs.versions.versionName.get() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -46,14 +46,14 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = libs.versions.jvmTarget.get() } buildFeatures { compose = true buildConfig = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.0" + kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() } packaging { resources { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 859a58488..4014bcf4c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -5,10 +5,10 @@ plugins { android { namespace = "com.terning.core" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 28 + minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") @@ -36,7 +36,7 @@ android { buildConfig = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.0" + kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() } } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index cd10cb9f2..33eedaaac 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -6,10 +6,10 @@ plugins { android { namespace = "com.terning.data" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 28 + minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") @@ -29,7 +29,7 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = libs.versions.jvmTarget.get() } buildFeatures{ buildConfig = true diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts index 53f549997..c4543bc8b 100644 --- a/feature/build.gradle.kts +++ b/feature/build.gradle.kts @@ -9,10 +9,10 @@ plugins { android { namespace = "com.terning.feature" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - minSdk = 28 + minSdk = libs.versions.minSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") @@ -32,14 +32,14 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = libs.versions.jvmTarget.get() } buildFeatures { compose = true buildConfig = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.0" + kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() } packaging { resources { diff --git a/feature/src/main/java/com/terning/feature/main/MainNavigator.kt b/feature/src/main/java/com/terning/feature/main/MainNavigator.kt index f8e642019..4ca92ceec 100644 --- a/feature/src/main/java/com/terning/feature/main/MainNavigator.kt +++ b/feature/src/main/java/com/terning/feature/main/MainNavigator.kt @@ -65,4 +65,4 @@ fun rememberMainNavigator( navController: NavHostController = rememberNavController(), ): MainNavigator = remember(navController) { MainNavigator(navController) -} +} \ No newline at end of file diff --git a/feature/src/main/java/com/terning/feature/main/MainTab.kt b/feature/src/main/java/com/terning/feature/main/MainTab.kt index 36f76d425..cca6b166d 100644 --- a/feature/src/main/java/com/terning/feature/main/MainTab.kt +++ b/feature/src/main/java/com/terning/feature/main/MainTab.kt @@ -9,6 +9,7 @@ import com.terning.feature.R import com.terning.feature.first.navigation.First import com.terning.feature.mock.navigation.Mock + enum class MainTab( @DrawableRes val icon: Int, @StringRes val contentDescription: Int, @@ -22,7 +23,7 @@ enum class MainTab( MOCK( icon = R.drawable.ic_launcher_foreground, contentDescription = R.string.mock, - route = Mock, + route = Mock ); companion object { @@ -37,4 +38,4 @@ enum class MainTab( } } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6159229e..1f8bdf6aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,8 @@ minSdk = "28" targetSdk = "34" versionName = "1.0.0" versionCode = "10000" +kotlinCompilerExtensionVersion = "1.5.0" +jvmTarget = "1.8" ## Android gradle plugin androidGradlePlugin = "8.5.0"