azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: Do not add bintray repoitory for eap versions

Browse Source
This commit is contained in:
anastasiia.spaseeva
2020-12-07 11:50:31 +03:00
parent 2d8a8d252b
commit 71459db9dd
77 changed files with 35 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
-1
View File
@@ -83,7 +83,6 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes
fun repositories(useKts: Boolean): String {
val customRepositories = arrayOf(
"https://dl.bintray.com/kotlin/kotlin-dev",
"http://dl.bintray.com/kotlin/kotlin-eap"
)
val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n")
return """
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
-9
View File
@@ -59,14 +59,6 @@ val SNAPSHOT_REPOSITORY = RepositoryDescription(
isSnapshot = true
)
val EAP_REPOSITORY = RepositoryDescription(
"bintray.kotlin.eap",
"Bintray Kotlin EAP Repository",
"https://dl.bintray.com/kotlin/kotlin-eap",
"https://bintray.com/kotlin/kotlin-eap/kotlin/",
isSnapshot = false
)
val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription(
"default.gradle.plugins",
"Default Gradle Plugin Repository",
@@ -113,7 +105,6 @@ fun RepositoryDescription.toKotlinRepositorySnippet() = "maven(\"$url\")"
fun getRepositoryForVersion(version: String): RepositoryDescription? = when {
isSnapshot(version) -> SNAPSHOT_REPOSITORY
isEap(version) -> EAP_REPOSITORY
isDev(version) -> devRepository(version)
else -> null
}
idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml
Vendored
-28
View File
@@ -26,34 +26,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray.kotlin.eap</id>
<name>Bintray Kotlin EAP Repository</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray.kotlin.eap</id>
<name>Bintray Kotlin EAP Repository</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory></sourceDirectory>
<plugins>
idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml
Vendored
-28
View File
@@ -26,34 +26,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray.kotlin.eap</id>
<name>Bintray Kotlin EAP Repository</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray.kotlin.eap</id>
<name>Bintray Kotlin EAP Repository</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory></sourceDirectory>
<plugins>
idea/idea-maven/testData/maven-inspections/deprecatedJre.fixed.1.xml
Vendored
-21
View File
@@ -26,27 +26,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
idea/idea-maven/testData/maven-inspections/deprecatedJre.xml
Vendored
-21
View File
@@ -26,27 +26,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.fixed.1.xml
Vendored
-18
View File
@@ -27,14 +27,6 @@
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
@@ -44,16 +36,6 @@
<url>https://kotlin.bintray.com/kotlinx</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutines.xml
Vendored
-18
View File
@@ -27,14 +27,6 @@
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
@@ -44,16 +36,6 @@
<url>https://kotlin.bintray.com/kotlinx</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
idea/idea-maven/testData/maven-inspections/deprecatedKotlinxCoroutinesNoError.xml
Vendored
-18
View File
@@ -27,14 +27,6 @@
</dependencies>
<repositories>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
@@ -44,16 +36,6 @@
<url>https://kotlin.bintray.com/kotlinx</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>bintray-kotlin-kotlin-eap</id>
<name>bintray-plugins</name>
<url>https://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
idea/testData/configuration/gradle/eapVersion/build_after.gradle
Vendored
-2
View File
@@ -6,7 +6,6 @@ version = '1.0'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -16,7 +15,6 @@ dependencies {
buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
mavenCentral()
}
dependencies {
idea/testData/configuration/gradle/m04Version/build_after.gradle
Vendored
-2
View File
@@ -6,7 +6,6 @@ version = '1.0'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -16,7 +15,6 @@ dependencies {
buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
mavenCentral()
}
dependencies {
idea/testData/configuration/gradle/rcVersion/build_after.gradle
Vendored
-2
View File
@@ -6,7 +6,6 @@ version = '1.0'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -16,7 +15,6 @@ dependencies {
buildscript {
ext.kotlin_version = '$VERSION$'
repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
mavenCentral()
}
dependencies {
idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts
Vendored
-1
View File
@@ -12,7 +12,6 @@ application {
repositories {
jcenter()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
dependencies {
idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts
Vendored
-1
View File
@@ -11,7 +11,6 @@ application {
repositories {
jcenter()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
dependencies {
idea/testData/gradle/configurator/configureJsEAPWithBuildGradle/build.gradle.after
Vendored
+1 -2
View File
@@ -6,8 +6,7 @@ version '1.0-SNAPSHOT'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
}
}
idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after
Vendored
+1 -2
View File
@@ -6,8 +6,7 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
dependencies {
implementation(kotlin("stdlib-js"))
}
}
idea/testData/gradle/configurator/configureJvmEAPWithBuildGradle/build.gradle.after
Vendored
+1 -2
View File
@@ -10,7 +10,6 @@ sourceCompatibility = 1.8
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
@@ -26,4 +25,4 @@ compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after
Vendored
-1
View File
@@ -10,7 +10,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
dependencies {
idea/testData/gradle/configurator/enableFeatureSupportMultiplatformWithXFlag/settings.gradle
Vendored
-1
View File
@@ -1,7 +1,6 @@
pluginManagement {
repositories {
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap'
}
}
}
idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/build.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ plugins {
id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}")
}
repositories {
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
mavenLocal()
}
idea/testData/gradle/nativeRunConfiguration/customEntryPointWithoutRunGutter/settings.gradle.kts
Vendored
-1
View File
@@ -1,6 +1,5 @@
pluginManagement {
repositories {
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
mavenLocal()
gradlePluginPortal()
idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/build.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ plugins {
id("org.jetbrains.kotlin.multiplatform") version ("{{kotlin_plugin_version}}")
}
repositories {
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
mavenLocal()
}
idea/testData/gradle/nativeRunConfiguration/multiplatformNativeRunGutter/settings.gradle.kts
Vendored
-1
View File
@@ -1,6 +1,5 @@
pluginManagement {
repositories {
maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
mavenLocal()
gradlePluginPortal()
idea/testData/perfTest/native/_common/build.gradle.kts.header
Vendored
-2
View File
@@ -2,7 +2,6 @@ buildscript {
repositories {
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlin-dev")
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
val kotlin_version: String by rootProject
@@ -18,7 +17,6 @@ plugins {
repositories {
mavenCentral()
maven("https://dl.bintray.com/kotlin/kotlin-dev")
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
// "kotlin" section goes under this line
idea/testData/perfTest/native/_common/settings.gradle.kts
Vendored
-1
View File
@@ -11,6 +11,5 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven("https://dl.bintray.com/kotlin/kotlin-dev")
maven("https://dl.bintray.com/kotlin/kotlin-eap")
}
}