merge v1.5-main

Author: xinsong-cui

.brazil.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",

.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json

@@ -0,0 +1,9 @@
+{
+    "id": "49af01b8-6fed-4add-ace0-9f027e83425a",
+    "type": "feature",
+    "description": "⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ],
+    "requiresMinorVersionBump": true
+}

.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json

@@ -0,0 +1,8 @@
+{
+    "id": "e6515649-dab5-4be9-b4b4-b289369960d5",
+    "type": "bugfix",
+    "description": "Favor `endpointUrl` instead of endpoint discovery if both are provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ]
+}

.github/workflows/api-compat-verification.yml

@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:

.github/workflows/artifact-size-metrics.yml

@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 

.github/workflows/changelog-verification.yml

@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:

.github/workflows/continuous-integration.yml

@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 

.github/workflows/dependabot.yml

@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write

.github/workflows/kat-transform.yml

@@ -3,7 +3,9 @@ name: Kat Transform
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:

.github/workflows/lint.yml

@@ -5,8 +5,11 @@ on:
     branches:
       - '**'
       - '!main'
+      - '!*-main'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   workflow_dispatch:
 
 env: