[libeufin] branch master updated (a479803c -> a0cb722e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

antoine pushed a change to branch master
in repository libeufin.

    from a479803c nexus: table list format replaced by a multiline format that 
works better with narrow terminals
     new a15795cf common: update kotlin and gradle
     new a0cb722e nexus: clean swiss dialects

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:
 build.gradle                                                  | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 gradlew                                                       | 3 +--
 nexus/sample/platform/maerki_baumann_pain001.xml              | 2 +-
 nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/pain001.kt | 9 ++-------
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index bfb4176e..892b516c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // This file is in the public domain.
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "2.1.0"
+    id("org.jetbrains.kotlin.jvm") version "2.1.10"
     id("org.jetbrains.dokka") version "2.0.0"
     id("idea")
     id("java-library")
@@ -19,7 +19,7 @@ if 
(!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)){
 
 allprojects {
     ext {
-        set("kotlin_version", "2.1.0")
+        set("kotlin_version", "2.1.10")
         set("ktor_version", "3.0.3")
         set("clikt_version", "5.0.2")
         set("coroutines_version", "1.10.1")
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index cea7a793..e18bc253 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set 
(https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 
exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/nexus/sample/platform/maerki_baumann_pain001.xml 
b/nexus/sample/platform/maerki_baumann_pain001.xml
index a6f98619..eb4bb918 100644
--- a/nexus/sample/platform/maerki_baumann_pain001.xml
+++ b/nexus/sample/platform/maerki_baumann_pain001.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Document 
xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 
pain.001.001.09.ch.03.xsd"><CstmrCdtTrfInitn><GrpHdr><MsgId>MESSAGE_ID</MsgId><CreDtTm>2024-09-09T00:00:00Z</CreDtTm><NbOfTxs>3</NbOfTxs><CtrlSum>47.32</CtrlSum><InitgPty><Nm>myname</Nm></InitgPty></GrpHdr><PmtInf><PmtInfId>NOTPROVIDED</PmtInfId><PmtM
 [...]
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Document 
xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 
pain.001.001.09.ch.03.xsd"><CstmrCdtTrfInitn><GrpHdr><MsgId>MESSAGE_ID</MsgId><CreDtTm>2024-09-09T00:00:00Z</CreDtTm><NbOfTxs>3</NbOfTxs><CtrlSum>47.32</CtrlSum><InitgPty><Nm>myname</Nm></InitgPty></GrpHdr><PmtInf><PmtInfId>NOTPROVIDED</PmtInfId><PmtM
 [...]
\ No newline at end of file
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/pain001.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/pain001.kt
index 28c246b2..c13434ee 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/pain001.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/iso20022/pain001.kt
@@ -89,13 +89,8 @@ fun createPain001(
                 el("BtchBookg", "false")
                 el("NbOfTxs", msg.txs.size.toString())
                 el("CtrlSum", totalAmount)
-                if (dialect != Dialect.postfinance) {
-                    el("PmtTpInf/SvcLvl/Cd", 
-                        when (dialect) {
-                            Dialect.postfinance, Dialect.maerki_baumann -> 
"SDVA" // TODO
-                            Dialect.gls -> "SEPA"
-                        }
-                    )
+                if (dialect == Dialect.gls) {
+                    el("PmtTpInf/SvcLvl/Cd", "SEPA")
                 }
                 el("ReqdExctnDt/Dt", 
DateTimeFormatter.ISO_DATE.format(zonedTimestamp))
                 el("Dbtr/Nm", msg.debtor.name)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.