From 164f62142781c39230739c9f70620f6e9f282aac Mon Sep 17 00:00:00 2001 From: Him188 Date: Mon, 17 Apr 2023 11:40:28 +0100 Subject: [PATCH] [build] Fully support Android target; Update to Gradle 8.0 --- build.gradle.kts | 13 +- buildSrc/build.gradle.kts | 4 + .../kotlin/BinaryCompatibilityConfigurator.kt | 13 +- buildSrc/src/main/kotlin/DependencyDumper.kt | 3 +- buildSrc/src/main/kotlin/HmppConfigure.kt | 95 +++++- buildSrc/src/main/kotlin/ProjectConfigure.kt | 80 ++--- buildSrc/src/main/kotlin/Relocation.kt | 5 +- buildSrc/src/main/kotlin/Shadow.kt | 7 +- buildSrc/src/main/kotlin/Stdlib.kt | 10 + buildSrc/src/main/kotlin/Versions.kt | 4 +- .../src/main/kotlin/explicit-api.gradle.kts | 36 +++ buildSrc/src/main/kotlin/utils.kt | 4 +- gradle.properties | 7 +- gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 13 +- gradlew | 275 +++++++++++------- gradlew.bat | 25 +- .../backend/mirai-console/build.gradle.kts | 5 +- .../compiler-annotations/build.gradle.kts | 10 +- .../src/androidMain/AndroidManifest.xml | 12 + .../tools/gradle-plugin/build.gradle.kts | 12 +- .../src/main/kotlin/publishing.kt | 2 +- mirai-core-api/build.gradle.kts | 25 +- .../kotlin/package.kt | 2 +- .../src/androidMain/AndroidManifest.xml | 13 + .../kotlin/utils/PlatformLogger.android.kt | 20 +- .../androidTest/kotlin/android/util/Log.kt | 125 -------- mirai-core-utils/build.gradle.kts | 38 ++- .../src/androidMain/AndroidManifest.xml | 13 + .../androidTest/kotlin/AndroidUnwrapTest.kt | 32 -- mirai-core-utils/src/main/AndroidManifest.xml | 14 - mirai-core/build.gradle.kts | 10 +- .../androidInstrumentedTest/kotlin/package.kt | 10 + .../kotlin/test/initPlatform.android.kt | 15 +- .../src/androidMain/AndroidManifest.xml | 13 + .../androidTest/kotlin/android/util/Log.kt | 127 -------- mirai-core/src/androidTest/kotlin/package.kt | 10 - mirai-core/src/main/AndroidManifest.xml | 14 - settings.gradle.kts | 7 +- 39 files changed, 534 insertions(+), 589 deletions(-) create mode 100644 buildSrc/src/main/kotlin/Stdlib.kt create mode 100644 buildSrc/src/main/kotlin/explicit-api.gradle.kts create mode 100644 mirai-console/tools/compiler-annotations/src/androidMain/AndroidManifest.xml rename mirai-core-api/src/{androidTest => androidInstrumentedTest}/kotlin/package.kt (84%) create mode 100644 mirai-core-api/src/androidMain/AndroidManifest.xml delete mode 100644 mirai-core-api/src/androidTest/kotlin/android/util/Log.kt create mode 100644 mirai-core-utils/src/androidMain/AndroidManifest.xml delete mode 100644 mirai-core-utils/src/androidTest/kotlin/AndroidUnwrapTest.kt delete mode 100644 mirai-core-utils/src/main/AndroidManifest.xml create mode 100644 mirai-core/src/androidInstrumentedTest/kotlin/package.kt rename mirai-core/src/{androidTest => androidInstrumentedTest}/kotlin/test/initPlatform.android.kt (68%) create mode 100644 mirai-core/src/androidMain/AndroidManifest.xml delete mode 100644 mirai-core/src/androidTest/kotlin/android/util/Log.kt delete mode 100644 mirai-core/src/androidTest/kotlin/package.kt delete mode 100644 mirai-core/src/main/AndroidManifest.xml diff --git a/build.gradle.kts b/build.gradle.kts index 2ebe1040f..9d2978086 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,8 +39,9 @@ plugins { id("me.him188.kotlin-jvm-blocking-bridge") version Versions.blockingBridge id("me.him188.kotlin-dynamic-delegation") version Versions.dynamicDelegation apply false id("me.him188.maven-central-publish") version Versions.mavenCentralPublish apply false - id("com.gradle.plugin-publish") version "1.0.0-rc-3" apply false + id("com.gradle.plugin-publish") version "1.1.0" apply false id("org.jetbrains.kotlinx.binary-compatibility-validator") version Versions.binaryValidator apply false + id("com.android.library") apply false } osDetector = osdetector @@ -69,9 +70,7 @@ allprojects { configureMppShadow() configureEncoding() configureKotlinTestSettings() - configureKotlinExperimentalUsages() - - // useIr() + configureKotlinOptIns() if (isKotlinJvmProject) { configureFlattenSourceSets() @@ -110,12 +109,6 @@ extensions.findByName("buildScan")?.withGroovyBuilder { setProperty("termsOfServiceAgree", "yes") } -fun Project.useIr() { - kotlinCompilations?.forEach { kotlinCompilation -> - kotlinCompilation.kotlinOptions.freeCompilerArgs += "-Xuse-ir" - } -} - fun Project.configureDokka() { val isRoot = this@configureDokka == rootProject if (!isRoot) { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 881c0ee89..d671e2a0f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -70,6 +70,10 @@ dependencies { exclude("org.jetbrains.kotlin", "kotlin-stdlib-common") } + // https://mvnrepository.com/artifact/com.android.library/com.android.library.gradle.plugin + api("com.android.library:com.android.library.gradle.plugin:${version("androidGradlePlugin")}") + api("com.google.code.gson:gson:2.10.1") + api("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.0") api(gradleApi()) diff --git a/buildSrc/src/main/kotlin/BinaryCompatibilityConfigurator.kt b/buildSrc/src/main/kotlin/BinaryCompatibilityConfigurator.kt index 5031a54c1..ca09ff625 100644 --- a/buildSrc/src/main/kotlin/BinaryCompatibilityConfigurator.kt +++ b/buildSrc/src/main/kotlin/BinaryCompatibilityConfigurator.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -52,7 +52,8 @@ object BinaryCompatibilityConfigurator { } } - private fun Project.getValidatorDir(dir: File) = ":validator" + project.path + ":${dir.name}" + // Also change: settings.gradle.kts:116 + private fun Project.getValidatorDir(dir: File) = ":validator" + project.path + "-validator:${dir.name}" private fun File.writeTextIfNeeded(text: String) { if (!this.exists()) return this.writeText(text) @@ -81,7 +82,13 @@ object BinaryCompatibilityConfigurator { if (targetName == null) { tasks.findByName("apiBuild")?.dependsOn(project.tasks.getByName("jar")) } else { - tasks.findByName("apiBuild")?.dependsOn(project.tasks.getByName("${targetName}Jar")) + tasks.findByName("apiBuild")?.dependsOn( + if (targetName.contains("android")) { + project.tasks.getByName("bundleDebugAar") + } else { + project.tasks.getByName("${targetName}Jar") + } + ) } } } diff --git a/buildSrc/src/main/kotlin/DependencyDumper.kt b/buildSrc/src/main/kotlin/DependencyDumper.kt index 55075a05d..46598e62b 100644 --- a/buildSrc/src/main/kotlin/DependencyDumper.kt +++ b/buildSrc/src/main/kotlin/DependencyDumper.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -70,7 +70,6 @@ object DependencyDumper { val outFile = temporaryDir.resolve(out) outputs.file(outFile) val conf = project.configurations.getByName(confName) - dependsOn(conf) doLast { outFile.parentFile.mkdirs() diff --git a/buildSrc/src/main/kotlin/HmppConfigure.kt b/buildSrc/src/main/kotlin/HmppConfigure.kt index 0604594d7..a1a1c16aa 100644 --- a/buildSrc/src/main/kotlin/HmppConfigure.kt +++ b/buildSrc/src/main/kotlin/HmppConfigure.kt @@ -7,9 +7,14 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ +@file:Suppress("UNUSED_VARIABLE") + +import com.android.build.api.dsl.LibraryExtension import com.google.gradle.osdetector.OsDetector +import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.attributes.Attribute +import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.getting import org.gradle.kotlin.dsl.withType @@ -23,6 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink import java.io.File +import java.util.* val MIRAI_PLATFORM_ATTRIBUTE = Attribute.of( "net.mamoe.mirai.platform", String::class.java @@ -37,7 +43,7 @@ val MIRAI_PLATFORM_INTERMEDIATE = Attribute.of( val IDEA_ACTIVE = System.getProperty("idea.active") == "true" && System.getProperty("publication.test") != "true" -val OS_NAME = System.getProperty("os.name").toLowerCase() +val OS_NAME = System.getProperty("os.name").lowercase() lateinit var osDetector: OsDetector @@ -162,7 +168,7 @@ fun Project.configureJvmTargetsHierarchical() { compilations.all { this.compileTaskProvider.configure { // IDE complain enabled = false - } + } } attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.common) // magic attributes.attribute(MIRAI_PLATFORM_ATTRIBUTE, "jvmBase") // avoid resolution @@ -183,16 +189,47 @@ fun Project.configureJvmTargetsHierarchical() { if (isTargetEnabled("android")) { if (isAndroidSDKAvailable) { - jvm("android") { - attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.androidJvm) +// apply(plugin = "com.android.library") + android { if (IDEA_ACTIVE) { attributes.attribute(MIRAI_PLATFORM_ATTRIBUTE, "android") // avoid resolution } } + configureAndroidTarget() val androidMain by sourceSets.getting - val androidTest by sourceSets.getting - androidMain.dependsOn(jvmBaseMain) - androidTest.dependsOn(jvmBaseTest) + for (s in arrayOf("androidMain")) { + sourceSets.all { if (name in s) dependsOn(jvmBaseMain) } + } + // this can cause problems on sync +// for (s in arrayOf("androidDebug", "androidRelease")) { +// sourceSets.all { if (name in s) dependsOn(androidMain) } +// } + val androidUnitTest by sourceSets.getting { + dependsOn(jvmBaseTest) + } +// for (s in arrayOf("androidUnitTestDebug", "androidUnitTestRelease")) { +// sourceSets.all { if (name in s) dependsOn(androidUnitTest) } +// } + val androidInstrumentedTest by sourceSets.getting { + dependsOn(jvmBaseTest) + } +// for (s in arrayOf("androidInstrumentedTestDebug")) { +// sourceSets.all { if (name in s) dependsOn(androidInstrumentedTest) } +// } + +// afterEvaluate { +//// > androidDebug dependsOn commonMain +//// androidInstrumentedTest dependsOn jvmBaseTest +//// androidInstrumentedTestDebug dependsOn +//// androidMain dependsOn commonMain, jvmBaseMain +//// androidRelease dependsOn commonMain +//// androidUnitTest dependsOn commonTest, jvmBaseTest +//// androidUnitTestDebug dependsOn commonTest +//// androidUnitTestRelease dependsOn commonTest +// error(this@apply.sourceSets.joinToString("\n") { +// it.name + " dependsOn " + it.dependsOn.joinToString { it.name } +// }) +// } } else { printAndroidNotInstalled() } @@ -210,6 +247,41 @@ fun Project.configureJvmTargetsHierarchical() { } } +@Suppress("UnstableApiUsage") +fun Project.configureAndroidTarget() { + extensions.getByType(KotlinMultiplatformExtension::class.java).apply { + + // trick + this.sourceSets.apply { + removeIf { it.name == "androidAndroidTestRelease" } + removeIf { it.name == "androidTestFixtures" } + removeIf { it.name == "androidTestFixturesDebug" } + removeIf { it.name == "androidTestFixturesRelease" } + } + } + + extensions.getByType(LibraryExtension::class.java).apply { + compileSdk = 33 + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + defaultConfig { + minSdk = rootProject.extra["mirai.android.target.api.level"]!!.toString().toInt() + targetSdk = 33 + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + buildTypes.getByName("release") { + isMinifyEnabled = true + isShrinkResources = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + ) + } + } +} + + /** * ``` * common @@ -235,13 +307,14 @@ fun KotlinMultiplatformExtension.configureNativeTargetsHierarchical( val nativeMainSets = mutableListOf() val nativeTestSets = mutableListOf() - val nativeTargets = mutableListOf() // actually KotlinNativeTarget, but KotlinNativeTarget is an internal API (complained by IDEA) + val nativeTargets = + mutableListOf() // actually KotlinNativeTarget, but KotlinNativeTarget is an internal API (complained by IDEA) fun KotlinMultiplatformExtension.addNativeTarget( preset: KotlinTargetPreset<*>, ): KotlinTarget { - val target = targetFromPreset(preset, preset.name) + val target = targetFromPreset(preset, preset.name) nativeMainSets.add(target.compilations[MAIN_COMPILATION_NAME].kotlinSourceSets.first()) nativeTestSets.add(target.compilations[TEST_COMPILATION_NAME].kotlinSourceSets.first()) nativeTargets.add(target) @@ -387,10 +460,10 @@ fun KotlinMultiplatformExtension.configureNativeTargetBinaries(project: Project) val target = targets.getByName(targetName) as KotlinNativeTarget target.binaries { sharedLib(listOf(NativeBuildType.DEBUG, NativeBuildType.RELEASE)) { - baseName = project.name.toLowerCase().replace("-", "") + baseName = project.name.lowercase(Locale.ROOT).replace("-", "") } staticLib(listOf(NativeBuildType.DEBUG, NativeBuildType.RELEASE)) { - baseName = project.name.toLowerCase().replace("-", "") + baseName = project.name.lowercase(Locale.ROOT).replace("-", "") } } } diff --git a/buildSrc/src/main/kotlin/ProjectConfigure.kt b/buildSrc/src/main/kotlin/ProjectConfigure.kt index 6ba1a91b3..28db4beda 100644 --- a/buildSrc/src/main/kotlin/ProjectConfigure.kt +++ b/buildSrc/src/main/kotlin/ProjectConfigure.kt @@ -7,32 +7,23 @@ * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") - import org.gradle.api.JavaVersion +import org.gradle.api.NamedDomainObjectCollection +import org.gradle.api.NamedDomainObjectList import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.tasks.bundling.Jar import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.* -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension +import org.jetbrains.kotlin.gradle.dsl.* +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile - -fun Project.useIr() { - kotlinCompilations?.forEach { kotlinCompilation -> - kotlinCompilation.kotlinOptions.freeCompilerArgs += "-Xuse-ir" - } -} - private fun Project.jvmVersion(): JavaVersion { return if (project.path.endsWith("mirai-console-intellij")) { JavaVersion.VERSION_17 @@ -94,22 +85,16 @@ fun Project.preConfigureJvmTarget() { fun Project.configureJvmTarget() { val defaultVer = jvmVersion() - configure(kotlinSourceSets.orEmpty()) { - languageSettings { - optIn("net.mamoe.mirai.utils.TestOnly") - optIn("kotlinx.coroutines.ExperimentalCoroutinesApi") - } - } - extensions.findByType(JavaPluginExtension::class.java)?.run { sourceCompatibility = defaultVer targetCompatibility = defaultVer } - kotlinTargets.orEmpty().filterIsInstance().forEach { target -> - when (target.attributes.getAttribute(KotlinPlatformType.attribute)) { // mirai does magic, don't use target.platformType + allKotlinTargets().all { + if (this !is KotlinJvmTarget) return@all + when (this.attributes.getAttribute(KotlinPlatformType.attribute)) { // mirai does magic, don't use target.platformType KotlinPlatformType.androidJvm -> { - target.compilations.all { + this.compilations.all { /* * Kotlin JVM compiler generates Long.hashCode witch is available since API 26 when targeting JVM 1.8 while IR prefer member function hashCode always. */ @@ -122,7 +107,7 @@ fun Project.configureJvmTarget() { else -> { } } - target.testRuns["test"].executionTask.configure { useJUnitPlatform() } + this.testRuns["test"].executionTask.configure { useJUnitPlatform() } } } @@ -148,7 +133,8 @@ fun Project.configureKotlinTestSettings() { } isKotlinMpp -> { - kotlinSourceSets?.forEach { sourceSet -> + kotlinSourceSets?.all { + val sourceSet = this fun configureJvmTest(sourceSet: KotlinSourceSet) { sourceSet.dependencies { implementation(kotlin("test-junit5"))?.because(b) @@ -158,12 +144,14 @@ fun Project.configureKotlinTestSettings() { } } - val target = kotlinTargets.orEmpty() + val target = allKotlinTargets() .find { it.name == sourceSet.name.substringBeforeLast("Main").substringBeforeLast("Test") } when { sourceSet.name == "commonTest" -> { - if (isJvmLikePlatform(target)) { + if (target?.platformType == KotlinPlatformType.jvm && + target.attributes.getAttribute(MIRAI_PLATFORM_INTERMEDIATE) != true + ) { configureJvmTest(sourceSet) } else { sourceSet.dependencies { @@ -174,7 +162,9 @@ fun Project.configureKotlinTestSettings() { } sourceSet.name.contains("test", ignoreCase = true) -> { - if (isJvmLikePlatform(target)) { + if (target?.platformType == KotlinPlatformType.jvm && + target.attributes.getAttribute(MIRAI_PLATFORM_INTERMEDIATE) != true + ) { configureJvmTest(sourceSet) } } @@ -191,7 +181,9 @@ val testExperimentalAnnotations = arrayOf( "kotlin.ExperimentalUnsignedTypes", "kotlin.time.ExperimentalTime", "io.ktor.util.KtorExperimentalAPI", - "kotlin.io.path.ExperimentalPathApi" + "kotlin.io.path.ExperimentalPathApi", + "kotlinx.coroutines.ExperimentalCoroutinesApi", + "net.mamoe.mirai.utils.TestOnly", ) val experimentalAnnotations = arrayOf( @@ -217,11 +209,10 @@ val testLanguageFeatures = listOf( "ContextReceivers" ) -fun Project.configureKotlinExperimentalUsages() { +fun Project.configureKotlinOptIns() { val sourceSets = kotlinSourceSets ?: return - - for (target in sourceSets) { - target.configureKotlinExperimentalUsages() + sourceSets.all { + configureKotlinOptIns() } for (name in testLanguageFeatures) { @@ -233,7 +224,7 @@ fun Project.configureKotlinExperimentalUsages() { } } -fun KotlinSourceSet.configureKotlinExperimentalUsages() { +fun KotlinSourceSet.configureKotlinOptIns() { languageSettings.progressiveMode = true experimentalAnnotations.forEach { a -> languageSettings.optIn(a) @@ -278,13 +269,22 @@ inline fun Any?.safeAs(): T? { val Project.kotlinSourceSets get() = extensions.findByName("kotlin").safeAs()?.sourceSets -val Project.kotlinTargets - get() = - extensions.findByName("kotlin").safeAs>()?.target?.let { listOf(it) } - ?: extensions.findByName("kotlin").safeAs()?.targets +fun Project.allKotlinTargets(): NamedDomainObjectCollection { + return extensions.findByName("kotlin")?.safeAs>() + ?.target?.let { namedDomainObjectListOf(it) } + ?: extensions.findByName("kotlin")?.safeAs()?.targets + ?: namedDomainObjectListOf() +} + +private inline fun Project.namedDomainObjectListOf(vararg values: T): NamedDomainObjectList { + return objects.namedDomainObjectList(T::class.java).apply { addAll(values) } +} val Project.isKotlinJvmProject: Boolean get() = extensions.findByName("kotlin") is KotlinJvmProjectExtension val Project.isKotlinMpp: Boolean get() = extensions.findByName("kotlin") is KotlinMultiplatformExtension -val Project.kotlinCompilations - get() = kotlinTargets?.flatMap { it.compilations } \ No newline at end of file +fun Project.allKotlinCompilations(action: (KotlinCompilation) -> Unit) { + allKotlinTargets().all { + compilations.all(action) + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Relocation.kt b/buildSrc/src/main/kotlin/Relocation.kt index e4ac586e2..5f6d7ea3a 100644 --- a/buildSrc/src/main/kotlin/Relocation.kt +++ b/buildSrc/src/main/kotlin/Relocation.kt @@ -98,6 +98,7 @@ fun KotlinDependencyHandler.relocateCompileOnly( relocatedDependency: RelocatedDependency, ): ExternalModuleDependency { val dependency = compileOnly(relocatedDependency.notation) { + relocatedDependency.exclusionAction(this) } project.relocationFilters.add( RelocationFilter( @@ -122,6 +123,7 @@ fun DependencyHandler.relocateCompileOnly( ): Dependency { val dependency = addDependencyTo(this, "compileOnly", relocatedDependency.notation, Action { + relocatedDependency.exclusionAction(this) }) project.relocationFilters.add( RelocationFilter( @@ -145,7 +147,7 @@ fun KotlinDependencyHandler.relocateImplementation( action: ExternalModuleDependency.() -> Unit = {} ): ExternalModuleDependency { val dependency = implementation(relocatedDependency.notation) { - + relocatedDependency.exclusionAction(this) } project.relocationFilters.add( RelocationFilter( @@ -181,6 +183,7 @@ fun DependencyHandler.relocateImplementation( ): ExternalModuleDependency { val dependency = addDependencyTo(this, "implementation", relocatedDependency.notation, Action { + relocatedDependency.exclusionAction(this) }) project.relocationFilters.add( RelocationFilter( diff --git a/buildSrc/src/main/kotlin/Shadow.kt b/buildSrc/src/main/kotlin/Shadow.kt index 8fab0da71..2cff6cc5e 100644 --- a/buildSrc/src/main/kotlin/Shadow.kt +++ b/buildSrc/src/main/kotlin/Shadow.kt @@ -55,13 +55,16 @@ fun Project.configureShadowDependenciesForPublishing() { "configureShadowDependenciesForPublishing can only be used on root project." } + val jarTaskNames = arrayOf("jvmJar", "jvmBaseJar") gradle.projectsEvaluated { // Tasks requested to run in this build val allTasks = rootProject.allprojects.asSequence().flatMap { it.tasks } val publishTasks = allTasks.filter { it.name.contains("publish", ignoreCase = true) } val relocateTasks = allTasks.filter { it.name.contains("relocate", ignoreCase = true) } - val jarTasks = allTasks.filter { it.name.contains("jar", ignoreCase = true) } + val jarTasks = allTasks.filter { + it.name in jarTaskNames + } val compileKotlinTasks = allTasks.filter { it.name.contains("compileKotlin", ignoreCase = true) } val compileTestKotlinTasks = allTasks.filter { it.name.contains("compileTestKotlin", ignoreCase = true) } @@ -99,7 +102,7 @@ private fun KotlinTarget.configureRelocationForMppTarget(project: Project) = pro group = "mirai" description = "Relocate dependencies to internal package" destinationDirectory.set(buildDir.resolve("libs")) // build/libs - archiveBaseName.set("${project.name}-${targetName.toLowerCase()}") // e.g. "mirai-core-api-jvm" + archiveBaseName.set("${project.name}-${targetName.lowercase()}") // e.g. "mirai-core-api-jvm" dependsOn(compilations["main"].compileTaskProvider) // e.g. compileKotlinJvm diff --git a/buildSrc/src/main/kotlin/Stdlib.kt b/buildSrc/src/main/kotlin/Stdlib.kt new file mode 100644 index 000000000..8bf5f8684 --- /dev/null +++ b/buildSrc/src/main/kotlin/Stdlib.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2019-2023 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/dev/LICENSE + */ + +fun String.capitalize(): String = this.replaceFirstChar { it.uppercaseChar() } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 4d101516e..0ab3b854a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -56,7 +56,7 @@ object Versions { const val dynamicDelegation = "0.4.0-180.1" const val mavenCentralPublish = "1.0.0" - const val androidGradlePlugin = "4.1.1" + const val androidGradlePlugin = "7.3.1" const val android = "4.1.1.4" const val shadow = "8.1.0" @@ -172,6 +172,7 @@ object ExcludeProperties { val `kotlinx-coroutines` = multiplatformJvm(groupId = "org.jetbrains.kotlinx", "kotlinx-coroutines") val `ktor-io` = multiplatformJvm(groupId = "io.ktor", "ktor-io") val `everything from slf4j` = exclude(groupId = "org.slf4j", null) + val `slf4j-api` = exclude(groupId = "org.slf4j", "slf4j-api") /** * @see org.gradle.kotlin.dsl.exclude @@ -192,6 +193,7 @@ object ExcludeProperties { val `ktor-io` = ktor("io", Versions.ktor) val `ktor-io_relocated` = RelocatedDependency(`ktor-io`, "io.ktor.utils.io") { exclude(ExcludeProperties.`everything from slf4j`) + exclude(ExcludeProperties.`slf4j-api`) } val `ktor-http` = ktor("http", Versions.ktor) diff --git a/buildSrc/src/main/kotlin/explicit-api.gradle.kts b/buildSrc/src/main/kotlin/explicit-api.gradle.kts new file mode 100644 index 000000000..a0fe9045a --- /dev/null +++ b/buildSrc/src/main/kotlin/explicit-api.gradle.kts @@ -0,0 +1,36 @@ +/* + * Copyright 2019-2023 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/dev/LICENSE + */ + +import org.jetbrains.kotlin.gradle.dsl.KotlinCompile + +/* + * Copyright 2019-2023 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/dev/LICENSE + */ + +private val EXPLICIT_API = "-Xexplicit-api=strict" + +// Workaround for explicit API in androidMain +// https://youtrack.jetbrains.com/issue/KT-37652/Support-explicit-mode-for-Android-projects +// https://youtrack.jetbrains.com/issue/KT-37652/Support-explicit-mode-for-Android-projects#focus=Comments-27-4501224.0-0 + +project.tasks + .matching { it is KotlinCompile<*> && !it.name.contains("test", ignoreCase = true) } + .configureEach { + if (!project.hasProperty("kotlin.optOutExplicitApi")) { + val kotlinCompile = this as KotlinCompile<*> + if (EXPLICIT_API !in kotlinCompile.kotlinOptions.freeCompilerArgs) { + kotlinCompile.kotlinOptions.freeCompilerArgs += EXPLICIT_API + } + } + } diff --git a/buildSrc/src/main/kotlin/utils.kt b/buildSrc/src/main/kotlin/utils.kt index 9b341356e..a43f9c985 100644 --- a/buildSrc/src/main/kotlin/utils.kt +++ b/buildSrc/src/main/kotlin/utils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -34,7 +34,7 @@ fun ByteArray.toUHexString( return buildString(length * 2) { this@toUHexString.forEachIndexed { index, it -> if (index in offset until lastIndex) { - var ret = it.toUByte().toString(16).toUpperCase() + var ret = it.toUByte().toString(16).uppercase() if (ret.length == 1) ret = "0$ret" append(ret) if (index < lastIndex - 1) append(separator) diff --git a/gradle.properties b/gradle.properties index 77b8ce418..f3e7b5391 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # -# Copyright 2019-2022 Mamoe Technologies and contributors. +# Copyright 2019-2023 Mamoe Technologies and contributors. # # 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. # Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -23,4 +23,7 @@ systemProp.use.maven.local=false org.gradle.caching=true kotlin.native.ignoreIncorrectDependencies=true kotlin.mpp.enableCInteropCommonization=true -kotlin.mpp.stability.nowarn=true \ No newline at end of file +kotlin.mpp.stability.nowarn=true +kotlin.mpp.androidSourceSetLayoutVersion=2 + +android.disableAutomaticComponentCreation=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2faf2fc91d853cd5d4242b5547257070..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18411 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 Hzh{2~$&vlj delta 17345 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 QW2~J&pQ{+#&jH5%0<2&hD*ylh diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b681bca7..0b23fb224 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,13 +1,14 @@ # -# Copyright 2019-2021 Mamoe Technologies and contributors. +# Copyright 2019-2023 Mamoe Technologies and contributors. # -# 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. -# Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. +# 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. +# Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. # -# https://github.com/mamoe/mirai/blob/master/LICENSE +# https://github.com/mamoe/mirai/blob/dev/LICENSE # -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index d77a7183f..4b2f8af9f 100755 --- a/gradlew +++ b/gradlew @@ -1,87 +1,122 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2019-2020 Mamoe Technologies and contributors. +# Copyright 2019-2023 Mamoe Technologies and contributors. # -# 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. -# Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. +# 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. +# Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. # -# https://github.com/mamoe/mirai/blob/master/LICENSE +# https://github.com/mamoe/mirai/blob/dev/LICENSE # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -90,7 +125,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -98,79 +133,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d96..107acd32c 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/mirai-console/backend/mirai-console/build.gradle.kts b/mirai-console/backend/mirai-console/build.gradle.kts index 3843f8530..55baa189a 100644 --- a/mirai-console/backend/mirai-console/build.gradle.kts +++ b/mirai-console/backend/mirai-console/build.gradle.kts @@ -10,6 +10,7 @@ @file:Suppress("UnusedImport") import BinaryCompatibilityConfigurator.configureBinaryValidator +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -33,9 +34,11 @@ kotlin { // 搜索 mirai-console (包括 core) 直接使用并对外公开的类 (api) configurations.create("consoleRuntimeClasspath").attributes { - attribute(Usage.USAGE_ATTRIBUTE, + attribute( + Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, Usage.JAVA_API) ) + attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm) }.also { consoleRuntimeClasspath -> consoleRuntimeClasspath.exclude(group = "io.ktor") } diff --git a/mirai-console/tools/compiler-annotations/build.gradle.kts b/mirai-console/tools/compiler-annotations/build.gradle.kts index 8e84c41b6..b766f83e3 100644 --- a/mirai-console/tools/compiler-annotations/build.gradle.kts +++ b/mirai-console/tools/compiler-annotations/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -12,6 +12,7 @@ plugins { kotlin("multiplatform") `maven-publish` + id("com.android.library") } version = Versions.console @@ -19,9 +20,14 @@ description = "Mirai Console compiler annotations" kotlin { explicitApi() + apply(plugin = "explicit-api") configureJvmTargetsHierarchical() configureNativeTargetsHierarchical(project) } -configureMppPublishing() \ No newline at end of file +configureMppPublishing() + +android { + namespace = "net.mamoe.mirai.compiler.annotations" +} \ No newline at end of file diff --git a/mirai-console/tools/compiler-annotations/src/androidMain/AndroidManifest.xml b/mirai-console/tools/compiler-annotations/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..2b6b4c5a2 --- /dev/null +++ b/mirai-console/tools/compiler-annotations/src/androidMain/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/mirai-console/tools/gradle-plugin/build.gradle.kts b/mirai-console/tools/gradle-plugin/build.gradle.kts index 89af28b53..a0b01b1d0 100644 --- a/mirai-console/tools/gradle-plugin/build.gradle.kts +++ b/mirai-console/tools/gradle-plugin/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -69,20 +69,18 @@ kotlin { explicitApi() } -pluginBundle { - website = "https://github.com/mamoe/mirai" - vcsUrl = "https://github.com/mamoe/mirai" - tags = listOf("framework", "kotlin", "mirai") -} - +@Suppress("UnstableApiUsage") gradlePlugin { testSourceSets(integTest) + website.set("https://github.com/mamoe/mirai") + vcsUrl.set("https://github.com/mamoe/mirai") plugins { create("miraiConsole") { id = "net.mamoe.mirai-console" displayName = "Mirai Console" description = project.description implementationClass = "net.mamoe.mirai.console.gradle.MiraiConsoleGradlePlugin" + tags.set(listOf("framework", "kotlin", "mirai")) } } } diff --git a/mirai-console/tools/gradle-plugin/src/main/kotlin/publishing.kt b/mirai-console/tools/gradle-plugin/src/main/kotlin/publishing.kt index 7fcd4dbbf..05ffe4083 100644 --- a/mirai-console/tools/gradle-plugin/src/main/kotlin/publishing.kt +++ b/mirai-console/tools/gradle-plugin/src/main/kotlin/publishing.kt @@ -130,7 +130,7 @@ private fun Project.registerMavenPublications(target: KotlinTarget, isSingleTarg @Suppress("DEPRECATION") val sourcesJar by tasks.registering(Jar::class) { - classifier = "sources" + archiveClassifier.set("sources") from(sourceSets["main"].allSource) } diff --git a/mirai-core-api/build.gradle.kts b/mirai-core-api/build.gradle.kts index 7d6473b3b..4472d43fb 100644 --- a/mirai-core-api/build.gradle.kts +++ b/mirai-core-api/build.gradle.kts @@ -11,6 +11,7 @@ import BinaryCompatibilityConfigurator.configureBinaryValidators plugins { + id("com.android.library") kotlin("multiplatform") kotlin("plugin.serialization") @@ -27,11 +28,12 @@ description = "Mirai API module" kotlin { explicitApi() + apply(plugin = "explicit-api") + configureJvmTargetsHierarchical() configureNativeTargetsHierarchical(project) - sourceSets { val commonMain by getting { dependencies { @@ -44,7 +46,10 @@ kotlin { implementation(project(":mirai-console-compiler-annotations")) implementation(`kotlinx-serialization-protobuf`) implementation(`kotlinx-atomicfu`) - relocateCompileOnly(`ktor-io_relocated`) // runtime from mirai-core-utils + + // runtime from mirai-core-utils + relocateCompileOnly(`ktor-io_relocated`) + implementation(`kotlin-jvm-blocking-bridge`) implementation(`kotlin-dynamic-delegation`) } @@ -65,9 +70,17 @@ kotlin { } } + afterEvaluate { + getByName("androidUnitTest") { + dependencies { + runtimeOnly(`slf4j-api`) + } + } + } + findByName("androidMain")?.apply { dependencies { - compileOnly(`android-runtime`) +// compileOnly(`android-runtime`) } } @@ -116,4 +129,8 @@ configureBinaryValidators(setOf("jvm", "android").filterTargets()) // developer("Mamoe Technologies", email = "support@mamoe.net", url = "https://github.com/mamoe") // licenseFromGitHubProject("AGPLv3", "dev") // publishPlatformArtifactsInRootModule = "jvm" -//} \ No newline at end of file +//} + +android { + namespace = "net.mamoe.mirai" +} \ No newline at end of file diff --git a/mirai-core-api/src/androidTest/kotlin/package.kt b/mirai-core-api/src/androidInstrumentedTest/kotlin/package.kt similarity index 84% rename from mirai-core-api/src/androidTest/kotlin/package.kt rename to mirai-core-api/src/androidInstrumentedTest/kotlin/package.kt index b321db446..ccc669bfe 100644 --- a/mirai-core-api/src/androidTest/kotlin/package.kt +++ b/mirai-core-api/src/androidInstrumentedTest/kotlin/package.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. diff --git a/mirai-core-api/src/androidMain/AndroidManifest.xml b/mirai-core-api/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..2e62ef017 --- /dev/null +++ b/mirai-core-api/src/androidMain/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/mirai-core-api/src/androidMain/kotlin/utils/PlatformLogger.android.kt b/mirai-core-api/src/androidMain/kotlin/utils/PlatformLogger.android.kt index 9b5d9ccef..dc3b8789f 100644 --- a/mirai-core-api/src/androidMain/kotlin/utils/PlatformLogger.android.kt +++ b/mirai-core-api/src/androidMain/kotlin/utils/PlatformLogger.android.kt @@ -1,14 +1,12 @@ /* - * Copyright 2019-2021 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. * - * https://github.com/mamoe/mirai/blob/master/LICENSE + * https://github.com/mamoe/mirai/blob/dev/LICENSE */ -@file:Suppress("MemberVisibilityCanBePrivate") - package net.mamoe.mirai.utils import android.util.Log @@ -26,7 +24,7 @@ public actual open class PlatformLogger actual constructor( ) : MiraiLoggerPlatformBase() { public override fun verbose0(message: String?) { - Log.v(identity, message) + Log.v(identity, message.toString()) } public override fun verbose0(message: String?, e: Throwable?) { @@ -35,7 +33,7 @@ public actual open class PlatformLogger actual constructor( public override fun info0(message: String?) { - Log.i(identity, message) + Log.i(identity, message.toString()) } public override fun info0(message: String?, e: Throwable?) { @@ -44,7 +42,7 @@ public actual open class PlatformLogger actual constructor( public override fun warning0(message: String?) { - Log.w(identity, message) + Log.w(identity, message.toString()) } public override fun warning0(message: String?, e: Throwable?) { @@ -53,7 +51,7 @@ public actual open class PlatformLogger actual constructor( public override fun error0(message: String?) { - Log.e(identity, message) + Log.e(identity, message.toString()) } public override fun error0(message: String?, e: Throwable?) { @@ -62,7 +60,7 @@ public actual open class PlatformLogger actual constructor( public override fun debug0(message: String?) { - Log.d(identity, message) + Log.d(identity, message.toString()) } public override fun debug0(message: String?, e: Throwable?) { diff --git a/mirai-core-api/src/androidTest/kotlin/android/util/Log.kt b/mirai-core-api/src/androidTest/kotlin/android/util/Log.kt deleted file mode 100644 index 5d9ecbe64..000000000 --- a/mirai-core-api/src/androidTest/kotlin/android/util/Log.kt +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2019-2022 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/dev/LICENSE - */ - -package android.util - -import net.mamoe.mirai.internal.utils.StdoutLogger - -// Dummy implementation for tests, since we don't have a SDK - -@Suppress("UNUSED_PARAMETER", "unused") -object Log { - const val VERBOSE = 2 - const val DEBUG = 3 - const val INFO = 4 - const val WARN = 5 - const val ERROR = 6 - const val ASSERT = 7 - - private val stdout = StdoutLogger("AndroidLog") - - @JvmStatic - fun v(tag: String?, msg: String?): Int { - stdout.verbose(msg) - return 0 - } - - @JvmStatic - fun v(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.verbose(msg, tr) - return 0 - } - - @JvmStatic - fun d(tag: String?, msg: String?): Int { - stdout.debug(msg, tr) - return 0 - } - - @JvmStatic - fun d(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.debug(msg, tr) - return 0 - } - - @JvmStatic - fun i(tag: String?, msg: String?): Int { - stdout.info(msg, tr) - return 0 - } - - @JvmStatic - fun i(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.info(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, msg: String?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, tr: Throwable?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun e(tag: String?, msg: String?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun e(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, msg: String?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun getStackTraceString(tr: Throwable): String { - return tr.stackTraceToString() - } - - @JvmStatic - fun println(priority: Int, tag: String?, msg: String?): Int { - stdout.info(msg, tr) - return 0 - } - - - private inline val tr get() = null - private inline val msg get() = null -} diff --git a/mirai-core-utils/build.gradle.kts b/mirai-core-utils/build.gradle.kts index cbd03ba9f..5b8623087 100644 --- a/mirai-core-utils/build.gradle.kts +++ b/mirai-core-utils/build.gradle.kts @@ -10,6 +10,7 @@ @file:Suppress("UNUSED_VARIABLE") plugins { + id("com.android.library") kotlin("multiplatform") kotlin("plugin.serialization") @@ -23,6 +24,7 @@ description = "mirai-core utilities" kotlin { explicitApi() + apply(plugin = "explicit-api") configureJvmTargetsHierarchical() configureNativeTargetsHierarchical(project) @@ -79,22 +81,22 @@ kotlin { } } -if (tasks.findByName("androidMainClasses") != null) { - tasks.register("checkAndroidApiLevel") { - doFirst { - analyzes.AndroidApiLevelCheck.check( - buildDir.resolve("classes/kotlin/android/main"), - project.property("mirai.android.target.api.level")!!.toString().toInt(), - project - ) - } - group = "verification" - this.mustRunAfter("androidMainClasses") - } - tasks.getByName("androidTest").dependsOn("checkAndroidApiLevel") -} +//if (tasks.findByName("androidMainClasses") != null) { +// tasks.register("checkAndroidApiLevel") { +// doFirst { +// analyzes.AndroidApiLevelCheck.check( +// buildDir.resolve("classes/kotlin/android/main"), +// project.property("mirai.android.target.api.level")!!.toString().toInt(), +// project +// ) +// } +// group = "verification" +// this.mustRunAfter("androidMainClasses") +// } +// tasks.getByName("androidTest").dependsOn("checkAndroidApiLevel") +//} -configureMppPublishing() +//configureMppPublishing() //mavenCentralPublish { // artifactId = "mirai-core-utils" @@ -102,4 +104,8 @@ configureMppPublishing() // developer("Mamoe Technologies", email = "support@mamoe.net", url = "https://github.com/mamoe") // licenseFromGitHubProject("AGPLv3", "dev") // publishPlatformArtifactsInRootModule = "jvm" -//} \ No newline at end of file +//} + +android { + namespace = "net.mamoe.mirai.utils" +} \ No newline at end of file diff --git a/mirai-core-utils/src/androidMain/AndroidManifest.xml b/mirai-core-utils/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..2e62ef017 --- /dev/null +++ b/mirai-core-utils/src/androidMain/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/mirai-core-utils/src/androidTest/kotlin/AndroidUnwrapTest.kt b/mirai-core-utils/src/androidTest/kotlin/AndroidUnwrapTest.kt deleted file mode 100644 index e26a90747..000000000 --- a/mirai-core-utils/src/androidTest/kotlin/AndroidUnwrapTest.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2019-2021 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/dev/LICENSE - */ - -package net.mamoe.mirai.utils - -import kotlin.test.Test -import kotlin.test.assertIs - -class AndroidUnwrapTest { - @Test - fun test() { - val e = - IllegalStateException( - OutOfMemoryError().initCause(VerifyError()).apply { addSuppressed(UnsatisfiedLinkError()) } - ) - - val unwrapped = e.unwrap() - - unwrapped.printStackTrace() - - assertIs(unwrapped) - assertIs(unwrapped.cause) - assertIs(unwrapped.suppressed.first()) - assertIs(unwrapped.suppressed[1]) - } -} \ No newline at end of file diff --git a/mirai-core-utils/src/main/AndroidManifest.xml b/mirai-core-utils/src/main/AndroidManifest.xml deleted file mode 100644 index decfa82ab..000000000 --- a/mirai-core-utils/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts index a1707deb4..8e2101219 100644 --- a/mirai-core/build.gradle.kts +++ b/mirai-core/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractNativeLibrary import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget plugins { + id("com.android.library") kotlin("multiplatform") id("kotlinx-atomicfu") kotlin("plugin.serialization") @@ -27,6 +28,7 @@ description = "Mirai Protocol implementation for QQ Android" kotlin { explicitApi() + apply(plugin = "explicit-api") configureJvmTargetsHierarchical() configureNativeTargetsHierarchical(project) @@ -238,4 +240,8 @@ configureBinaryValidators(setOf("jvm", "android").filterTargets()) // developer("Mamoe Technologies", email = "support@mamoe.net", url = "https://github.com/mamoe") // licenseFromGitHubProject("AGPLv3", "dev") // publishPlatformArtifactsInRootModule = "jvm" -//} \ No newline at end of file +//} + +android { + namespace = "net.mamoe.mirai.internal" +} \ No newline at end of file diff --git a/mirai-core/src/androidInstrumentedTest/kotlin/package.kt b/mirai-core/src/androidInstrumentedTest/kotlin/package.kt new file mode 100644 index 000000000..20b5b6a1b --- /dev/null +++ b/mirai-core/src/androidInstrumentedTest/kotlin/package.kt @@ -0,0 +1,10 @@ +/* + * Copyright 2019-2023 Mamoe Technologies and contributors. + * + * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. + * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. + * + * https://github.com/mamoe/mirai/blob/dev/LICENSE + */ + +package net.mamoe.mirai.internal \ No newline at end of file diff --git a/mirai-core/src/androidTest/kotlin/test/initPlatform.android.kt b/mirai-core/src/androidInstrumentedTest/kotlin/test/initPlatform.android.kt similarity index 68% rename from mirai-core/src/androidTest/kotlin/test/initPlatform.android.kt rename to mirai-core/src/androidInstrumentedTest/kotlin/test/initPlatform.android.kt index b5f4db808..6557d558d 100644 --- a/mirai-core/src/androidTest/kotlin/test/initPlatform.android.kt +++ b/mirai-core/src/androidInstrumentedTest/kotlin/test/initPlatform.android.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -9,10 +9,9 @@ package net.mamoe.mirai.internal.test +//import org.bouncycastle.jce.provider.BouncyCastleProvider import net.mamoe.mirai.utils.MiraiLogger -import org.bouncycastle.jce.provider.BouncyCastleProvider -import java.security.Security -import kotlin.test.Test +import org.junit.jupiter.api.Test import kotlin.test.assertIs internal actual fun initPlatform() { @@ -20,10 +19,10 @@ internal actual fun initPlatform() { } private val init: Unit by lazy { - if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) != null) { - Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME) - } - Security.addProvider(BouncyCastleProvider()) +// if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) != null) { +// Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME) +// } +// Security.addProvider(BouncyCastleProvider()) Unit } diff --git a/mirai-core/src/androidMain/AndroidManifest.xml b/mirai-core/src/androidMain/AndroidManifest.xml new file mode 100644 index 000000000..c6a680055 --- /dev/null +++ b/mirai-core/src/androidMain/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/mirai-core/src/androidTest/kotlin/android/util/Log.kt b/mirai-core/src/androidTest/kotlin/android/util/Log.kt deleted file mode 100644 index f56064097..000000000 --- a/mirai-core/src/androidTest/kotlin/android/util/Log.kt +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright 2019-2022 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/dev/LICENSE - */ - -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") - -package android.util - -import net.mamoe.mirai.internal.utils.StdoutLogger - -// Dummy implementation for tests, since we don't have an Android SDK - -@Suppress("UNUSED_PARAMETER", "unused") -object Log { - const val VERBOSE = 2 - const val DEBUG = 3 - const val INFO = 4 - const val WARN = 5 - const val ERROR = 6 - const val ASSERT = 7 - - private val stdout = StdoutLogger("AndroidLog") - - @JvmStatic - fun v(tag: String?, msg: String?): Int { - stdout.verbose(msg) - return 0 - } - - @JvmStatic - fun v(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.verbose(msg, tr) - return 0 - } - - @JvmStatic - fun d(tag: String?, msg: String?): Int { - stdout.debug(msg, tr) - return 0 - } - - @JvmStatic - fun d(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.debug(msg, tr) - return 0 - } - - @JvmStatic - fun i(tag: String?, msg: String?): Int { - stdout.info(msg, tr) - return 0 - } - - @JvmStatic - fun i(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.info(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, msg: String?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun w(tag: String?, tr: Throwable?): Int { - stdout.warning(msg, tr) - return 0 - } - - @JvmStatic - fun e(tag: String?, msg: String?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun e(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, msg: String?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun wtf(tag: String?, msg: String?, tr: Throwable?): Int { - stdout.error(msg, tr) - return 0 - } - - @JvmStatic - fun getStackTraceString(tr: Throwable): String { - return tr.stackTraceToString() - } - - @JvmStatic - fun println(priority: Int, tag: String?, msg: String?): Int { - stdout.info(msg, tr) - return 0 - } - - - private inline val tr get() = null - private inline val msg get() = null -} diff --git a/mirai-core/src/androidTest/kotlin/package.kt b/mirai-core/src/androidTest/kotlin/package.kt deleted file mode 100644 index 011261472..000000000 --- a/mirai-core/src/androidTest/kotlin/package.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2019-2021 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/master/LICENSE - */ - -package net.mamoe.mirai.internal \ No newline at end of file diff --git a/mirai-core/src/main/AndroidManifest.xml b/mirai-core/src/main/AndroidManifest.xml deleted file mode 100644 index d7ceff5df..000000000 --- a/mirai-core/src/main/AndroidManifest.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index e5456031b..f14dc74a5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Mamoe Technologies and contributors. + * Copyright 2019-2023 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -113,7 +113,8 @@ fun includeBinaryCompatibilityValidatorProjects() { if (!validationDir.exists()) continue validationDir.listFiles().orEmpty().forEach { dir -> if (dir.resolve("build.gradle.kts").isFile) { - val path = ":validator" + project.path + ":${dir.name}" + // Also change: BinaryCompatibilityConfigurator.getValidatorDir + val path = ":validator" + project.path + "-validator:${dir.name}" include(path) project(path).projectDir = dir // project(path).name = "${project.name}-validator-${dir.name}" @@ -166,8 +167,6 @@ fun includeConsoleIntegrationTestProjects() { } - - fun getLocalProperty(name: String): String? { return localProperties.getProperty(name) }