Update Kotlin dev version to 1.5.0-M2-187.

pinterest · Feb 22, 2021 · 8178e79 · 8178e79
1 parent 9ab4fae
commit 8178e79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 ext.versions = [
-  'kotlin': gradle.ext.isKotlinDev ? "1.4.30-RC" : "1.4.30",
+  'kotlin': gradle.ext.isKotlinDev ? "1.5.0-M2-187" : "1.4.30",
   'gradle': '6.8.1',
   'gradle-sha256': 'fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd'
 ]
@@ -50,8 +50,7 @@ allprojects {
     gradlePluginPortal()
 
     if (gradle.ext.isKotlinDev) {
-      maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-      maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+      maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/' }
     }
   }
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -30,7 +30,10 @@
          </trusted-key>
          <trusted-key id="67497e9d680ce8e95bd6b8f85ad66315fc018797" group="com.beust" name="jcommander" version="1.72"/>
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="^com[.]google($|([.].*))" regex="true"/>
-         <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
+         <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83">
+            <trusting group="org.jetbrains.kotlin"/>
+            <trusting group="^org[.]jetbrains[.]kotlin($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
          <trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
             <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
@@ -802,11 +805,6 @@
             <sha256 value="dd045e8f633cf767d2927903de6f3ed6740ea3eb02ac24e667d41d41118a9144" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.4.30-RC">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.4.30-RC.pom">
-            <sha256 value="35e0b50e98ff4c133d7f79b521e2294bfd0bc556ff61cda86d7c4cdbabffb93e" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.2.1">
          <artifact name="kotlinx-coroutines-core-1.2.1.jar">
             <sha256 value="7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394" origin="Generated by Gradle"/>

diff --git a/settings.gradle b/settings.gradle
@@ -3,13 +3,12 @@ pluginManagement {
     mavenCentral()
     gradlePluginPortal()
     if (settings.hasProperty('kotlinDev')) {
-      maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-      maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+      maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/' }
     }
   }
 
   plugins {
-    def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.4.30-RC" : "1.4.30"
+    def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.5.0-M2-187" : "1.4.30"
     id 'org.jetbrains.kotlin.jvm' version kotlinVersion
     id 'com.github.breadmoirai.github-release' version '2.2.12'
     id 'com.github.johnrengelman.shadow' version '6.1.0'