Merge branch 'main' into new-message-bot-events

bruceadowns · web-flow · commit 583dbd6c7874 · 2025-02-01T18:27:13.000-07:00
diff --git a/.github/maintainers_guide.md b/.github/maintainers_guide.md
@@ -127,7 +127,6 @@ Place `$HOME/.m2/settings.xml` with your Sonatype account information.
   * `git push slackapi --tags`
   * Open https://github.com/slackapi/java-slack-sdk/releases/new?tag=v${version}
 * (Slack Internal) Communicate the release internally. Include a link to the GitHub Release(s).
-* Announce on Bot Developer Hangout (`dev4slack.slack.com`) in **#slack-api**.
 * (Slack Internal) Tweet? Not necessary for patch updates, might be needed for minor updates, definitely needed for
    major updates. Include a link to the GitHub Release(s).
 
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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
         <aws-lambda-core.version>1.2.3</aws-lambda-core.version>
     </properties>
 
     <artifactId>bolt-aws-lambda</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.1")
+    implementation("com.slack.api:bolt-jetty:1.45.2")
     implementation("ch.qos.logback:logback-classic:1.5.6")
     implementation('net.logstash.logback:logstash-logback-encoder:7.4')
 }
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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-google-cloud-functions</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -18,7 +18,7 @@
     </properties>
 
     <artifactId>bolt-helidon</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <http4k.version>5.45.0.0</http4k.version>
+        <http4k.version>5.46.0.0</http4k.version>
         <!-- http4k 5.26+ no longer supports Java 1.8 -->
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-jetty</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-jakarta-servlet</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/bolt-jakarta-socket-mode/pom.xml b/bolt-jakarta-socket-mode/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-jakarta-socket-mode</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
         <jetty.version>9.4.56.v20240826</jetty.version>
     </properties>
 
     <artifactId>bolt-jetty</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-kotlin-examples</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt-ktor</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <micronaut.version>4.7.11</micronaut.version>
+        <micronaut.version>4.7.12</micronaut.version>
         <micronaut-test-junit5.version>4.6.2</micronaut-test-junit5.version>
         <micronaut-rxjava3.version>3.6.0</micronaut-rxjava3.version>
         <junit5-jupiter.version>5.11.4</junit5-jupiter.version>
@@ -25,7 +25,7 @@
     </properties>
 
     <artifactId>bolt-micronaut</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -24,7 +24,7 @@
     </properties>
 
     <artifactId>bolt-quarkus-examples</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -15,7 +15,7 @@
     </properties>
 
     <artifactId>bolt-servlet</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -17,7 +17,7 @@
     </properties>
 
     <artifactId>bolt-socket-mode</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bolt</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-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.45.2-SNAPSHOT";
+        return "1.45.3-SNAPSHOT";
     }
 }
 
diff --git a/docs/version-config.yml b/docs/version-config.yml
@@ -1,4 +1,4 @@
-sdkLatestVersion: 1.45.1
+sdkLatestVersion: 1.45.2
 okhttpVersion: 4.10.0
 slf4jApiVersion: 1.7.36
 kotlinVersion: 1.7.21
diff --git a/json-logs/samples/api/users.conversations.json b/json-logs/samples/api/users.conversations.json
@@ -92,8 +92,7 @@
             "type": ""
           },
           {
-            "type": "",
-            "id": ""
+            "type": ""
           }
         ]
       }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.slack.api</groupId>
     <artifactId>slack-sdk-parent</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Java Slack SDK Project</name>
diff --git a/slack-api-client-kotlin-extension/pom.xml b/slack-api-client-kotlin-extension/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>slack-api-client-kotlin-extension</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/slack-api-client/pom.xml b/slack-api-client/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.slack.api</groupId>
         <artifactId>slack-sdk-parent</artifactId>
