From 35fc5b945e96c7aa39f90ac039588966c0b0223b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E7=A9=BA?= <70465933+YuKongA@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:53:04 +0800 Subject: [PATCH] build(deps): Remove nexus-publish --- convention-plugins/build.gradle.kts | 4 ---- .../main/kotlin/module.publication.gradle.kts | 6 ++---- .../src/main/kotlin/root.publication.gradle.kts | 17 +---------------- gradle/libs.versions.toml | 2 -- settings.gradle.kts | 2 +- 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts index 5e77211..46f9c3f 100644 --- a/convention-plugins/build.gradle.kts +++ b/convention-plugins/build.gradle.kts @@ -1,7 +1,3 @@ plugins { `kotlin-dsl` -} - -dependencies { - implementation(libs.nexus.publish) } \ No newline at end of file diff --git a/convention-plugins/src/main/kotlin/module.publication.gradle.kts b/convention-plugins/src/main/kotlin/module.publication.gradle.kts index 02ece4d..237b757 100644 --- a/convention-plugins/src/main/kotlin/module.publication.gradle.kts +++ b/convention-plugins/src/main/kotlin/module.publication.gradle.kts @@ -48,8 +48,6 @@ publishing { } signing { - if (project.hasProperty("signing.gnupg.keyName")) { - useGpgCmd() - sign(publishing.publications) - } + useGpgCmd() + sign(publishing.publications) } diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts index 87dc791..d535b05 100644 --- a/convention-plugins/src/main/kotlin/root.publication.gradle.kts +++ b/convention-plugins/src/main/kotlin/root.publication.gradle.kts @@ -1,19 +1,4 @@ -plugins { - id("io.github.gradle-nexus.publish-plugin") -} - allprojects { group = "top.yukonga.miuix.kmp" version = "0.0.1" -} - -//nexusPublishing { -// // Configure maven central repository -// // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh -// repositories { -// sonatype { //only for users registered in Sonatype after 24 Feb 2021 -// nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) -// snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) -// } -// } -//} +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a2b1801..17ab484 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,13 +9,11 @@ androidx-window = "1.3.0" compose-plugin = "1.7.0-alpha02" haze = "0.9.0-alpha06" kotlin = "2.0.20-RC2" -nexus-publish = "2.0.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-window = { group = "androidx.window", name = "window", version.ref = "androidx-window" } haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" } -nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index f5e549a..cc453a7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,5 +16,5 @@ dependencyResolutionManagement { } } -rootProject.name = "miuix-kotlin-multiplatform" +rootProject.name = "miuix" include(":miuix", ":composeApp")