Skip to content

Commit

Permalink
Merge branch 'main' into remote-functions-2
Browse files Browse the repository at this point in the history
  • Loading branch information
seratch authored Jun 6, 2024
2 parents 0f27992 + 54d924c commit 8d0749c
Show file tree
Hide file tree
Showing 91 changed files with 484 additions and 82 deletions.
4 changes: 2 additions & 2 deletions bolt-aws-lambda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
<aws-lambda-core.version>1.2.3</aws-lambda-core.version>
</properties>

<artifactId>bolt-aws-lambda</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bolt-docker-examples/echo-command-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.1")
implementation("com.slack.api:bolt-jetty:1.39.3")
implementation("ch.qos.logback:logback-classic:1.2.11")
implementation('net.logstash.logback:logstash-logback-encoder:6.2')
}
Expand Down
4 changes: 2 additions & 2 deletions bolt-google-cloud-functions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -17,7 +17,7 @@
</properties>

<artifactId>bolt-google-cloud-functions</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-helidon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -18,7 +18,7 @@
</properties>

<artifactId>bolt-helidon</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions bolt-http4k/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
<http4k.version>5.18.2.0</http4k.version>
<http4k.version>5.21.0.0</http4k.version>
</properties>

<artifactId>bolt-http4k</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions bolt-jakarta-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<artifactId>bolt-jakarta-jetty</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-jakarta-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<artifactId>bolt-jakarta-servlet</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
<jetty.version>9.4.53.v20231009</jetty.version>
</properties>

<artifactId>bolt-jetty</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-kotlin-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<artifactId>bolt-kotlin-examples</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-ktor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<artifactId>bolt-ktor</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions bolt-micronaut/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
<micronaut.version>4.4.9</micronaut.version>
<micronaut.version>4.4.10</micronaut.version>
<micronaut-test-junit5.version>4.3.0</micronaut-test-junit5.version>
<micronaut-rxjava3.version>3.3.0</micronaut-rxjava3.version>
<junit5-jupiter.version>5.10.2</junit5-jupiter.version>
Expand All @@ -25,7 +25,7 @@
</properties>

<artifactId>bolt-micronaut</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-quarkus-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -24,7 +24,7 @@
</properties>

<artifactId>bolt-quarkus-examples</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions bolt-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -15,7 +15,7 @@
</properties>

<artifactId>bolt-servlet</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt-socket-mode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -17,7 +17,7 @@
</properties>

<artifactId>bolt-socket-mode</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions bolt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>com.slack.api</groupId>
<artifactId>slack-sdk-parent</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
</parent>

<artifactId>bolt</artifactId>
<version>1.39.2-SNAPSHOT</version>
<version>1.39.4-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
28 changes: 28 additions & 0 deletions bolt/src/main/java/com/slack/api/bolt/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -797,14 +797,26 @@ public App viewClosed(Pattern callbackId, ViewClosedHandler handler) {
// Workflows: Steps from Apps
// https://api.slack.com/workflows/steps

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App step(WorkflowStep step) {
return this.use(step);
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepEdit(String callbackId, WorkflowStepEditHandler handler) {
return workflowStepEdit(Pattern.compile("^" + Pattern.quote(callbackId) + "$"), handler);
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepEdit(Pattern callbackId, WorkflowStepEditHandler handler) {
if (workflowStepEditHandlers.get(callbackId) != null) {
log.warn("Replaced the handler for {}", callbackId);
Expand All @@ -813,10 +825,18 @@ public App workflowStepEdit(Pattern callbackId, WorkflowStepEditHandler handler)
return this;
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepSave(String callbackId, WorkflowStepSaveHandler handler) {
return workflowStepSave(Pattern.compile("^" + Pattern.quote(callbackId) + "$"), handler);
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepSave(Pattern callbackId, WorkflowStepSaveHandler handler) {
if (workflowStepSaveHandlers.get(callbackId) != null) {
log.warn("Replaced the handler for {}", callbackId);
Expand All @@ -825,10 +845,18 @@ public App workflowStepSave(Pattern callbackId, WorkflowStepSaveHandler handler)
return this;
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepExecute(String pattern, WorkflowStepExecuteHandler handler) {
return workflowStepExecute(Pattern.compile("^.*" + Pattern.quote(pattern) + ".*$"), handler);
}

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public App workflowStepExecute(Pattern pattern, WorkflowStepExecuteHandler handler) {
if (workflowStepExecuteHandlers.get(pattern) != null) {
log.warn("Replaced the handler for {}", pattern);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
import com.slack.api.methods.MethodsClient;
import com.slack.api.methods.SlackApiException;
import com.slack.api.methods.response.workflows.WorkflowsStepCompletedResponse;
import com.slack.api.model.workflow.WorkflowStepOutput;

import java.io.IOException;
import java.util.List;
import java.util.Map;

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public interface WorkflowCompleteUtility {

String getWorkflowStepExecuteId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

import static com.slack.api.model.view.Views.view;

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public interface WorkflowConfigureUtility {

String getTriggerId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import com.slack.api.methods.MethodsClient;
import com.slack.api.methods.SlackApiException;
import com.slack.api.methods.response.workflows.WorkflowsStepCompletedResponse;
import com.slack.api.methods.response.workflows.WorkflowsStepFailedResponse;

import java.io.IOException;
import java.util.Map;

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public interface WorkflowFailUtility {

String getWorkflowStepExecuteId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import java.util.List;
import java.util.Map;

/**
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Deprecated
public interface WorkflowUpdateUtility {

String getWorkflowStepEditId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

/**
* workflow_step_edit type request's context.
* @deprecated Use new custom steps: https://api.slack.com/automation/functions/custom-bolt
*/
@Getter
@Setter
Expand All @@ -14,6 +15,7 @@
@AllArgsConstructor
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
@Deprecated
public class WorkflowStepEditContext extends Context implements WorkflowConfigureUtility {

private String triggerId;
Expand Down
Loading

0 comments on commit 8d0749c

Please sign in to comment.