kotlin java冲突处理

This commit is contained in:
2024-01-30 10:15:53 +08:00
parent 434e59db97
commit 91656850c5
20 changed files with 803 additions and 24 deletions
+22 -22
View File
@@ -7,29 +7,29 @@ plugins {
android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
defaultConfig {
minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"]
versionCode rootProject.ext.android["versionCode"]
versionName rootProject.ext.android["versionName"]
// defaultConfig {
// minSdkVersion rootProject.ext.android["minSdkVersion"]
// targetSdkVersion rootProject.ext.android["targetSdkVersion"]
// versionCode rootProject.ext.android["versionCode"]
// versionName rootProject.ext.android["versionName"]
//
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// consumerProguardFiles "consumer-rules.pro"
// }
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '11'
}
// buildTypes {
// release {
// minifyEnabled false
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
// }
// }
// compileOptions {
// sourceCompatibility JavaVersion.VERSION_11
// targetCompatibility JavaVersion.VERSION_11
// }
// kotlinOptions {
// jvmTarget = '11'
// }
}
dependencies {