diff --git a/build.gradle.kts b/build.gradle.kts index af227f68080..51c78fcd71e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -118,39 +118,10 @@ rootProject.apply { IdeVersionConfigurator.setCurrentIde(project) -extra["versions.protobuf"] = "2.6.1" -extra["versions.javax.inject"] = "1" -extra["versions.jsr305"] = "1.3.9" -extra["versions.jansi"] = "1.16" -extra["versions.jline"] = "3.3.1" -extra["versions.junit"] = "4.13.2" -extra["versions.javaslang"] = "2.0.6" -extra["versions.ant"] = "1.10.7" -extra["versions.android"] = "2.3.1" -extra["versions.kotlinx-coroutines-core"] = "1.5.0" -extra["versions.kotlinx-coroutines-core-jvm"] = "1.5.0" -extra["versions.kotlinx-coroutines-jdk8"] = "1.5.0" -extra["versions.json"] = "20160807" -extra["versions.native-platform"] = "0.14" -extra["versions.robolectric"] = "4.0" -extra["versions.org.springframework"] = "4.2.0.RELEASE" -extra["versions.jflex"] = "1.7.0" -extra["versions.markdown"] = "0.1.25" -extra["versions.trove4j"] = "1.0.20181211" -extra["versions.completion-ranking-kotlin"] = "0.1.3" -extra["versions.r8"] = "2.2.64" -val immutablesVersion = "0.3.1" -extra["versions.kotlinx-collections-immutable"] = immutablesVersion -extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion - -// NOTE: please, also change KTOR_NAME in pathUtil.kt and all versions in corresponding jar names in daemon tests. -extra["versions.ktor-network"] = "1.0.1" - if (!project.hasProperty("versions.kotlin-native")) { extra["versions.kotlin-native"] = "1.6.20-dev-5356" } -extra["versions.kotlinx-metadata-jvm"] = "0.4.0" val useJvmFir by extra(project.kotlinBuildProperties.useFir) diff --git a/gradle/versions.properties b/gradle/versions.properties index 881849a88f3..9fdd6645473 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -6,24 +6,44 @@ versions.intellijSdk.forIde.212=212.4746.92 # versions.* should match library versions used in IDEA from versions.intellijSdk -versions.gradle-api=4.5.1 -versions.jna=5.6.0 -versions.shadow=6.1.0 -versions.junit-bom=5.8.1 -versions.org.junit.platform=1.7.0 versions.annotations=21.0 versions.asm-all=9.0 -versions.guava=29.0-jre -versions.log4j=1.2.17.2 -versions.trove4j=1.0.20181211 -versions.jdom=2.0.6 -versions.streamex=0.7.2 -versions.oro=2.0.8 -versions.jna-platform=5.6.0 -versions.intellij-deps-fastutil=8.4.1-4 -versions.lz4-java=1.7.1 versions.commons-lang=2.4 -versions.gson=2.8.6 -versions.groovy=2.5.11 +versions.gradle-api=4.5.1 versions.groovy-xml=2.5.11 +versions.groovy=2.5.11 +versions.gson=2.8.6 +versions.guava=29.0-jre +versions.intellij-deps-fastutil=8.4.1-4 +versions.jdom=2.0.6 +versions.jna-platform=5.6.0 +versions.jna=5.6.0 +versions.junit-bom=5.8.1 +versions.log4j=1.2.17.2 +versions.lz4-java=1.7.1 +versions.org.junit.platform=1.7.0 +versions.oro=2.0.8 versions.serviceMessages=2019.1.4 +versions.shadow=6.1.0 +versions.streamex=0.7.2 +versions.trove4j=1.0.20181211 + +versions.android=2.3.1 +versions.ant=1.10.7 +versions.jansi=1.16 +versions.javaslang=2.0.6 +versions.javax.inject=1 +versions.jflex=1.7.0 +versions.jline=3.3.1 +versions.jsr305=1.3.9 +versions.junit=4.13.2 +versions.kotlinx-collections-immutable-jvm=0.3.1 +versions.kotlinx-collections-immutable=0.3.1 +versions.kotlinx-coroutines-core-jvm=1.5.0 +versions.kotlinx-coroutines-core=1.5.0 +versions.kotlinx-metadata-jvm=0.4.0 +versions.ktor-network=1.0.1 +versions.native-platform=0.14 +versions.protobuf=2.6.1 +versions.r8=2.2.64 +versions.robolectric=4.0 \ No newline at end of file