You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ct...@apache.org on 2023/08/10 05:55:58 UTC

[thrift] branch dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0 updated (960986bdb -> 2b3dbfc80)

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0
in repository https://gitbox.apache.org/repos/asf/thrift.git


 discard 960986bdb Merge branch 'master' into dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0
 discard 37aa52362 Merge branch 'master' into dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0
    omit 6ec4c7086 Apply ktfmt formatting changes
    omit 8307cb276 Bump com.ncorti.ktfmt.gradle from 0.12.0 to 0.13.0 in /lib/kotlin
     new f073c9a5d Bump com.ncorti.ktfmt.gradle from 0.12.0 to 0.13.0 in /lib/kotlin
     new 2b3dbfc80 Apply ktfmt formatting changes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (960986bdb)
            \
             N -- N -- N   refs/heads/dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0 (2b3dbfc80)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


[thrift] 01/02: Bump com.ncorti.ktfmt.gradle from 0.12.0 to 0.13.0 in /lib/kotlin

Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0
in repository https://gitbox.apache.org/repos/asf/thrift.git

commit f073c9a5d9f5525caa6da8919f06075cb7ede467
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Aug 1 06:43:51 2023 +0000

    Bump com.ncorti.ktfmt.gradle from 0.12.0 to 0.13.0 in /lib/kotlin
    
    Bumps com.ncorti.ktfmt.gradle from 0.12.0 to 0.13.0.
    
    ---
    updated-dependencies:
    - dependency-name: com.ncorti.ktfmt.gradle
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 lib/kotlin/settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/kotlin/settings.gradle.kts b/lib/kotlin/settings.gradle.kts
index 86fa02ada..cb09e3c0f 100644
--- a/lib/kotlin/settings.gradle.kts
+++ b/lib/kotlin/settings.gradle.kts
@@ -19,7 +19,7 @@
 pluginManagement {
     plugins {
         kotlin("jvm") version "1.8.22"
-        id("com.ncorti.ktfmt.gradle") version "0.12.0"
+        id("com.ncorti.ktfmt.gradle") version "0.13.0"
     }
 }
 


[thrift] 02/02: Apply ktfmt formatting changes

Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.13.0
in repository https://gitbox.apache.org/repos/asf/thrift.git

commit 2b3dbfc802bb81f259dd3ab5fc8b67bbac111393
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Aug 9 14:36:47 2023 -0400

    Apply ktfmt formatting changes
---
 .../src/main/kotlin/org/apache/thrift/test/TestHandler.kt              | 3 ++-
 .../src/main/kotlin/org/apache/thrift/test/TestServer.kt               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestHandler.kt b/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestHandler.kt
index b7f38d7fe..a2ae0f2a1 100644
--- a/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestHandler.kt
+++ b/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestHandler.kt
@@ -104,7 +104,8 @@ class TestHandler : ThriftTest {
     override suspend fun testNest(thing: Xtruct2): Xtruct2 {
         val thing2: Xtruct = thing.struct_thing!!
         logger.info(
-            """testNest({${thing.byte_thing}, {"${thing2.string_thing}", ${thing2.byte_thing}, ${thing2.i32_thing}, ${thing2.i64_thing}}, ${thing.i32_thing}})""".trimIndent()
+            """testNest({${thing.byte_thing}, {"${thing2.string_thing}", ${thing2.byte_thing}, ${thing2.i32_thing}, ${thing2.i64_thing}}, ${thing.i32_thing}})"""
+                .trimIndent()
         )
         return thing
     }
diff --git a/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt b/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt
index 315d12e72..3cccc3d3d 100644
--- a/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt
+++ b/lib/kotlin/cross-test-server/src/main/kotlin/org/apache/thrift/test/TestServer.kt
@@ -96,6 +96,7 @@ object TestServer {
 
     internal class TestServerEventHandler() : TServerEventHandler {
         private var nextConnectionId = 1
+
         override fun preServe() {
             println(
                 "TServerEventHandler.preServe - called only once before server starts accepting connections"