Skip to content

Commit

Permalink
bump Kotlin version to 2.0.0, bump Vert.x version to 4.5.8, bump Ebea…
Browse files Browse the repository at this point in the history
…n version to 15.4.0, bump YoFw version to 0.6
  • Loading branch information
danurahadi committed Jul 4, 2024
1 parent b24bee0 commit a982d44
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 25 deletions.
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
ext {
version = project.property('version')

kotlinVersion = "2.0.0-Beta2"
vertxVersion = '4.5.1'
pebbleVersion = '3.2.1'
kotlinVersion = "2.0.20-Beta1"
vertxVersion = '4.5.8'
pebbleVersion = '3.2.2'

coroutineVersion = "1.8.0-RC"
coroutineVersion = "1.9.0-RC"
arrowVersion = "0.7.2"
detektVersion = "1.23.4"
detektVersion = "1.23.6"

logbackVersion = '1.4.8'
logbackVersion = '1.5.6'
logstashLogbackEncoderVersion = '7.4'

commonsLangVersion = '3.13.0'
commonsIOVersion = '2.13.0'
commonsCodecVersion = '1.16.0'

daggerVersion = '2.49'
jacksonVersion = '2.16.0'
daggerVersion = '2.51.1'
jacksonVersion = '2.17.1'
morphiaVersion = '1.3.2'
quartzVersion = "2.5.0-rc1"

Expand All @@ -29,11 +29,11 @@ ext {
guavaVersion = '23.5-jre'
asciiTableVersion = '0.3.2'

ebeanVersion = "13.25.2"
ebeanAutotuneVersion = "13.25.0"
ebeanVersion = "15.4.0"
ebeanAutotuneVersion = "14.0.0"
jdbiVersion = "3.39.1"
hikariCPVersion = "5.0.1"
flywayVersion = "10.3.0"
hikariCPVersion = "5.1.0"
flywayVersion = "10.15.0"

restAssuredVersion = '5.3.1'
embeddedMongoVersion = '2.0.0'
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
id 'groovy-gradle-plugin'
}

def kotlinVersion = '2.0.0-Beta2'
def detektVersion = '1.23.4'
def kotlinVersion = '2.0.20-Beta1'
def detektVersion = '1.23.6'

repositories {
// Use the plugin portal to apply community plugins in convention plugins.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ artifacts {
}

detekt {
toolVersion = "1.23.4"
toolVersion = "1.23.6"
input = files("src/main/kotlin")
buildUponDefaultConfig = true
parallel = true
Expand Down
14 changes: 12 additions & 2 deletions core/src/main/kotlin/id/yoframework/core/extension/vertx/Vertx.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,22 @@

package id.yoframework.core.extension.vertx

import io.vertx.core.*
import io.vertx.core.DeploymentOptions
import io.vertx.core.Promise
import io.vertx.core.ThreadingModel
import io.vertx.core.Verticle
import io.vertx.core.Vertx
import io.vertx.core.VertxException
import io.vertx.core.VertxOptions
import io.vertx.core.http.HttpServer
import io.vertx.core.http.HttpServerRequest
import io.vertx.core.json.JsonObject
import io.vertx.kotlin.coroutines.awaitResult
import kotlinx.coroutines.*
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope

@Deprecated("This function is deprecated and use ext function startHttpServer() on Web module instead.")
suspend fun Vertx.createHttpServer(port: Int, handler: (HttpServerRequest) -> Unit): HttpServer {
Expand Down
2 changes: 1 addition & 1 deletion ebean/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// Apply the db convention plugin for shared build configuration between module / subprojects.
id 'yoframework.kotlin-db-conventions'
id 'io.ebean' version '13.25.2'
id 'io.ebean' version '15.5.0'
}

dependencies {
Expand Down
9 changes: 3 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Set the project version
version=0.4.12

# Use K2 Compiler
kotlin.experimental.tryK2=true
version=0.6

# Enable K2 for KAPT compiler plugin
kapt.use.k2=true
Expand All @@ -11,10 +8,10 @@ kapt.use.k2=true
org.gradle.jvmargs=-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options=-Xmx1G

# Enable daemon
org.gradle.daemon=false
org.gradle.daemon=true

# Enable the build cache
org.gradle.caching=false
org.gradle.caching=true

# Enable parallelize build
org.gradle.parallel=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-rc-1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit a982d44

Please sign in to comment.