From 5aa6e3503479059a67aaad79b983dc9d2188dfd2 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 17 Feb 2023 19:11:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20maven-publish=E3=83=97=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 24 +++++++++++++++ core/build.gradle.kts | 48 ++++++++++++++--------------- impl/mastodon/build.gradle.kts | 56 +++++++++++++++++----------------- impl/misskey/build.gradle.kts | 48 ++++++++++++++--------------- 4 files changed, 100 insertions(+), 76 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 978a48a..51964fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,12 @@ subprojects { kotlinOptions.jvmTarget = "1.8" } + tasks{ + val sourcesJar by creating(Jar::class) { + archiveClassifier.set("sources") + from(project.the()["main"].allSource) + } + } tasks.getByName("test", Test::class) { @@ -84,4 +90,22 @@ subprojects { "testImplementation"("org.slf4j:slf4j-simple:2.0.4") "testImplementation"("io.github.artsok:rerunner-jupiter:2.1.6") } + + publishing{ + repositories{ +// maven{ +// name = "GitHubLocals" +// url = uri("file://") +// } + } + publications{ + register("gpr") { + groupId = project.group.toString() + artifactId = "multim-${project.name}" + version = project.version.toString() + from(components["kotlin"]) + artifact(tasks["sourcesJar"]) + } + } + } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index c549687..f1f93c0 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,24 +1,24 @@ -tasks{ - val sourcesJar by creating(Jar::class) { - archiveClassifier.set("sources") - from(sourceSets["main"].allSource) - } -} - -afterEvaluate { - publishing { - publications { - - - create("maven") { - groupId = project.group.toString() - artifactId = "multim-${project.name}" - version = project.version.toString() - from(components["kotlin"]) - artifact(tasks["sourcesJar"]) - } - - - } - } -} +//tasks{ +// val sourcesJar by creating(Jar::class) { +// archiveClassifier.set("sources") +// from(sourceSets["main"].allSource) +// } +//} +// +//afterEvaluate { +// publishing { +// publications { +// +// +// create("maven") { +// groupId = project.group.toString() +// artifactId = "multim-${project.name}" +// version = project.version.toString() +// from(components["kotlin"]) +// artifact(tasks["sourcesJar"]) +// } +// +// +// } +// } +//} diff --git a/impl/mastodon/build.gradle.kts b/impl/mastodon/build.gradle.kts index e0a282d..223f1dd 100644 --- a/impl/mastodon/build.gradle.kts +++ b/impl/mastodon/build.gradle.kts @@ -1,28 +1,28 @@ -dependencies { - implementation(project(":core")) -} - -tasks{ - val sourcesJar by creating(Jar::class) { - archiveClassifier.set("sources") - from(sourceSets["main"].allSource) - } -} - -afterEvaluate { - publishing { - publications { - - - create("maven") { - groupId = project.group.toString() - artifactId = "multim-${project.name}" - version = project.version.toString() - from(components["kotlin"]) - artifact(tasks["sourcesJar"]) - } - - - } - } -} +//dependencies { +// implementation(project(":core")) +//} +// +//tasks{ +// val sourcesJar by creating(Jar::class) { +// archiveClassifier.set("sources") +// from(sourceSets["main"].allSource) +// } +//} +// +//afterEvaluate { +// publishing { +// publications { +// +// +// create("maven") { +// groupId = project.group.toString() +// artifactId = "multim-${project.name}" +// version = project.version.toString() +// from(components["kotlin"]) +// artifact(tasks["sourcesJar"]) +// } +// +// +// } +// } +//} diff --git a/impl/misskey/build.gradle.kts b/impl/misskey/build.gradle.kts index 97a45b4..e4a7497 100644 --- a/impl/misskey/build.gradle.kts +++ b/impl/misskey/build.gradle.kts @@ -6,27 +6,27 @@ kotlin{ } -tasks{ - val sourcesJar by creating(Jar::class) { - archiveClassifier.set("sources") - from(sourceSets["main"].allSource) - } -} - -afterEvaluate { - publishing { - publications { - - - create("maven") { - groupId = project.group.toString() - artifactId = "multim-${project.name}" - version = project.version.toString() - from(components["kotlin"]) - artifact(tasks["sourcesJar"]) - } - - - } - } -} +//tasks{ +// val sourcesJar by creating(Jar::class) { +// archiveClassifier.set("sources") +// from(sourceSets["main"].allSource) +// } +//} +// +//afterEvaluate { +// publishing { +// publications { +// +// +// create("maven") { +// groupId = project.group.toString() +// artifactId = "multim-${project.name}" +// version = project.version.toString() +// from(components["kotlin"]) +// artifact(tasks["sourcesJar"]) +// } +// +// +// } +// } +//} From c0343be46587f8b6d6d3c19f97fe4c9f82c81256 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Fri, 17 Feb 2023 19:14:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=85=AC=E9=96=8B=E5=85=88?= =?UTF-8?q?=E3=81=ABGitHubPackages=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 51964fd..a07637c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -93,10 +93,14 @@ subprojects { publishing{ repositories{ -// maven{ -// name = "GitHubLocals" -// url = uri("file://") -// } + maven{ + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/usbharu/multim") + credentials { + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } } publications{ register("gpr") {