diff --git a/build.gradle b/build.gradle index 27fd246..b210de7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,26 @@ ext { version = project.property('version') - kotlinVersion = "1.5.10" + kotlinVersion = "1.5.30" vertxVersion = '3.9.5' pebbleVersion = '3.1.5' - coroutineVersion = "1.5.0" + coroutineVersion = "1.5.1" arrowVersion = "0.7.2" logbackVersion = '1.2.3' logstashLogbackEncoderVersion = '6.6' - commonsLangVersion = '3.11' - commonsIOVersion = '2.8.0' + commonsLangVersion = '3.12.0' + commonsIOVersion = '2.11.0' commonsCodecVersion = '1.15' - daggerVersion = '2.37' - jacksonVersion = '2.12.3' + daggerVersion = '2.38.1' + jacksonVersion = '2.12.5' morphiaVersion = '1.3.2' quartzVersion = "2.3.2" - jakartaElVersion = '4.0.0' + jakartaElVersion = '4.0.1' hibernateValidatorVersion = '7.0.1.Final' elImplVersion = "2.2" @@ -28,10 +28,10 @@ ext { guavaVersion = '23.5-jre' asciiTableVersion = '0.3.2' - ebeanVersion = "12.9.2" + ebeanVersion = "12.11.2" jdbiVersion = "3.0.1" - hikariCPVersion = "4.0.3" - flywayVersion = "7.10.0" + hikariCPVersion = "5.0.0" + flywayVersion = "7.14.1" restAssuredVersion = '3.0.3' embeddedMongoVersion = '2.0.0' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 9138023..b7991f0 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,8 +5,8 @@ plugins { id 'groovy-gradle-plugin' } -def kotlinVersion = '1.5.10' -def detektVersion = '1.17.1' +def kotlinVersion = '1.5.30' +def detektVersion = '1.18.1' repositories { // Use the plugin portal to apply community plugins in convention plugins. diff --git a/buildSrc/src/main/groovy/yoframework.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/yoframework.kotlin-common-conventions.gradle index ce02133..0a9e752 100644 --- a/buildSrc/src/main/groovy/yoframework.kotlin-common-conventions.gradle +++ b/buildSrc/src/main/groovy/yoframework.kotlin-common-conventions.gradle @@ -11,6 +11,7 @@ plugins { repositories { mavenLocal() mavenCentral() + google() maven { // url "https://maven.pkg.github.com/jasoet/yoframework" url "https://jitpack.io" @@ -57,11 +58,11 @@ dependencies { tasks { compileKotlin { - sourceCompatibility = JavaVersion.VERSION_15 - targetCompatibility = JavaVersion.VERSION_15 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 kotlinOptions { - jvmTarget = "15" + jvmTarget = "11" apiVersion = "1.5" languageVersion = "1.5" allWarningsAsErrors = true @@ -71,11 +72,11 @@ tasks { } compileTestKotlin { - sourceCompatibility = JavaVersion.VERSION_15 - targetCompatibility = JavaVersion.VERSION_15 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 kotlinOptions { - jvmTarget = "15" + jvmTarget = "11" apiVersion = "1.5" languageVersion = "1.5" allWarningsAsErrors = true diff --git a/gradle.properties b/gradle.properties index a778b65..68d5b56 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # Set the project version -version=0.4.3 +version=0.4.4 # Set the JVM heap size -org.gradle.jvmargs=-Xms2g -Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options=-Xmx1G # Enable daemon -org.gradle.daemon=true +org.gradle.daemon=false # Enable the build cache -org.gradle.caching=true +org.gradle.caching=false # Enable parallelize build -org.gradle.parallel=true +org.gradle.parallel=false # Enable configure on demand -org.gradle.configureondemand=true +org.gradle.configureondemand=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists