From cc46e0be4dcb0185f8d316ec1cce0ff3b0479fa2 Mon Sep 17 00:00:00 2001 From: Ry Jones Date: Fri, 12 Jul 2024 13:24:02 +0900 Subject: [PATCH 1/5] ci: Update to node20 actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ry Jones Signed-off-by: Javier RiboĢ --- .github/workflows/release-documentation.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 02c127e1e..7a56e8950 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -29,10 +29,10 @@ jobs: fetch-depth: 0 - name: "Validate Gradle Wrapper" - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v3 - name: "Cache gradle" - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -43,7 +43,7 @@ jobs: ${{ runner.os }}-gradle- - name: "Install Java ${{ env.JAVA_VERSION }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ env.JAVA_VERSION }} distribution: "zulu" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c297be30..a82e8ed4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,7 +102,7 @@ jobs: with: xcode-version: '15.0.1' - - uses: crazy-max/ghaction-import-gpg@v5 + - uses: crazy-max/ghaction-import-gpg@v6 id: import_gpg with: gpg_private_key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} From 143100d061f1feb1e7dfc73c4703edfaf71720e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ribo=CC=81?= Date: Fri, 12 Jul 2024 11:53:42 +0200 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20remove=20blank=20lines=20Signed-off-?= =?UTF-8?q?by:=20Javier=20Ribo=CC=81=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 81a9dbee8..53f297c0f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -177,6 +177,3 @@ nexusPublishing { } } } - - - From ca92ba5aaede56435f55239bb33e3f49b81dca13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ribo=CC=81?= Date: Fri, 12 Jul 2024 12:13:32 +0200 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20add=20checks=20for=20ossrh=20tempora?= =?UTF-8?q?ry=20Signed-off-by:=20Javier=20Ribo=CC=81=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pull-request.yml | 6 ++++++ build.gradle.kts | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4c411d3d7..744d4a995 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -31,6 +31,12 @@ jobs: fail-fast: false runs-on: ${{ matrix.os }} steps: + - name: Check Nexus access + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + run: | + curl -u $OSSRH_USERNAME:$OSSRH_TOKEN https://oss.sonatype.org/service/local/repositories/releases/content/ - name: "Validate Gradle Wrapper" run: pwd diff --git a/build.gradle.kts b/build.gradle.kts index 53f297c0f..5ffb1c9e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,15 @@ buildscript { gradlePluginPortal() google() mavenCentral() + maven { + name = "OSSRH" + url = uri("hhttps://oss.sonatype.org/service/local/repositories/releases/content/") + credentials { + username = project.findProperty("sonatypeUsername") as String? ?: System.getenv("OSSRH_USERNAME") + password = project.findProperty("sonatypePassword") as String? ?: System.getenv("OSSRH_TOKEN") + } + } + } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") @@ -174,6 +183,7 @@ nexusPublishing { snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/")) username.set(System.getenv("OSSRH_USERNAME")) password.set(System.getenv("OSSRH_TOKEN")) + } } } From a096750b520a6a9b21e18ce7d200ea6e39528536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ribo=CC=81?= Date: Fri, 12 Jul 2024 12:18:25 +0200 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20remove=20typo=20Signed-off-by:=20Jav?= =?UTF-8?q?ier=20Ribo=CC=81=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pull-request.yml | 1 + build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 744d4a995..6b69c76b0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -37,6 +37,7 @@ jobs: OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} run: | curl -u $OSSRH_USERNAME:$OSSRH_TOKEN https://oss.sonatype.org/service/local/repositories/releases/content/ + - name: "Validate Gradle Wrapper" run: pwd diff --git a/build.gradle.kts b/build.gradle.kts index 5ffb1c9e4..9a323f58e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ buildscript { mavenCentral() maven { name = "OSSRH" - url = uri("hhttps://oss.sonatype.org/service/local/repositories/releases/content/") + url = uri("https://oss.sonatype.org/service/local/repositories/releases/content/") credentials { username = project.findProperty("sonatypeUsername") as String? ?: System.getenv("OSSRH_USERNAME") password = project.findProperty("sonatypePassword") as String? ?: System.getenv("OSSRH_TOKEN") From a0266bfd846ff1a07aba7eaaded4a2ac2d545421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ribo=CC=81?= Date: Fri, 12 Jul 2024 12:23:38 +0200 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20linter=20issues=20Signed-off-by:=20J?= =?UTF-8?q?avier=20Ribo=CC=81=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a323f58e..256ce737f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,6 @@ buildscript { password = project.findProperty("sonatypePassword") as String? ?: System.getenv("OSSRH_TOKEN") } } - } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") @@ -183,7 +182,6 @@ nexusPublishing { snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/")) username.set(System.getenv("OSSRH_USERNAME")) password.set(System.getenv("OSSRH_TOKEN")) - } } }