-        <version>1.45.2-SNAPSHOT</version>
+        <version>1.45.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>slack-api-client</artifactId>
-    <version>1.45.2-SNAPSHOT</version>
+    <version>1.45.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/slack-api-client/src/main/java/com/slack/api/meta/SlackApiClientLibraryVersion.java b/slack-api-client/src/main/java/com/slack/api/meta/SlackApiClientLibraryVersion.java
@@ -5,7 +5,7 @@ private SlackApiClientLibraryVersion() {
     }
 
     public static final String get() {
-        return "1.45.2-SNAPSHOT";
+        return "1.45.3-SNAPSHOT";
     }
 }
 
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java b/slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java
@@ -2086,7 +2086,11 @@ public static FormBody.Builder toForm(FilesCompleteUploadExternalRequest req) {
         if (req.getFiles() != null) {
             setIfNotNull("files", GSON.toJson(req.getFiles()), form);
         }
-        setIfNotNull("channel_id", req.getChannelId(), form);
+        if (req.getChannels() != null) {
+            setIfNotNull("channels", req.getChannels().stream().collect(joining(",")), form);
+        } else {
+            setIfNotNull("channel_id", req.getChannelId(), form);
+        }
         setIfNotNull("initial_comment", req.getInitialComment(), form);
         setIfNotNull("thread_ts", req.getThreadTs(), form);
         return form;
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/impl/FilesUploadV2Helper.java b/slack-api-client/src/main/java/com/slack/api/methods/impl/FilesUploadV2Helper.java
@@ -31,7 +31,7 @@ public class FilesUploadV2Helper implements AutoCloseable {
 
     public FilesUploadV2Helper(MethodsClient client) {
         this.client = client;
-        this.okHttpClient = SlackHttpClient.buildOkHttpClient(client.getSlackHttpClient().getConfig());
+        this.okHttpClient = client.getSlackHttpClient().getOkHttpClient();
     }
 
     public String uploadFile(
@@ -94,6 +94,7 @@ public FilesUploadV2Response completeUploads(
                 .token(v2Request.getToken())
                 .files(files)
                 .channelId(v2Request.getChannel())
+                .channels(v2Request.getChannels())
                 .initialComment(v2Request.getInitialComment())
                 .threadTs(v2Request.getThreadTs())
         );
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/files/FilesCompleteUploadExternalRequest.java b/slack-api-client/src/main/java/com/slack/api/methods/request/files/FilesCompleteUploadExternalRequest.java
@@ -30,6 +30,11 @@ public class FilesCompleteUploadExternalRequest implements SlackApiRequest {
      */
     private String channelId;
 
+    /**
+     * Comma-separated string of channel IDs where the file will be shared.
+     */
+    private List<String> channels;
+
     /**
      * The message text introducing the file in specified channels.
      */
diff --git a/slack-api-client/src/main/java/com/slack/api/methods/request/files/FilesUploadV2Request.java b/slack-api-client/src/main/java/com/slack/api/methods/request/files/FilesUploadV2Request.java
diff --git a/slack-api-client/src/main/java/com/slack/api/util/http/SlackHttpClient.java b/slack-api-client/src/main/java/com/slack/api/util/http/SlackHttpClient.java
diff --git a/slack-api-client/src/main/java/com/slack/api/util/json/GsonFactory.java b/slack-api-client/src/main/java/com/slack/api/util/json/GsonFactory.java
diff --git a/slack-api-client/src/test/java/test_with_remote_apis/methods/files_Test.java b/slack-api-client/src/test/java/test_with_remote_apis/methods/files_Test.java
diff --git a/slack-api-model-kotlin-extension/pom.xml b/slack-api-model-kotlin-extension/pom.xml
diff --git a/slack-api-model/pom.xml b/slack-api-model/pom.xml
diff --git a/slack-api-model/src/main/java/com/slack/api/meta/SlackApiModelLibraryVersion.java b/slack-api-model/src/main/java/com/slack/api/meta/SlackApiModelLibraryVersion.java
diff --git a/slack-api-model/src/main/java/com/slack/api/util/json/GsonFileFactory.java b/slack-api-model/src/main/java/com/slack/api/util/json/GsonFileFactory.java
diff --git a/slack-api-model/src/test/java/test_locally/api/model/FileTest.java b/slack-api-model/src/test/java/test_locally/api/model/FileTest.java
diff --git a/slack-api-model/src/test/java/test_locally/unit/GsonFactory.java b/slack-api-model/src/test/java/test_locally/unit/GsonFactory.java
diff --git a/slack-app-backend/pom.xml b/slack-app-backend/pom.xml
diff --git a/slack-jakarta-socket-mode-client/pom.xml b/slack-jakarta-socket-mode-client/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repositories {`
`10`	`10`	`dependencies {`
`11`	`11`	`implementation(platform("org.jetbrains.kotlin:kotlin-bom"))`
`12`	`12`	`implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")`
`13`		`- implementation("com.slack.api:bolt-jetty:1.45.1")`
	`13`	`+ implementation("com.slack.api:bolt-jetty:1.45.2")`
`14`	`14`	`implementation("ch.qos.logback:logback-classic:1.5.6")`
`15`	`15`	`implementation('net.logstash.logback:logstash-logback-encoder:7.4')`
`16`	`16`	`}`