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
libraries/scripting/dependencies-maven/test/kotlin/script/experimental/test/MavenResolverTest.kt
+1 -2
View File
@@ -95,11 +95,10 @@ class MavenResolverTest : ResolversTestBase() {
)
)
// @Repository("https://dl.bintray.com/kotlin/kotlin-eap", "https://dl.bintray.com/jakubriegel/kotlin-shell")
// @Repository( "https://dl.bintray.com/jakubriegel/kotlin-shell")
val repositories = repositoryConstructor.callBy(
mapOf(
repositoryConstructor.parameters.first() to arrayOf(
"https://dl.bintray.com/kotlin/kotlin-eap",
"https://dl.bintray.com/jakubriegel/kotlin-shell"
)
)
libraries/tools/new-project-wizard/build.gradle.kts
+1
View File
@@ -14,6 +14,7 @@ dependencies {
testImplementation(project(":kotlin-test:kotlin-test-junit"))
implementation(kotlinxCollectionsImmutable())
implementation("com.google.code.gson:gson:2.8.6")
}
sourceSets {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/a/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/b/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/c/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/d/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependency/expected/pom.xml
Vendored
-10
View File
@@ -21,18 +21,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<modules>
<module>a</module>
<module>b</module>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/c/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/b/pom.xml
Vendored
-10
View File
@@ -22,18 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/jvmToJvmDependencyWithSingleRoot/expected/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/kotlinJvm/pom.xml
Vendored
-11
View File
@@ -22,19 +22,8 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts
Vendored
-1
View File
@@ -9,7 +9,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
dependencies {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml
Vendored
+2 -6
View File
@@ -22,16 +22,12 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts
Vendored
-1
View File
@@ -10,7 +10,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
dependencies {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml
Vendored
+2 -6
View File
@@ -22,16 +22,12 @@
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>bintray.kotlin.kotlin-eap</id>
<url>KOTLIN_REPO</url>
<id>mavenCentral</id>
<url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle
Vendored
-1
View File
@@ -8,7 +8,6 @@ version = '1.0-SNAPSHOT'
repositories {
jcenter()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
dependencies {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts
Vendored
-1
View File
@@ -8,7 +8,6 @@ version = "1.0-SNAPSHOT"
repositories {
jcenter()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
dependencies {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
-1
View File
@@ -11,7 +11,6 @@ version = '1.0-SNAPSHOT'
repositories {
jcenter()
mavenCentral()
maven { url 'KOTLIN_REPO' }
maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' }
maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
maven { url 'https://dl.bintray.com/kotlin/ktor' }
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
-1
View File
@@ -11,7 +11,6 @@ version = "1.0-SNAPSHOT"
repositories {
jcenter()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") }
maven { url = uri("https://dl.bintray.com/kotlin/ktor") }
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle
Vendored
-1
View File
@@ -7,7 +7,6 @@ version = '1.0-SNAPSHOT'
repositories {
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts
Vendored
-1
View File
@@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle
Vendored
-1
View File
@@ -9,7 +9,6 @@ version = '1.0-SNAPSHOT'
repositories {
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/build.gradle.kts
Vendored
-1
View File
@@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle
Vendored
+1 -2
View File
@@ -3,7 +3,7 @@ buildscript {
gradlePluginPortal()
jcenter()
google()
maven { url 'KOTLIN_REPO' }
mavenCentral()
}
dependencies {
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION')
@@ -19,6 +19,5 @@ allprojects {
google()
jcenter()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts
Vendored
+1 -2
View File
@@ -3,7 +3,7 @@ buildscript {
gradlePluginPortal()
jcenter()
google()
maven { url = uri("KOTLIN_REPO") }
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION")
@@ -19,6 +19,5 @@ allprojects {
google()
jcenter()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle
Vendored
-1
View File
@@ -4,7 +4,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts
Vendored
-1
View File
@@ -4,7 +4,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle
Vendored
-1
View File
@@ -11,7 +11,6 @@ repositories {
google()
jcenter()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts
Vendored
-1
View File
@@ -11,7 +11,6 @@ repositories {
google()
jcenter()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle
Vendored
-1
View File
@@ -4,7 +4,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
resolutionStrategy {
eachPlugin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts
Vendored
-1
View File
@@ -4,7 +4,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
resolutionStrategy {
eachPlugin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle
Vendored
-1
View File
@@ -9,7 +9,6 @@ version = '1.0-SNAPSHOT'
repositories {
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts
Vendored
-1
View File
@@ -7,7 +7,6 @@ version = "1.0-SNAPSHOT"
repositories {
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
kotlin {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url = uri("KOTLIN_REPO") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
-2
View File
@@ -53,9 +53,7 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() {
KOTLIN_VERSION_PLACEHOLDER
).replaceAllTo(
listOf(
Repositories.KOTLIN_EAP_BINTRAY.url,
Repositories.KOTLIN_DEV_BINTRAY.url,
KotlinVersionProviderTestWizardService.KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR.url,
KotlinVersionProviderTestWizardService.KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR.url,
),
KOTLIN_REPO_PLACEHOLDER
libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt
+2 -3
View File
@@ -36,15 +36,14 @@ class KotlinVersionProviderTestWizardService() : KotlinVersionProviderService(),
private fun getKotlinVersionRepositoryWithCacheRedirector(versionKind: KotlinVersionKind): Repository = when (versionKind) {
KotlinVersionKind.STABLE -> DefaultRepository.MAVEN_CENTRAL
KotlinVersionKind.EAP -> KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR
KotlinVersionKind.EAP -> DefaultRepository.MAVEN_CENTRAL
KotlinVersionKind.DEV -> KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR
KotlinVersionKind.M -> KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR
KotlinVersionKind.M -> DefaultRepository.MAVEN_CENTRAL
}
companion object {
private const val CACHE_REDIRECTOR_BINTRAY_URL = "https://cache-redirector.jetbrains.com/dl.bintray.com"
val KOTLIN_EAP_BINTRAY_WITH_CACHE_REDIRECTOR = BintrayRepository("kotlin/kotlin-eap", CACHE_REDIRECTOR_BINTRAY_URL)
val KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR = BintrayRepository("kotlin/kotlin-dev", CACHE_REDIRECTOR_BINTRAY_URL)
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/service/KotlinVersionProviderService.kt
+20 -5
View File
@@ -5,6 +5,8 @@
package org.jetbrains.kotlin.tools.projectWizard.core.service
import com.google.gson.JsonObject
import com.google.gson.JsonParser.parseString
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.tools.projectWizard.Versions
import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult
@@ -33,9 +35,7 @@ abstract class KotlinVersionProviderService : WizardService {
)
protected open fun getKotlinVersionRepository(versionKind: KotlinVersionKind): Repository = when (versionKind) {
KotlinVersionKind.STABLE -> DefaultRepository.MAVEN_CENTRAL
KotlinVersionKind.EAP -> Repositories.KOTLIN_EAP_BINTRAY
KotlinVersionKind.M -> Repositories.KOTLIN_EAP_BINTRAY
KotlinVersionKind.STABLE, KotlinVersionKind.EAP, KotlinVersionKind.M -> DefaultRepository.MAVEN_CENTRAL
KotlinVersionKind.DEV -> Repositories.KOTLIN_DEV_BINTRAY
}
@@ -69,13 +69,28 @@ val KotlinVersionKind.isStable
get() = this == KotlinVersionKind.STABLE
object EapVersionDownloader {
fun getLatestEapVersion() = downloadVersions(EAP_URL).firstOrNull()
fun getLatestEapVersion() = downloadVersionFromMavenCentral(EAP_URL).firstOrNull()
fun getLatestDevVersion() = downloadVersions(DEV_URL).firstOrNull()
private fun downloadPage(url: String): TaskResult<String> = safe {
BufferedReader(InputStreamReader(URL(url).openStream())).lines().collect(Collectors.joining("\n"))
}
@Suppress("SameParameterValue")
private fun downloadVersionFromMavenCentral(url: String) = compute {
val (text) = downloadPage(url)
val (versionString) = parseLatestVersionFromJson(text)
if (versionString.isNotEmpty())
listOf(Version.fromString(versionString))
else
emptyList()
}.asNullable.orEmpty()
private fun parseLatestVersionFromJson(text: String) = safe {
val json = parseString(text) as JsonObject
json.get("response").asJsonObject.get("docs").asJsonArray.get(0).asJsonObject.get("latestVersion").asString
}
@Suppress("SameParameterValue")
private fun downloadVersions(url: String): List<Version> = compute {
val (text) = downloadPage(url)
@@ -88,7 +103,7 @@ object EapVersionDownloader {
}.asNullable.orEmpty()
@NonNls
private val EAP_URL = "https://dl.bintray.com/kotlin/kotlin-eap/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/"
private val EAP_URL = "https://search.maven.org/solrsearch/select?q=g:org.jetbrains.kotlin%20AND%20a:kotlin-gradle-plugin"
@NonNls
private val DEV_URL = "https://dl.bintray.com/kotlin/kotlin-dev/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/"
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/kotlin/KotlinPlugin.kt
+1 -2
View File
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.BuildFileIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.RepositoryIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.withIrs
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.ModuleConfigurator
import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.inContextOfModuleConfigurator
import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase
import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemPlugin
@@ -56,7 +55,7 @@ class KotlinPlugin(context: Context) : Plugin(context) {
val version by property(
// todo do not hardcode kind & repository
WizardKotlinVersion(Versions.KOTLIN, KotlinVersionKind.M, Repositories.KOTLIN_EAP_BINTRAY)
WizardKotlinVersion(Versions.KOTLIN, KotlinVersionKind.M, Repositories.KOTLIN_EAP_MAVEN_CENTRAL)
)
val initKotlinVersions by pipelineTask(GenerationPhase.PREPARE_GENERATION) {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt
+1 -1
View File
@@ -48,7 +48,7 @@ object Repositories {
val KTOR_BINTRAY = BintrayRepository("kotlin/ktor")
val KOTLINX = BintrayRepository("kotlin/kotlinx")
val KOTLIN_JS_WRAPPERS_BINTRAY = BintrayRepository("kotlin/kotlin-js-wrappers")
val KOTLIN_EAP_BINTRAY = BintrayRepository("kotlin/kotlin-eap")
val KOTLIN_EAP_MAVEN_CENTRAL = DefaultRepository.MAVEN_CENTRAL
val KOTLIN_DEV_BINTRAY = BintrayRepository("kotlin/kotlin-dev")
val JETBRAINS_COMPOSE_DEV = JetBrainsSpace("compose/dev")
}