changes reverted (#191)
This commit is contained in:
@@ -3,12 +3,11 @@ plugins {
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
id 'kotlin-kapt'
|
||||
id 'com.google.dagger.hilt.android'
|
||||
id 'com.google.devtools.ksp'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'com.uitron.demo'
|
||||
compileSdk 34
|
||||
compileSdk 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.uitron.demo"
|
||||
@@ -55,7 +54,7 @@ android {
|
||||
compose true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion '1.5.3'
|
||||
kotlinCompilerExtensionVersion '1.4.3'
|
||||
}
|
||||
packagingOptions {
|
||||
resources {
|
||||
@@ -65,7 +64,7 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation platform("androidx.compose:compose-bom:2023.09.01")
|
||||
implementation platform("androidx.compose:compose-bom:2023.06.01")
|
||||
|
||||
implementation project(':navi-uitron')
|
||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||
@@ -101,13 +100,13 @@ dependencies {
|
||||
//Room
|
||||
def room_version = "2.5.2"
|
||||
implementation "androidx.room:room-runtime:$room_version"
|
||||
ksp "androidx.room:room-compiler:$room_version"
|
||||
kapt "androidx.room:room-compiler:$room_version"
|
||||
implementation "androidx.room:room-ktx:$room_version"
|
||||
implementation "androidx.room:room-paging:$room_version"
|
||||
|
||||
// Hilt
|
||||
implementation 'com.google.dagger:hilt-android:2.48'
|
||||
implementation 'com.google.dagger:hilt-android:2.44'
|
||||
kapt 'androidx.hilt:hilt-compiler:1.0.0'
|
||||
kapt 'com.google.dagger:hilt-android-compiler:2.48'
|
||||
kapt 'com.google.dagger:hilt-android-compiler:2.44'
|
||||
implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
|
||||
}
|
||||
19
build.gradle
19
build.gradle
@@ -1,8 +1,13 @@
|
||||
plugins {
|
||||
alias libs.plugins.android.application apply false
|
||||
alias libs.plugins.android.library apply false
|
||||
alias libs.plugins.android.test apply false
|
||||
alias libs.plugins.hilt.android apply false
|
||||
alias libs.plugins.kotlin.android apply false
|
||||
alias libs.plugins.ksp apply false
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
buildscript {
|
||||
ext {
|
||||
nav_version = "2.6.0"
|
||||
}
|
||||
}
|
||||
plugins {
|
||||
id 'com.android.application' version '8.1.1' apply false
|
||||
id 'com.android.library' version '8.1.1' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
|
||||
id 'com.android.test' version '8.1.1' apply false
|
||||
id 'com.google.dagger.hilt.android' version '2.44' apply false
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ def VERSION_NAME = "1.0.24"
|
||||
|
||||
android {
|
||||
namespace 'com.navi.uitron'
|
||||
compileSdk 34
|
||||
compileSdk 33
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
@@ -36,7 +36,7 @@ android {
|
||||
compose true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion '1.5.3'
|
||||
kotlinCompilerExtensionVersion '1.4.3'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ publishing {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation platform("androidx.compose:compose-bom:2023.09.01")
|
||||
implementation platform("androidx.compose:compose-bom:2023.06.01")
|
||||
|
||||
implementation "androidx.compose.ui:ui"
|
||||
implementation "androidx.compose.material:material"
|
||||
|
||||
Reference in New Issue
Block a user