From fd814711e352b9ed57e7aa9c85544c7276c72650 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 27 Aug 2025 13:32:13 -0400 Subject: [PATCH 01/11] feat: jreleaser check workflow --- .github/workflows/jreleaser.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/jreleaser.yml diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml new file mode 100644 index 000000000..f2727fa7a --- /dev/null +++ b/.github/workflows/jreleaser.yml @@ -0,0 +1,12 @@ +# TODO: Delete this action when we migrate off JReleaser + +name: JReleaser check +on: + pull_request: + +jobs: + jreleaser-check: + runs-on: ubuntu-latest + steps: + - name: JReleaser check + uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@jreleaser-check # TODO: Change branch to main after testing/merge From d77eea6587943ed40f0fa71a8b5f4b46c73d9bc4 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 3 Sep 2025 16:31:48 -0400 Subject: [PATCH 02/11] repo tools version bump --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 362816330..d3c4d7f04 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin-version = "2.2.0" dokka-version = "2.0.0" -aws-kotlin-repo-tools-version = "0.4.41" +aws-kotlin-repo-tools-version = "0.4.44" # libs coroutines-version = "1.10.2" From d5abaefa11218d23b6b8283011f698f3a2c1ab8e Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 3 Sep 2025 16:46:03 -0400 Subject: [PATCH 03/11] configure permissions --- .github/workflows/jreleaser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index f2727fa7a..f7b046413 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -1,6 +1,7 @@ # TODO: Delete this action when we migrate off JReleaser name: JReleaser check +permissions: # No permissions on: pull_request: From 0f8a87c27cf1ff74660b57cd85b23d23e42cd94e Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 3 Sep 2025 16:47:45 -0400 Subject: [PATCH 04/11] relocate permissions --- .github/workflows/jreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index f7b046413..fcef2a3e4 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -1,12 +1,12 @@ # TODO: Delete this action when we migrate off JReleaser name: JReleaser check -permissions: # No permissions on: pull_request: jobs: jreleaser-check: + permissions: # No permissions runs-on: ubuntu-latest steps: - name: JReleaser check From b5b2453e3e8c0845d14dfbe6b2ec4be519247103 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 3 Sep 2025 16:51:57 -0400 Subject: [PATCH 05/11] properly configure permissions --- .github/workflows/jreleaser.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index fcef2a3e4..37f41ab68 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -6,8 +6,8 @@ on: jobs: jreleaser-check: - permissions: # No permissions + permissions: {} runs-on: ubuntu-latest steps: - name: JReleaser check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@jreleaser-check # TODO: Change branch to main after testing/merge + uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@jreleaser-check # TODO: Change branch to main before merge From 330f2025e71377451a87f2a17219686feadf0d83 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Wed, 3 Sep 2025 17:00:07 -0400 Subject: [PATCH 06/11] self review --- .github/workflows/jreleaser.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index 37f41ab68..391e452d5 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -1,4 +1,4 @@ -# TODO: Delete this action when we migrate off JReleaser +# TODO: Delete this workflow when we migrate off JReleaser name: JReleaser check on: @@ -10,4 +10,4 @@ jobs: runs-on: ubuntu-latest steps: - name: JReleaser check - uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@jreleaser-check # TODO: Change branch to main before merge + uses: awslabs/aws-kotlin-repo-tools/.github/actions/jreleaser@main From d8929ae53142b03c142268f45f6e17d78270b874 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 4 Sep 2025 11:08:24 -0400 Subject: [PATCH 07/11] version bump CRT --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3c4d7f04..a25a37aff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ okio-version = "3.16.0" otel-version = "1.52.0" slf4j-version = "2.0.17" slf4j-v1x-version = "1.7.36" -crt-kotlin-version = "0.10.3" +crt-kotlin-version = "0.11.0" micrometer-version = "1.15.2" binary-compatibility-validator-version = "0.18.1" From fc2a0b3e8adc9c073d75a9f1d32d7a9d4975b0ef Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 4 Sep 2025 14:54:52 -0400 Subject: [PATCH 08/11] temp fix --- build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 170dd2448..f5d01318d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,13 @@ buildscript { https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630 */ classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3")) + classpath("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") + } + + configurations.classpath { + resolutionStrategy { + force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") + } } } From 1d4877f2d99fcade12ae604ae3dd18901d8ee35a Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 4 Sep 2025 15:01:09 -0400 Subject: [PATCH 09/11] reset crt kotlin version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a25a37aff..d3c4d7f04 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ okio-version = "3.16.0" otel-version = "1.52.0" slf4j-version = "2.0.17" slf4j-v1x-version = "1.7.36" -crt-kotlin-version = "0.11.0" +crt-kotlin-version = "0.10.3" micrometer-version = "1.15.2" binary-compatibility-validator-version = "0.18.1" From d9a98ea9cec9c7ac3dd4e122491a557bde79134b Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 4 Sep 2025 16:57:45 -0400 Subject: [PATCH 10/11] add comment and simplify --- build.gradle.kts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f5d01318d..7732ae427 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,11 +21,16 @@ buildscript { https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630 */ classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3")) - classpath("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") } configurations.classpath { resolutionStrategy { + /* + Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath: + java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3) + + FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix to address a release issue! + */ force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") } } From bd1edf98b5e8ba0f1142e494d2c8b16d1df8b2f1 Mon Sep 17 00:00:00 2001 From: 0marperez Date: Thu, 4 Sep 2025 16:59:11 -0400 Subject: [PATCH 11/11] fix comment --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7732ae427..2a900f2cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ buildscript { Version bumping the SDK to 1.5.x in repo tools broke our buildscript classpath: java.lang.NoSuchMethodError: 'void kotlinx.coroutines.CancellableContinuation.resume(java.lang.Object, kotlin.jvm.functions.Function3) - FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix to address a release issue! + FIXME: Figure out what broke our buildscipt classpath, this is a temporary fix */ force("com.squareup.okhttp3:okhttp-coroutines:5.0.0-alpha.14") }