diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f9f86c2..f0ff2a3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,4 +13,4 @@ jobs: - name: Execute Gradle build env: PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} - run: ./gradlew build publishMavenPublicationToGiteaRepository + run: ./gradlew build publish diff --git a/build.gradle b/build.gradle index 5a61e16..51a4dc6 100644 --- a/build.gradle +++ b/build.gradle @@ -73,9 +73,6 @@ allprojects { pluginManager.withPlugin('maven-publish') { publishing { repositories { - maven { - url = 'https://mvn.woggioni.net/' - } maven { name = "Gitea" url = uri(getProperty('gitea.maven.url')) diff --git a/wcfg/build.gradle b/wcfg/build.gradle index ec42508..7618aef 100644 --- a/wcfg/build.gradle +++ b/wcfg/build.gradle @@ -25,4 +25,4 @@ generateGrammarSource { ext { setProperty('jpms.module.name', 'net.woggioni.wson.wcfg') -} \ No newline at end of file +} diff --git a/wson-cli/build.gradle b/wson-cli/build.gradle index f9a3a5d..21b8ab8 100644 --- a/wson-cli/build.gradle +++ b/wson-cli/build.gradle @@ -8,6 +8,7 @@ plugins { } import net.woggioni.gradle.graalvm.NativeImageTask +import net.woggioni.gradle.envelope.EnvelopeJarTask import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform dependencies { @@ -56,6 +57,8 @@ configureNativeImage { mergeConfiguration = true } +Provider envelopeJarTaskProvider = tasks.named('envelopeJar') + Provider nativeImageTaskProvider = tasks.named("nativeImage") { useMusl = true buildStaticImage = true @@ -67,11 +70,12 @@ tasks.named(BasePlugin.ASSEMBLE_TASK_NAME, Task) { artifacts { archives nativeImageTaskProvider.map(NativeImageTask.&getOutputFile) + archives envelopeJarTaskProvider.map(EnvelopeJarTask.&getArchiveFile) } publishing { publications { - myDistribution(MavenPublication) { + maven(MavenPublication) { artifact envelopeJar def host = DefaultNativePlatform.host() artifact(