Merge branch 'main' into remote-functions-2

slackapi · May 7, 2024 · 1f22381 · 1f22381
2 parents 778e3a7 + e7b099f
commit 1f22381
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 7 deletions.
diff --git a/bolt-http4k/pom.xml b/bolt-http4k/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <properties>
-        <http4k.version>5.14.4.0</http4k.version>
+        <http4k.version>5.16.2.0</http4k.version>
     </properties>
 
     <artifactId>bolt-http4k</artifactId>

diff --git a/bolt-ktor/pom.xml b/bolt-ktor/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.code.style>official</kotlin.code.style>
-        <ktor.version>2.3.9</ktor.version>
+        <ktor.version>2.3.10</ktor.version>
     </properties>
 
     <pluginRepositories>

diff --git a/bolt-micronaut/pom.xml b/bolt-micronaut/pom.xml
@@ -10,9 +10,9 @@
     </parent>
 
     <properties>
-        <micronaut.version>4.3.13</micronaut.version>
-        <micronaut-test-junit5.version>4.2.1</micronaut-test-junit5.version>
-        <micronaut-rxjava3.version>3.2.1</micronaut-rxjava3.version>
+        <micronaut.version>4.4.6</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>
         <!-- Note that upgrading this library breaks other dependency resolution -->
         <mockito-all.version>1.10.19</mockito-all.version>

diff --git a/bolt/pom.xml b/bolt/pom.xml
@@ -14,7 +14,8 @@
     <packaging>jar</packaging>
 
     <properties>
-        <commons-text.version>1.11.0</commons-text.version>
+        <commons-text.version>1.12.0
+        </commons-text.version>
     </properties>
 
     <dependencies>

diff --git a/json-logs/samples/api/admin.apps.activities.list.json b/json-logs/samples/api/admin.apps.activities.list.json
@@ -40,7 +40,8 @@
             "user_id": "W00000000",
             "channel_id": "C00000000",
             "reaction": "",
-            "message_ts": ""
+            "message_ts": "",
+            "list_id": ""
           }
         },
         "channel_id": "C00000000",

diff --git a/json-logs/samples/scim/v2/Groups.json b/json-logs/samples/scim/v2/Groups.json
@@ -14,6 +14,10 @@
       },
       "displayName": "",
       "members": [
+        {
+          "value": "W00000000",
+          "display": ""
+        },
         {
           "value": "",
           "display": ""

diff --git a/slack-api-model/src/main/java/com/slack/api/model/MatchedItem.java b/slack-api-model/src/main/java/com/slack/api/model/MatchedItem.java
@@ -268,6 +268,7 @@ public static class Address {
     private String access;
     private Integer updateNotification;
     private Integer privateChannelsWithFileAccessCount;
+    private Integer privateFileWithAccessCount;
     private List<File.UserWithFileAccess> dmMpdmUsersWithFileAccess;
     private List<String> teamsSharedWith;
     private String orgOrWorkspaceAccess;

diff --git a/slack-api-model/src/main/java/com/slack/api/model/Room.java b/slack-api-model/src/main/java/com/slack/api/model/Room.java
@@ -50,6 +50,7 @@ public class Room {
 
     @Data
     public static class ParticipantsEvent {
+        private Team userTeam;
         private boolean joined;
         private boolean cameraOn;
         private boolean cameraOff;

diff --git a/slack-api-model/src/main/java/com/slack/api/model/admin/AppActivity.java b/slack-api-model/src/main/java/com/slack/api/model/admin/AppActivity.java
@@ -76,6 +76,7 @@ public static class TripInformation {
         private String channelId;
         private String messageTs;
         private String reaction;
+        private String listId;
         // TODO: more properties
     }
 }