⬆️ Upgrade dependencies (#327)

* 🎨 Add small logo * ✨ Upgrade dependencies * ✨ Add icon for idea * 🚨 Make ktlint happy
ButterCam · Aug 23, 2021 · 12682c1 · 12682c1
1 parent dcb69a7
commit 12682c1
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 8 deletions.
diff --git a/.idea/icon.svg b/.idea/icon.svg
diff --git a/.idea/icon_dark.svg b/.idea/icon_dark.svg
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
@@ -7,7 +7,7 @@ object Dependencies {
         const val stdlib = "$group:kotlin-stdlib-jdk8"
         const val reflect = "$group:kotlin-reflect"
         const val poet = "com.squareup:kotlinpoet"
-        const val plugin = "$group:kotlin-gradle-plugin"
+        const val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin"
 
         object Coroutines {
             private const val group = "org.jetbrains.kotlinx"

diff --git a/dependencies/build.gradle.kts b/dependencies/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     api(platform("io.micrometer:micrometer-bom:1.7.3"))
     api(platform("org.apache.maven:maven:3.8.2"))
     api(platform("org.apache.rocketmq:rocketmq-all:4.9.1"))
-    api(platform("org.jetbrains.kotlin:kotlin-bom:1.5.10"))
+    api(platform("org.jetbrains.kotlin:kotlin-bom:1.5.21"))
     api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.0"))
     api(platform("org.junit:junit-bom:5.7.2"))
     api(platform("org.springframework.boot:spring-boot-dependencies:2.5.4"))
@@ -41,20 +41,21 @@ dependencies {
         api("com.netflix.nebula:gradle-info-plugin:10.0.0")
         api("com.netflix.nebula:nebula-publishing-plugin:17.3.3")
         api("com.palantir.gradle.docker:gradle-docker:0.28.0")
-        api("com.salesforce.servicelibs:rxgrpc-stub:1.0.1")
+        api("com.salesforce.servicelibs:rxgrpc-stub:1.1.0")
         api("com.squareup.okhttp3:okhttp:4.9.1")
         api("com.squareup.retrofit2:retrofit:2.9.0")
         api("com.squareup:kotlinpoet:1.9.0")
-        api("io.github.resilience4j:resilience4j-retrofit:1.7.0")
+        api("io.github.resilience4j:resilience4j-retrofit:1.7.1")
+        api("io.github.resilience4j:resilience4j-circuitbreaker:1.7.1")
         api("io.grpc:grpc-kotlin-stub:1.1.0")
         api("io.kubernetes:client-java:13.0.0")
         api("io.swagger.core.v3:swagger-core:2.1.10")
         api("org.antlr:antlr4:4.9.2")
         api("org.apache.maven.wagon:wagon-http:3.4.3")
         api("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
         api("org.gradle.kotlin:plugins:1.3.6")
-        api("org.jetbrains.kotlin:kotlin-allopen:1.5.10")
-        api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
+        api("org.jetbrains.kotlin:kotlin-allopen:1.5.21")
+        api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
         api("org.jlleitschuh.gradle:ktlint-gradle:10.0.0")
         api("org.jooq:jooq:3.14.12")
         api("org.mongodb:mongodb-driver-reactivestreams:4.3.1")

diff --git a/doc/sisyphus_logo-x16-bg.svg b/doc/sisyphus_logo-x16-bg.svg
diff --git a/doc/sisyphus_logo-x16.svg b/doc/sisyphus_logo-x16.svg
diff --git a/lib/sisyphus-grpc-rxjava/build.gradle.kts b/lib/sisyphus-grpc-rxjava/build.gradle.kts
@@ -10,6 +10,8 @@ description = "Sisyphus customized gRPC runtime for RxJava2(client only)"
 dependencies {
     api(project(":lib:sisyphus-grpc"))
     api("com.salesforce.servicelibs:rxgrpc-stub")
+    api("io.reactivex.rxjava2:rxjava")
+    api("io.grpc:grpc-stub")
 
     proto(platform(project(":sisyphus-dependencies")))
     proto(Dependencies.Proto.grpcProto)

diff --git a/...s-jdbc/src/main/kotlin/com/bybutter/sisyphus/middleware/jdbc/AbstractDslContextFactory.kt b/...s-jdbc/src/main/kotlin/com/bybutter/sisyphus/middleware/jdbc/AbstractDslContextFactory.kt
@@ -16,7 +16,7 @@ abstract class AbstractDslContextFactory(private val configInterceptors: List<Jo
     final override fun createContext(qualifier: Class<*>, property: JdbcDatabaseProperty): DSLContext {
         val url = buildJdbcUrl(property)
         val datasource = createDatasource(url, property)
-        return DSL.using(createConfiguration(qualifier, datasource, JDBCUtils.dialect(url), configInterceptors))
+        return DSL.using(createConfiguration(qualifier, datasource, property.dialect ?: JDBCUtils.dialect(url), configInterceptors))
     }
 
     protected open fun buildJdbcUrl(property: JdbcDatabaseProperty): String {

diff --git a/...syphus-jdbc/src/main/kotlin/com/bybutter/sisyphus/middleware/jdbc/JdbcDatabaseProperty.kt b/...syphus-jdbc/src/main/kotlin/com/bybutter/sisyphus/middleware/jdbc/JdbcDatabaseProperty.kt
@@ -1,5 +1,6 @@
 package com.bybutter.sisyphus.middleware.jdbc
 
+import org.jooq.SQLDialect
 import org.springframework.boot.context.properties.NestedConfigurationProperty
 
 data class JdbcDatabaseProperty(
@@ -9,7 +10,8 @@ data class JdbcDatabaseProperty(
     val parameters: Map<String, String> = mapOf(),
     @NestedConfigurationProperty
     val poolConfig: ConnectionPoolProperty? = null,
-    val qualifier: Class<*>
+    val qualifier: Class<*>,
+    val dialect: SQLDialect? = null,
 )
 
 data class ConnectionPoolProperty(

diff --git a/middleware/sisyphus-retrofit/build.gradle.kts b/middleware/sisyphus-retrofit/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     api(Dependencies.okhttp)
     api(Dependencies.reflections)
     api(Dependencies.resilience4j)
+    api("io.github.resilience4j:resilience4j-circuitbreaker")
     api(project(":lib:sisyphus-common"))
     api(project(":lib:sisyphus-dto"))
     api(project(":lib:sisyphus-jackson"))