diff --git a/buildSrc/src/main/kotlin/configurations/CompilerSettings.kt b/buildSrc/src/main/kotlin/configurations/CompilerSettings.kt index 3e0d79551..ff2d443e8 100644 --- a/buildSrc/src/main/kotlin/configurations/CompilerSettings.kt +++ b/buildSrc/src/main/kotlin/configurations/CompilerSettings.kt @@ -2,4 +2,5 @@ package configurations object CompilerSettings { const val KOTLIN_JVM_TARGET = "1.8" + const val KOTLIN_USE_IR_COMPILER = true } diff --git a/buildSrc/src/main/kotlin/configurations/Languages.kt b/buildSrc/src/main/kotlin/configurations/Languages.kt index 1453a9862..91d74698f 100644 --- a/buildSrc/src/main/kotlin/configurations/Languages.kt +++ b/buildSrc/src/main/kotlin/configurations/Languages.kt @@ -1,10 +1,6 @@ package configurations -import org.gradle.api.JavaVersion import org.gradle.api.Project -import org.gradle.api.plugins.JavaPluginConvention -import org.gradle.api.plugins.JavaPluginExtension -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.maven import org.gradle.kotlin.dsl.repositories diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt index ac77ab3a8..ce15b808c 100644 --- a/buildSrc/src/main/kotlin/dependencies/Versions.kt +++ b/buildSrc/src/main/kotlin/dependencies/Versions.kt @@ -3,22 +3,22 @@ package dependencies object Versions { val JUNIT_JUPITER = "5.7.1" val BATIK = "1.14" - val KOTLIN = "1.4.30" - val KTOR = "1.5.1" + val KOTLIN = "1.4.31" + val KTOR = "1.5.2" val PROGUARD = "7.0.1" val KOTLESS = "0.1.6" val MARKDOWNJ_CORE = "0.4" - val ZIP4J = "2.6.4" + val ZIP4J = "2.7.0" val ITEXTPDF = "5.5.13.2" val BATIK_TRANSCODER = BATIK val BATIK_CODEC = BATIK - val SNAKEYAML = "1.27" + val SNAKEYAML = "1.28" val SYSTEM_TRAY = "3.17" val BOUNCYCASTLE = "1.68" val JUNIT_JUPITER_API = JUNIT_JUPITER val JUNIT_JUPITER_ENGINE = JUNIT_JUPITER - val KOTLIN_SERIALIZATION_JSON = "1.0.1" + val KOTLIN_SERIALIZATION_JSON = "1.1.0" val KOTLIN_COROUTINES_CORE = "1.4.2" val KTOR_SERVER_NETTY = KTOR val KTOR_SERVER_SERVLET = KTOR @@ -30,16 +30,16 @@ object Versions { val PROGUARD_GRADLE = PROGUARD val WCA_I18N = "0.4.3" val GOOGLE_APPENGINE_GRADLE = "2.4.1" - val GOOGLE_CLOUD_STORAGE = "1.113.9" + val GOOGLE_CLOUD_STORAGE = "1.113.11" val TNOODLE_SCRAMBLES = "0.18.0" val APACHE_COMMONS_LANG3 = "3.11" val KOTLESS_KTOR = KOTLESS - val TESTING_MOCKK = "1.10.5" + val TESTING_MOCKK = "1.10.6" val KOTLINX_ATOMICFU_GRADLE = "0.15.1" object Plugins { val SHADOW = "6.1.0" - val NODEJS = "3.0.0" + val NODEJS = "3.0.1" val DEPENDENCY_VERSIONS = "0.36.0" val GIT_VERSION_TAG = "0.12.3" diff --git a/cloudscrambles/build.gradle.kts b/cloudscrambles/build.gradle.kts index 9bfc2a054..37608e213 100644 --- a/cloudscrambles/build.gradle.kts +++ b/cloudscrambles/build.gradle.kts @@ -1,4 +1,5 @@ import configurations.CompilerSettings.KOTLIN_JVM_TARGET +import configurations.CompilerSettings.KOTLIN_USE_IR_COMPILER import configurations.Languages.attachRemoteRepositories import configurations.ProjectVersions.tNoodleImplOrDefault import configurations.ProjectVersions.tNoodleVersionOrDefault @@ -33,6 +34,7 @@ dependencies { tasks.withType { kotlinOptions.jvmTarget = KOTLIN_JVM_TARGET + kotlinOptions.useIR = KOTLIN_USE_IR_COMPILER } appengine { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 330c692c5..9c6c01be3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip diff --git a/tnoodle-server/build.gradle.kts b/tnoodle-server/build.gradle.kts index 149845e6c..5227c251c 100644 --- a/tnoodle-server/build.gradle.kts +++ b/tnoodle-server/build.gradle.kts @@ -1,4 +1,5 @@ import configurations.CompilerSettings.KOTLIN_JVM_TARGET +import configurations.CompilerSettings.KOTLIN_USE_IR_COMPILER import configurations.Languages.attachRemoteRepositories import crypto.BuildVerification.SIGNATURE_PACKAGE @@ -42,6 +43,7 @@ dependencies { tasks.withType { kotlinOptions.jvmTarget = KOTLIN_JVM_TARGET + kotlinOptions.useIR = KOTLIN_USE_IR_COMPILER } tasks.create("deleteSignatures") { diff --git a/webscrambles/build.gradle.kts b/webscrambles/build.gradle.kts index 62eb3eabf..5545071a3 100644 --- a/webscrambles/build.gradle.kts +++ b/webscrambles/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import configurations.CompilerSettings.KOTLIN_JVM_TARGET +import configurations.CompilerSettings.KOTLIN_USE_IR_COMPILER import configurations.FileUtils.symlink import configurations.Frameworks.configureJUnit5 import configurations.Languages.attachRemoteRepositories @@ -73,6 +74,7 @@ configureJUnit5() tasks.withType { kotlinOptions.jvmTarget = KOTLIN_JVM_TARGET + kotlinOptions.useIR = KOTLIN_USE_IR_COMPILER } application {