mm
This commit is contained in:
@@ -1,113 +0,0 @@
|
||||
plugins {
|
||||
<<<<<<< HEAD
|
||||
id 'com.android.application'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'com.example.agentclient'
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.agentclient"
|
||||
minSdk 24
|
||||
=======
|
||||
alias(libs.plugins.android.application)
|
||||
id 'dagger.hilt.android.plugin'
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'com.example.demo'
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.demo"
|
||||
minSdk 26
|
||||
>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684
|
||||
targetSdk 34
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
=======
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
targetCompatibility JavaVersion.VERSION_11
|
||||
>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
<<<<<<< HEAD
|
||||
// Android Core
|
||||
implementation 'androidx.core:core:1.12.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||
implementation 'com.google.android.material:material:1.10.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||
implementation 'androidx.lifecycle:lifecycle-runtime:2.6.2'
|
||||
implementation 'androidx.activity:activity:1.8.1'
|
||||
|
||||
// Retrofit & OkHttp
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
|
||||
|
||||
// Gson
|
||||
implementation 'com.google.code.gson:gson:2.10.1'
|
||||
|
||||
// Testing
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
||||
}
|
||||
=======
|
||||
// 基础Android库
|
||||
implementation libs.appcompat
|
||||
implementation libs.material
|
||||
|
||||
// 生命周期和ViewModel
|
||||
implementation libs.lifecycle.viewmodel
|
||||
implementation libs.lifecycle.livedata
|
||||
|
||||
// Room数据库
|
||||
implementation libs.room.runtime
|
||||
annotationProcessor libs.room.compiler
|
||||
|
||||
// 网络库
|
||||
implementation libs.retrofit
|
||||
implementation libs.retrofit.gson
|
||||
implementation libs.okhttp.logging
|
||||
|
||||
// 依赖注入
|
||||
implementation libs.hilt.android
|
||||
annotationProcessor libs.hilt.compiler
|
||||
|
||||
// 工作管理器
|
||||
implementation libs.work.runtime
|
||||
|
||||
// 蓝牙库
|
||||
implementation libs.ble
|
||||
|
||||
// 测试库
|
||||
testImplementation libs.junit
|
||||
androidTestImplementation libs.ext.junit
|
||||
androidTestImplementation libs.espresso.core
|
||||
}
|
||||
>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684
|
||||
Reference in New Issue
Block a user