libeufin

commit 916eb60f0afed50b360dc4dc6090f9bd30f4a620
parent a55388ced30d0acb9e1b21f2c68d6403afebb21a
Author: Antoine A <>
Date:   Wed, 18 Oct 2023 16:50:37 +0000

Update some dependencies

Diffstat:
M
bank/build.gradle
 | 
18
+++++++++---------
M
bank/src/main/kotlin/tech/libeufin/bank/Main.kt
 | 
59
+++++++++--------------------------------------------------
M
build.gradle
 | 
5
+++--

3 files changed, 21 insertions(+), 61 deletions(-)
diff --git a/bank/build.gradle b/bank/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'application'
     id 'org.jetbrains.kotlin.jvm'
     id "com.github.johnrengelman.shadow" version "5.2.0"
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.22'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.10'
 }
 
 sourceCompatibility = "11"
@@ -44,7 +44,7 @@ sourceSets {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1-native-mt'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'ch.qos.logback:logback-classic:1.4.5'
     implementation project(":util")
 
@@ -53,10 +53,10 @@ dependencies {
     implementation "javax.xml.bind:jaxb-api:2.3.0"
     implementation "org.glassfish.jaxb:jaxb-runtime:2.3.1"
 
-    implementation 'org.postgresql:postgresql:42.2.27'
+    implementation 'org.postgresql:postgresql:42.6.0'
     implementation 'com.zaxxer:HikariCP:5.0.1'
     implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
-    implementation('com.github.ajalt:clikt:2.8.0')
+    implementation "com.github.ajalt.clikt:clikt:4.2.1"
 
     implementation "io.ktor:ktor-server-core:$ktor_version"
     implementation "io.ktor:ktor-server-call-logging:$ktor_version"
@@ -68,18 +68,18 @@ dependencies {
     implementation "io.ktor:ktor-server-netty:$ktor_version"
     implementation "io.ktor:ktor-server-test-host:$ktor_version"
     implementation "io.ktor:ktor-auth:$ktor_auth_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
-    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
+    implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version"
     implementation "io.ktor:ktor-server-request-validation:$ktor_version"
 
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.5.21'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test:1.5.21'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation group: "junit", name: "junit", version: '4.13.2'
 
     testImplementation project(":util")
 
     // UNIX domain sockets support (used to connect to PostgreSQL)
-    implementation 'com.kohlschutter.junixsocket:junixsocket-core:2.6.2'
+    implementation 'com.kohlschutter.junixsocket:junixsocket-core:2.8.1'
 }
 
 application {
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -23,7 +23,6 @@ package tech.libeufin.bank
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.core.subcommands
-import com.github.ajalt.clikt.output.CliktHelpFormatter
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
@@ -269,15 +268,6 @@ fun Application.corebankWebApp(db: Database, ctx: BankApplicationContext) {
     }
 }
 
-class LibeufinBankCommand : CliktCommand() {
-    init {
-        versionOption(getVersion())
-        subcommands(ServeBank(), BankDbInit(), ChangePw(), BankConfig())
-    }
-
-    override fun run() = Unit
-}
-
 fun durationFromPretty(s: String): Long {
     var durationUs: Long = 0;
     var currentNum = "";
@@ -332,18 +322,11 @@ class BankDbInit : CliktCommand("Initialize the libeufin-bank database", name = 
         "--config", "-c",
         help = "set the configuration file"
     )
-
     private val requestReset by option(
         "--reset", "-r",
         help = "reset database (DANGEROUS: All existing data is lost)"
     ).flag()
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val cfg = talerConfig(configFile).loadDbConfig()
         if (requestReset) {
@@ -359,12 +342,6 @@ class ServeBank : CliktCommand("Run libeufin-bank HTTP server", name = "serve") 
         help = "set the configuration file"
     )
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val cfg = talerConfig(configFile)
         val ctx = cfg.loadBankApplicationContext()
@@ -393,12 +370,6 @@ class ChangePw : CliktCommand("Change account password", name = "passwd") {
     private val account by argument("account")
     private val password by argument("password")
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val cfg = talerConfig(configFile)
         val ctx = cfg.loadBankApplicationContext() 
@@ -424,12 +395,6 @@ class BankConfigDump : CliktCommand("Dump the configuration", name = "dump") {
         help = "set the configuration file"
     )
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val config = talerConfig(configFile)
         println("# install path: ${config.getInstallPath()}")
@@ -443,15 +408,8 @@ class BankConfigPathsub : CliktCommand("Substitute variables in a path", name = 
         "--config", "-c",
         help = "set the configuration file"
     )
-
     private val pathExpr by argument()
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val config = talerConfig(configFile)
         println(config.pathsub(pathExpr))
@@ -463,22 +421,14 @@ class BankConfigGet : CliktCommand("Lookup config value", name = "get") {
         "--config", "-c",
         help = "set the configuration file"
     )
-
     private val isPath by option(
         "--filename", "-f",
         help = "interpret value as path with dollar-expansion"
     ).flag()
-
     private val sectionName by argument()
     private val optionName by argument()
 
 
-    init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-
     override fun run() {
         val config = talerConfig(configFile)
         if (isPath) {
@@ -507,6 +457,15 @@ class BankConfig : CliktCommand("Dump the configuration", name = "config") {
     override fun run() = Unit
 }
 
+class LibeufinBankCommand : CliktCommand() {
+    init {
+        versionOption(getVersion())
+        subcommands(ServeBank(), BankDbInit(), ChangePw(), BankConfig())
+    }
+
+    override fun run() = Unit
+}
+
 fun main(args: Array<String>) {
     LibeufinBankCommand().main(args)
 }
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
     // id 'org.jetbrains.kotlin.jvm' version '1.5.30'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.22'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.10'
     id 'idea'
     id 'java-library'
     id 'maven-publish'
@@ -21,7 +21,8 @@ if (!JavaVersion.current().isJava11Compatible()){
 }
 
 allprojects {
-    ext.set("ktor_version", "2.2.1")
+    ext.set("kotlin_version", "1.9.10")
+    ext.set("ktor_version", "2.3.3")
     ext.set("ktor_auth_version", "1.6.8")
     ext.set("exposed_version", "0.41.1")