Merge branch 'main' into remote-functions-2

slackapi · Jun 14, 2024 · 3ee35c4 · 3ee35c4
2 parents 8d0749c + c47a50a
commit 3ee35c4
Show file tree

Hide file tree

Showing 105 changed files with 1,481 additions and 81 deletions.
diff --git a/bolt-aws-lambda/pom.xml b/bolt-aws-lambda/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
         <aws-lambda-core.version>1.2.3</aws-lambda-core.version>
     </properties>
 
     <artifactId>bolt-aws-lambda</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-docker-examples/echo-command-app/build.gradle b/bolt-docker-examples/echo-command-app/build.gradle
@@ -10,7 +10,7 @@ repositories {
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("com.slack.api:bolt-jetty:1.39.3")
+    implementation("com.slack.api:bolt-jetty:1.40.0")
     implementation("ch.qos.logback:logback-classic:1.2.11")
     implementation('net.logstash.logback:logstash-logback-encoder:6.2')
 }

diff --git a/bolt-google-cloud-functions/pom.xml b/bolt-google-cloud-functions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-google-cloud-functions</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-helidon/pom.xml b/bolt-helidon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -18,7 +18,7 @@
     </properties>
 
     <artifactId>bolt-helidon</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <http4k.version>5.21.0.0</http4k.version>
+        <http4k.version>5.23.0.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>

diff --git a/bolt-jakarta-jetty/pom.xml b/bolt-jakarta-jetty/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-jetty</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-jakarta-servlet/pom.xml b/bolt-jakarta-servlet/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-servlet</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-jetty/pom.xml b/bolt-jetty/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
         <jetty.version>9.4.53.v20231009</jetty.version>
     </properties>
 
     <artifactId>bolt-jetty</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-kotlin-examples/pom.xml b/bolt-kotlin-examples/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-kotlin-examples</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-ktor/pom.xml b/bolt-ktor/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-ktor</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <micronaut.version>4.4.10</micronaut.version>
+        <micronaut.version>4.5.3</micronaut.version>
         <micronaut-test-junit5.version>4.3.0</micronaut-test-junit5.version>
-        <micronaut-rxjava3.version>3.3.0</micronaut-rxjava3.version>
+        <micronaut-rxjava3.version>3.4.0</micronaut-rxjava3.version>
         <junit5-jupiter.version>5.10.2</junit5-jupiter.version>
         <!-- Note that upgrading this library breaks other dependency resolution -->
         <mockito-all.version>1.10.19</mockito-all.version>
@@ -25,7 +25,7 @@
     </properties>
 
     <artifactId>bolt-micronaut</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-quarkus-examples/pom.xml b/bolt-quarkus-examples/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -24,7 +24,7 @@
     </properties>
 
     <artifactId>bolt-quarkus-examples</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>

diff --git a/bolt-servlet/pom.xml b/bolt-servlet/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-servlet</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt-socket-mode/pom.xml b/bolt-socket-mode/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-socket-mode</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/bolt/pom.xml b/bolt/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.39.4-SNAPSHOT</version>
+        <version>1.40.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt</artifactId>
-    <version>1.39.4-SNAPSHOT</version>
+    <version>1.40.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java b/bolt/src/main/java/com/slack/api/bolt/meta/BoltLibraryVersion.java
@@ -5,7 +5,7 @@ private BoltLibraryVersion() {
     }
 
     public static final String get() {
-        return "1.39.4-SNAPSHOT";
+        return "1.40.1-SNAPSHOT";
     }
 }
 
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -6,7 +6,7 @@ markdown: kramdown
 baseurl: /java-slack-sdk
 url: https://slack.dev
 
-sdkLatestVersion: 1.39.3
+sdkLatestVersion: 1.40.0
 okhttpVersion: 4.10.0
 slf4jApiVersion: 1.7.36
 kotlinVersion: 1.7.21

diff --git a/docs/_includes/sidebar-ja.md b/docs/_includes/sidebar-ja.md
@@ -20,7 +20,7 @@
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/app-home">Home タブ</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/slash-commands">スラッシュコマンド</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/events-api">イベント API</a></li>
-      <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/steps-from-apps">ワークフローステップ</a></li>
+      <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/steps-from-apps">ワークフローステップ（非推奨）</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/app-distribution">アプリの配布 (OAuth)</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/sign-in-with-slack">Slack でログインする</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/ja/supported-web-frameworks">対応 Web フレームワーク</a></li>

