From bffa4f1f56f9114bf4633497b5a5d7a6ab926c51 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 4 Apr 2024 06:04:13 +0800 Subject: [PATCH] migrated to gitea --- .gitea/workflows/build.yaml | 20 ++++++++++++ build.gradle | 31 +++++++++---------- gradle.properties | 15 ++------- .../woggioni/gradle/lombok/LombokPlugin.java | 4 ++- osgi-app/build.gradle | 19 ------------ 5 files changed, 40 insertions(+), 49 deletions(-) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..0445195 --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,20 @@ +name: CI +on: + push: + branches: [ master ] +jobs: + build: + runs-on: woryzen + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Execute Gradle build + env: + PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} + run: ./gradlew build publish diff --git a/build.gradle b/build.gradle index 78398ee..2cfb645 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ subprojects { subproject -> apply plugin: 'java-library' + apply plugin: 'maven-publish' + group = "net.woggioni.gradle" version = getProperty('version.myGradlePlugins') java { @@ -27,12 +29,6 @@ subprojects { subproject -> } repositories { - maven { - url = woggioniMavenRepositoryUrl - content { - includeGroup 'net.woggioni' - } - } mavenCentral() } @@ -45,27 +41,30 @@ subprojects { subproject -> add("testImplementation", gradleTestKit()) } - tasks.named("test", Test) { + tasks.withType(Test) { useJUnitPlatform() } -} -childProjects.forEach { name, child -> - child.with { - apply plugin: 'maven-publish' + publishing { + repositories { + maven { + name = "Gitea" + url = uri("https://gitea.woggioni.net/api/packages/woggioni/maven") - group = "net.woggioni.gradle" + credentials(HttpHeaderCredentials) { + name = "Authorization" + value = "token ${System.getenv()["PUBLISHER_TOKEN"]}" + } - publishing { - repositories { - maven { - url = woggioniMavenRepositoryUrl + authentication { + header(HttpHeaderAuthentication) } } } } } + wrapper { gradleVersion = getProperty("version.gradle") distributionType = Wrapper.DistributionType.ALL diff --git a/gradle.properties b/gradle.properties index 6d82616..ed3a87f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,4 @@ -woggioniMavenRepositoryUrl=https://mvn.woggioni.net/ +lys.catalog.version=2024.03.12 -lys.catalog.version=2024.02.12 - -version.myGradlePlugins=2024.03.11 +version.myGradlePlugins=2024.04.04 version.gradle=7.6 -version.felix.config.admin=1.9.26 -version.felix=7.0.5 -version.felix.scr=2.2.4 -version.felix.security=2.8.2 -version.osgi=8.0.0 -version.osgi.cm=1.6.0 -version.osgi.service.component=1.5.1 -version.osgi.function=1.2.0 -version.osgi.promise=1.3.0 diff --git a/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java b/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java index 959e17e..c717ac6 100644 --- a/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java +++ b/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java @@ -75,7 +75,9 @@ public class LombokPlugin implements Plugin { delombok.getSourceSet().set(ss); delombok.getOutputDir().set(outputDir); delombok.getLombokJar().set(lombokConfiguration); - delombok.getInferModulePath().set(javaPluginExtension.getModularity().getInferModulePath()); + // Disabled for now due to https://github.com/projectlombok/lombok/issues/2829 + //delombok.getInferModulePath().set(javaPluginExtension.getModularity().getInferModulePath()); + delombok.getInferModulePath().set(false); })); javadoc.setSource(outputDir); javadoc.getInputs().files(delombokTaskProvider); diff --git a/osgi-app/build.gradle b/osgi-app/build.gradle index 0f993a9..ed68563 100644 --- a/osgi-app/build.gradle +++ b/osgi-app/build.gradle @@ -2,25 +2,6 @@ plugins { id "java-gradle-plugin" } -childProjects.forEach {name, child -> - child.with { - apply plugin: 'maven-publish' - - publishing { - repositories { - maven { - url = woggioniMavenRepositoryUrl - } - } - publications { - maven(MavenPublication) { - from(components["java"]) - } - } - } - } -} - evaluationDependsOnChildren() configurations {