From fe5badee342e8e3ada345519062f983f8b8045aa Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Tue, 2 May 2017 17:00:00 +0700 Subject: [PATCH] build: Store kotlin-compiler repo URL in a project property --- backend.native/build.gradle | 38 ++++++++++++++------------------ dependencies/build.gradle | 4 +--- gradle.properties | 3 +++ tools/gradle-plugin/build.gradle | 4 +--- tools/helpers/build.gradle | 4 +--- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/backend.native/build.gradle b/backend.native/build.gradle index c26054df90a..863931d926c 100644 --- a/backend.native/build.gradle +++ b/backend.native/build.gradle @@ -1,3 +1,19 @@ +/* + * Copyright 2010-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + buildscript { repositories { mavenCentral() @@ -16,30 +32,10 @@ apply plugin: 'java' apply plugin: 'kotlin' apply plugin: org.jetbrains.kotlin.NativeInteropPlugin - - -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - // (gets applied to this project and all its subprojects) allprojects { repositories { - //maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' } - //maven { url 'http://oss.sonatype.org/content/repositories/snapshots' } - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url kotlinCompilerRepo } } configurations.all { diff --git a/dependencies/build.gradle b/dependencies/build.gradle index 060f9ef56e9..bf3ab0c3542 100644 --- a/dependencies/build.gradle +++ b/dependencies/build.gradle @@ -35,9 +35,7 @@ configurations { // TODO: Check if we really need the our bintray mirror and delete the uploading code below if we don't. repositories { - //maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' } - //maven { url 'http://oss.sonatype.org/content/repositories/snapshots' } - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url kotlinCompilerRepo } } dependencies { diff --git a/gradle.properties b/gradle.properties index 9006d37abf4..1f7490152b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,8 @@ remoteRoot=konan_tests #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345 testDataVersion=1053418:id +#kotlinCompilerRepo=http://dl.bintray.com/jetbrains/kotlin-native-dependencies +#kotlinCompilerRepo=http://oss.sonatype.org/content/repositories/snapshots +kotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1.3-dev-1619 konanVersion=0.1 diff --git a/tools/gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle index 83265ad3632..6b2f4c5d6e8 100644 --- a/tools/gradle-plugin/build.gradle +++ b/tools/gradle-plugin/build.gradle @@ -24,9 +24,7 @@ apply plugin: 'com.jfrog.bintray' // Copied from backend.native allprojects { repositories { - //maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' } - //maven { url 'http://oss.sonatype.org/content/repositories/snapshots' } - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url kotlinCompilerRepo } } configurations.all { diff --git a/tools/helpers/build.gradle b/tools/helpers/build.gradle index 496817226ce..e1eac12ddd1 100644 --- a/tools/helpers/build.gradle +++ b/tools/helpers/build.gradle @@ -33,9 +33,7 @@ buildscript { // Copied from backend.native project. ===== repositories { - //maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' } - //maven { url 'http://oss.sonatype.org/content/repositories/snapshots' } - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url kotlinCompilerRepo } } configurations.all {