kotlin java冲突处理
This commit is contained in:
+22
-22
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user