Versions: Gradle -> 7.0, Kotlin -> 1.4.31, project -> 0.4.2

h0tk3y · Apr 20, 2021 · 52064dc · 52064dc
1 parent db8d94d
commit 52064dc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.allopen")
-    id("kotlinx.benchmark")
+    id("org.jetbrains.kotlinx.benchmark")
 }
 
 kotlin {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,5 +5,5 @@ plugins {
 
 repositories {
     // TODO: unify repository setup with the root project once IJ fixes importing of buildSrc
-    jcenter()
+    mavenCentral()
 }
diff --git a/buildSrc/src/main/kotlin/MultiplatformLibraryDependency.kt b/buildSrc/src/main/kotlin/MultiplatformLibraryDependency.kt
@@ -10,7 +10,7 @@ val Project.serializationVersion: String
     get() = project.property("serializationVersion").toString()
 
 private const val serializationJsonPrefix = "org.jetbrains.kotlinx:kotlinx-serialization-json"
-private const val benchmarksRuntimePrefix = "org.jetbrains.kotlinx:kotlinx.benchmark.runtime"
+private const val benchmarksRuntimePrefix = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime"
 
 data class MultiplatformLibraryDependency(
     val rootModule: String,

diff --git 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-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,8 +6,7 @@ pluginManagement {
     abstract class RepositorySetup :
         BuildServiceParameters, (RepositoryHandler, Boolean) -> Unit, BuildService<RepositorySetup> {
         override fun invoke(repositories: RepositoryHandler, isPlugins: Boolean): Unit = with(repositories) {
-            jcenter()
-            maven("https://dl.bintray.com/kotlin/kotlinx")
+            mavenCentral()
             if (isPlugins) {
                 gradlePluginPortal()
             }
@@ -27,7 +26,7 @@ pluginManagement {
         kotlin("multiplatform").version(kotlinVersion)
         kotlin("js").version(kotlinVersion)
         kotlin("plugin.allopen").version(kotlinVersion)
-        id("kotlinx.benchmark").version(benchmarkVersion)
+        id("org.jetbrains.kotlinx.benchmark").version(benchmarkVersion)
     }
 }
 

diff --git a/versions.settings.gradle.kts b/versions.settings.gradle.kts
@@ -3,18 +3,18 @@ package com.github.h0tk3y.betterParse.build
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import kotlin.reflect.full.memberProperties
 
-val kotlinVersion = KotlinPlugin.V1421
+val kotlinVersion = KotlinPlugin.V1431
 
 enum class KotlinPlugin {
-    V1421, /* TODO: support 1.4.30 */
+    V1431, /* TODO: support 1.5 pre-releases */
 }
 
 val versions = when (kotlinVersion) {
-    KotlinPlugin.V1421 -> Versions(
-        version = "0.4.1",
-        kotlinVersion = "1.4.21",
-        serializationVersion = "1.0.1",
-        benchmarkVersion = "0.2.0-dev-20"
+    KotlinPlugin.V1431 -> Versions(
+        version = "0.4.2",
+        kotlinVersion = "1.4.31",
+        serializationVersion = "1.1.0",
+        benchmarkVersion = "0.3.0"
     )
 }