diff --git a/docs/_includes/sidebar.md b/docs/_includes/sidebar.md
@@ -20,7 +20,7 @@
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/app-home">App Home</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/slash-commands">Slash Commands</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/events-api">Events API</a></li>
-      <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/steps-from-apps">Workflow Steps</a></li>
+      <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/steps-from-apps">Workflow Steps (Deprecated)</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/app-distribution">App Distribution (OAuth)</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/sign-in-with-slack">Sign in with Slack</a></li>
       <li class="toctree-l2"><a href="{{ site.url | append: site.baseurl }}/guides/supported-web-frameworks">Supported Web Frameworks</a></li>

diff --git a/docs/guides/ja/steps-from-apps.md b/docs/guides/ja/steps-from-apps.md
@@ -1,10 +1,12 @@
 ---
 layout: ja
-title: "ワークフローステップ"
+title: "ワークフローステップ（非推奨）"
 lang: ja
 ---
 
-# ワークフローステップ
+# ワークフローステップ（非推奨）
+
+**ここで紹介されているワークフローステップの実装方法は非推奨となりました。 今後は[新しい方式（英語）](https://api.slack.com/automation/functions/custom-bolt)を利用してください。**
 
 （アプリによる）ワークフローステップ（Workflow Steps from Apps) は、[ワークフロービルダー](https://api.slack.com/workflows)におけるワークフローに組み込み可能なカスタムのワークフローステップを任意の Slack アプリが提供することを可能とします。
 

diff --git a/docs/guides/steps-from-apps.md b/docs/guides/steps-from-apps.md
@@ -1,10 +1,12 @@
 ---
 layout: default
-title: "Workflow Steps"
+title: "Workflow Steps (Deprecated)"
 lang: en
 ---
 
-# Workflow Steps from Apps
+# Workflow Steps from Apps (Deprecated)
+
+**Steps from Apps for legacy workflows are now deprecated. Use [new custom steps](https://api.slack.com/automation/functions/custom-bolt).**
 
 Workflow Steps from apps allow your app to create and process custom workflow steps that users can add using [Workflow Builder](https://api.slack.com/workflows).
 

diff --git a/json-logs/raw/audit/v1/actions.json b/json-logs/raw/audit/v1/actions.json
@@ -299,7 +299,12 @@
       "external_shared_channel_access_downgraded",
       "private_channel_converted_to_public",
       "record_channel_archive",
-      "record_channel_unarchive"
+      "record_channel_unarchive",
+      "channel_converted_to_record_channel",
+      "record_channel_converted_to_channel",
+      "external_shared_channel_invite_requested",
+      "external_shared_channel_invite_request_approved",
+      "external_shared_channel_invite_request_denied"
     ],
     "app": [
       "app_installed",

diff --git a/json-logs/samples/api/admin.conversations.search.json b/json-logs/samples/api/admin.conversations.search.json
@@ -62,7 +62,16 @@
           }
         ]
       },
-      "context_team_id": "T00000000"
+      "context_team_id": "T00000000",
+      "lists": {
+        "total_count": 12345,
+        "ownership_details": [
+          {
+            "count": 123,
+            "team_id": ""
+          }
+        ]
+      }
     }
   ],
   "next_cursor": "",

diff --git a/json-logs/samples/api/canvases.access.delete.json b/json-logs/samples/api/canvases.access.delete.json
@@ -0,0 +1,13 @@
+{
+  "ok": false,
+  "error": "",
+  "failed_to_update_channel_ids": [
+    ""
+  ],
+  "failed_to_update_user_ids": [
+    ""
+  ],
+  "response_metadata": {},
+  "needed": "",
+  "provided": ""
+}
diff --git a/json-logs/samples/api/canvases.access.set.json b/json-logs/samples/api/canvases.access.set.json
@@ -0,0 +1,13 @@
+{
+  "ok": false,
+  "error": "",
+  "failed_to_update_channel_ids": [
+    ""
+  ],
+  "failed_to_update_user_ids": [
+    ""
+  ],
+  "response_metadata": {},
+  "needed": "",
+  "provided": ""
+}
diff --git a/json-logs/samples/api/canvases.create.json b/json-logs/samples/api/canvases.create.json
@@ -0,0 +1,13 @@
+{
+  "ok": false,
+  "canvas_id": "F00000000",
+  "detail": "",
+  "error": "",
+  "response_metadata": {
+    "messages": [
+      ""
+    ]
+  },
+  "needed": "",
+  "provided": ""
+}