Skip to content

M
Mirai
Commit 010883ec authored by Him188's avatar Him188
Browse files
Options

Fix missing android settings

parent b062c580
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 39 deletions
mirai-core-qqandroid/build.gradle.kts
View file @ 010883ec
...@@ -32,23 +32,17 @@ version = rootProject.ext.get("mirai_version")!!.toString() ...@@ -32,23 +32,17 @@ version = rootProject.ext.get("mirai_version")!!.toString()
val isAndroidSDKAvailable: Boolean by project val isAndroidSDKAvailable: Boolean by project
kotlin { android {
if (isAndroidSDKAvailable) {
android("android") {
publishAllLibraryVariants()
project.android {
compileSdkVersion(29) compileSdkVersion(29)
defaultConfig { defaultConfig {
minSdkVersion(15) minSdkVersion(15)
} }
}
// sourceSets.filterIsInstance(com.android.build.gradle.api.AndroidSourceSet::class.java).forEach { kotlin {
// it.manifest.srcFile("src/androidMain/res/AndroidManifest.xml") if (isAndroidSDKAvailable) {
// it.res.srcDirs(file("src/androidMain/res")) android("android") {
// } publishAllLibraryVariants()
//(sourceSets["main"] as AndroidSourceSet).java.srcDirs(file("src/androidMain/kotlin"))
}
} }
} else { } else {
println( println(
......
mirai-core-timpc/build.gradle.kts
View file @ 010883ec
...@@ -32,23 +32,18 @@ version = rootProject.ext.get("mirai_version")!!.toString() ...@@ -32,23 +32,18 @@ version = rootProject.ext.get("mirai_version")!!.toString()
val isAndroidSDKAvailable: Boolean by project val isAndroidSDKAvailable: Boolean by project
kotlin { android {
if (isAndroidSDKAvailable) {
android("android") {
publishAllLibraryVariants()
project.android {
compileSdkVersion(29) compileSdkVersion(29)
defaultConfig { defaultConfig {
minSdkVersion(15) minSdkVersion(15)
} }
}
// sourceSets.filterIsInstance(com.android.build.gradle.api.AndroidSourceSet::class.java).forEach { kotlin {
// it.manifest.srcFile("src/androidMain/res/AndroidManifest.xml") if (isAndroidSDKAvailable) {
// it.res.srcDirs(file("src/androidMain/res")) android("android") {
// } publishAllLibraryVariants()
//(sourceSets["main"] as AndroidSourceSet).java.srcDirs(file("src/androidMain/kotlin")) project.apply(plugin = "com.android.library")
}
} }
} else { } else {
println( println(
......
mirai-core/build.gradle.kts
View file @ 010883ec
...@@ -31,23 +31,18 @@ description = "QQ protocol library" ...@@ -31,23 +31,18 @@ description = "QQ protocol library"
val isAndroidSDKAvailable: Boolean by project val isAndroidSDKAvailable: Boolean by project
kotlin { android {
if (isAndroidSDKAvailable) {
android("android") {
publishAllLibraryVariants()
project.android {
compileSdkVersion(29) compileSdkVersion(29)
defaultConfig { defaultConfig {
minSdkVersion(15) minSdkVersion(15)
} }
}
// sourceSets.filterIsInstance(com.android.build.gradle.api.AndroidSourceSet::class.java).forEach { kotlin {
// it.manifest.srcFile("src/androidMain/res/AndroidManifest.xml") if (isAndroidSDKAvailable) {
// it.res.srcDirs(file("src/androidMain/res")) project.apply(plugin = "com.android.library")
// } android("android") {
//(sourceSets["main"] as AndroidSourceSet).java.srcDirs(file("src/androidMain/kotlin")) publishAllLibraryVariants()
}
} }
} else { } else {
println( println(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment