diff --git a/compiler/testData/codegen/boxInline/builders/builders.kt b/compiler/testData/codegen/boxInline/builders/builders.kt index 176ad7296ee..aa1ca501dd2 100644 --- a/compiler/testData/codegen/boxInline/builders/builders.kt +++ b/compiler/testData/codegen/boxInline/builders/builders.kt @@ -130,14 +130,14 @@ fun testAllInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -170,14 +170,14 @@ fun testHtmlNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -210,14 +210,14 @@ fun testBodyNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -250,14 +250,14 @@ fun testBodyHtmlNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } diff --git a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.kt index 91645a3861f..7a2f2eefe27 100644 --- a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.kt +++ b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.kt @@ -130,14 +130,14 @@ inline fun testAllInline(f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -170,14 +170,14 @@ inline fun testHtmlNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -210,14 +210,14 @@ inline fun testBodyNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -250,14 +250,14 @@ inline fun testBodyHtmlNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } diff --git a/compiler/testData/diagnostics/tests/Builders.kt b/compiler/testData/diagnostics/tests/Builders.kt index d60d1ebe417..8654d188ff5 100644 --- a/compiler/testData/diagnostics/tests/Builders.kt +++ b/compiler/testData/diagnostics/tests/Builders.kt @@ -24,14 +24,14 @@ fun main(args : Array) { p {+"this format can be used as an alternative markup to XML"} // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") {+"Kotlin"} + a(href = "https://jetbrains.com/kotlin") {+"Kotlin"} // mixed content p { +"This is some" b {+"mixed"} +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") {+"Kotlin"} + a(href = "https://jetbrains.com/kotlin") {+"Kotlin"} +"project" } p {+"some text"} diff --git a/compiler/testData/psi/kdoc/HttpLink.kt b/compiler/testData/psi/kdoc/HttpLink.kt index eb010709f70..a8600b5fa6b 100644 --- a/compiler/testData/psi/kdoc/HttpLink.kt +++ b/compiler/testData/psi/kdoc/HttpLink.kt @@ -1,4 +1,4 @@ /** - * [Kotlin](http://kotlinlang.org) is made by [JetBrains][1] - * [1]: http://www.jetbrains.com/ + * [Kotlin](https://kotlinlang.org) is made by [JetBrains][1] + * [1]: https://www.jetbrains.com/ */ diff --git a/compiler/testData/psi/kdoc/HttpLink.txt b/compiler/testData/psi/kdoc/HttpLink.txt index 85cb05b8f28..8431fbc5282 100644 --- a/compiler/testData/psi/kdoc/HttpLink.txt +++ b/compiler/testData/psi/kdoc/HttpLink.txt @@ -9,10 +9,10 @@ KtFile: HttpLink.kt KDOC_SECTION PsiElement(KDOC_LEADING_ASTERISK)('*') PsiElement(KDOC_TEXT)(' ') - PsiElement(KDOC_MARKDOWN_INLINE_LINK)('[Kotlin](http://kotlinlang.org)') + PsiElement(KDOC_MARKDOWN_INLINE_LINK)('[Kotlin](https://kotlinlang.org)') PsiElement(KDOC_TEXT)(' is made by [JetBrains][1]') PsiWhiteSpace('\n ') PsiElement(KDOC_LEADING_ASTERISK)('*') - PsiElement(KDOC_TEXT)(' [1]: http://www.jetbrains.com/') + PsiElement(KDOC_TEXT)(' [1]: https://www.jetbrains.com/') PsiWhiteSpace('\n ') PsiElement(KDOC_END)('*/') diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java index 9604dbd2ec6..2b1009ce461 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java @@ -216,8 +216,8 @@ public abstract class AbstractModelBuilderTest { public static class DistributionLocator { private static final String RELEASE_REPOSITORY_ENV = "GRADLE_RELEASE_REPOSITORY"; private static final String SNAPSHOT_REPOSITORY_ENV = "GRADLE_SNAPSHOT_REPOSITORY"; - private static final String GRADLE_RELEASE_REPO = "http://services.gradle.org/distributions"; - private static final String GRADLE_SNAPSHOT_REPO = "http://services.gradle.org/distributions-snapshots"; + private static final String GRADLE_RELEASE_REPO = "https://services.gradle.org/distributions"; + private static final String GRADLE_SNAPSHOT_REPO = "https://services.gradle.org/distributions-snapshots"; @NotNull private final String myReleaseRepoUrl; @NotNull private final String mySnapshotRepoUrl; diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.191 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.191 index 641574ac303..9de99bdc507 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.191 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.191 @@ -217,8 +217,8 @@ public abstract class AbstractModelBuilderTest { public static class DistributionLocator { private static final String RELEASE_REPOSITORY_ENV = "GRADLE_RELEASE_REPOSITORY"; private static final String SNAPSHOT_REPOSITORY_ENV = "GRADLE_SNAPSHOT_REPOSITORY"; - private static final String GRADLE_RELEASE_REPO = "http://services.gradle.org/distributions"; - private static final String GRADLE_SNAPSHOT_REPO = "http://services.gradle.org/distributions-snapshots"; + private static final String GRADLE_RELEASE_REPO = "https://services.gradle.org/distributions"; + private static final String GRADLE_SNAPSHOT_REPO = "https://services.gradle.org/distributions-snapshots"; @NotNull private final String myReleaseRepoUrl; @NotNull private final String mySnapshotRepoUrl; diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt index 8712a99029a..f9d524a4bfd 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt @@ -101,7 +101,7 @@ class GradleFacetImportTest : GradleImportingTestCase() { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -224,7 +224,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -237,7 +237,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -304,7 +304,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -393,7 +393,7 @@ compileTestKotlin { buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -405,7 +405,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } sourceSets { @@ -485,7 +485,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -526,7 +526,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -560,7 +560,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -658,7 +658,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -720,7 +720,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -816,7 +816,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -850,7 +850,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -951,7 +951,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1063,7 +1063,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1108,7 +1108,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1153,7 +1153,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1319,8 +1319,8 @@ compileTestKotlin { ) createProjectSubFile( "android-module/src/main/AndroidManifest.xml", """ - """ @@ -1334,7 +1334,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -1479,8 +1479,8 @@ compileTestKotlin { ) createProjectSubFile( "src/main/AndroidManifest.xml", """ - """ @@ -1568,7 +1568,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1607,7 +1607,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1650,7 +1650,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1696,7 +1696,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1709,7 +1709,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1733,7 +1733,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1746,7 +1746,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1764,7 +1764,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1777,7 +1777,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1806,7 +1806,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1832,7 +1832,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1856,7 +1856,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1882,7 +1882,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1900,7 +1900,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1926,7 +1926,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1954,7 +1954,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1998,7 +1998,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -2035,7 +2035,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -2049,7 +2049,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -2244,7 +2244,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -2258,7 +2258,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.181 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.181 index 86b47899829..28b1d55b148 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.181 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.181 @@ -101,7 +101,7 @@ class GradleFacetImportTest : GradleImportingTestCase() { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -224,7 +224,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -237,7 +237,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -304,7 +304,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -393,7 +393,7 @@ compileTestKotlin { buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -405,7 +405,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } sourceSets { @@ -485,7 +485,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -526,7 +526,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -560,7 +560,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -658,7 +658,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -720,7 +720,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -816,7 +816,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -850,7 +850,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -953,7 +953,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1065,7 +1065,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1110,7 +1110,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1155,7 +1155,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1321,8 +1321,8 @@ compileTestKotlin { ) createProjectSubFile( "android-module/src/main/AndroidManifest.xml", """ - """ @@ -1336,7 +1336,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -1481,8 +1481,8 @@ compileTestKotlin { ) createProjectSubFile( "src/main/AndroidManifest.xml", """ - """ @@ -1570,7 +1570,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1609,7 +1609,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1652,7 +1652,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1700,7 +1700,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1713,7 +1713,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1737,7 +1737,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1750,7 +1750,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1768,7 +1768,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1781,7 +1781,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1812,7 +1812,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1838,7 +1838,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1862,7 +1862,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1888,7 +1888,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1906,7 +1906,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1932,7 +1932,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1960,7 +1960,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -2004,7 +2004,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -2043,7 +2043,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -2057,7 +2057,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -2252,7 +2252,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -2266,7 +2266,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 index 448bba66b54..8a1b1746a5a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 @@ -71,7 +71,7 @@ class GradleFacetImportTest : GradleImportingTestCase() { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -182,7 +182,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -195,7 +195,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -251,7 +251,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -328,7 +328,7 @@ compileTestKotlin { buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -340,7 +340,7 @@ compileTestKotlin { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } sourceSets { @@ -408,7 +408,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -449,7 +449,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -483,7 +483,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -568,7 +568,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -617,7 +617,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -700,7 +700,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -734,7 +734,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -809,7 +809,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -899,7 +899,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -931,7 +931,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -963,7 +963,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1129,8 +1129,8 @@ compileTestKotlin { ) createProjectSubFile( "android-module/src/main/AndroidManifest.xml", """ - """ @@ -1144,7 +1144,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -1285,8 +1285,8 @@ compileTestKotlin { ) createProjectSubFile( "src/main/AndroidManifest.xml", """ - """ @@ -1373,7 +1373,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1412,7 +1412,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1455,7 +1455,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1501,7 +1501,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1514,7 +1514,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1538,7 +1538,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1551,7 +1551,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1569,7 +1569,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1582,7 +1582,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1612,7 +1612,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1638,7 +1638,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1662,7 +1662,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1688,7 +1688,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1706,7 +1706,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } dependencies { @@ -1732,7 +1732,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1761,7 +1761,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1805,7 +1805,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } @@ -1842,7 +1842,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -1856,7 +1856,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.2' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.2' } } @@ -1982,7 +1982,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } @@ -1996,7 +1996,7 @@ compileTestKotlin { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-dev' + url 'https://dl.bintray.com/kotlin/kotlin-dev' } } diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt index e0d6252414f..980416e4c0a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt @@ -174,7 +174,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() { allprojects { repositories { maven { - url 'http://maven.labs.intellij.net/repo1' + url 'https://maven.labs.intellij.net/repo1' } } } diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java index e8371b514e1..7516353e334 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java @@ -58,7 +58,7 @@ public abstract class MavenTestCase extends UsefulTestCase { private static final String mavenMirrorUrl = System.getProperty("idea.maven.test.mirror", // use JB maven proxy server for internal use by default, see details at // https://confluence.jetbrains.com/display/JBINT/Maven+proxy+server - "http://maven.labs.intellij.net/repo1"); + "https://maven.labs.intellij.net/repo1"); private static boolean mirrorDiscoverable = false; static { diff --git a/idea/testData/checker/Builders.kt b/idea/testData/checker/Builders.kt index 85c29075c93..c801ab91980 100644 --- a/idea/testData/checker/Builders.kt +++ b/idea/testData/checker/Builders.kt @@ -96,14 +96,14 @@ fun result(args : Array) = p {+"this format can be used as an alternative markup to XML"} // an element with attributes and text content - a(href = "http://groovy.codehaus.org") {+"Groovy"} + a(href = "https://groovy.codehaus.org") {+"Groovy"} // mixed content p { +"This is some" b {+"mixed"} +"text. For more see the" - a(href = "http://groovy.codehaus.org") {+"Groovy"} + a(href = "https://groovy.codehaus.org") {+"Groovy"} +"project" } p {+"some text"} diff --git a/idea/testData/editor/quickDoc/Lateinit.kt b/idea/testData/editor/quickDoc/Lateinit.kt index 85abad875ed..08ccf735cc3 100644 --- a/idea/testData/editor/quickDoc/Lateinit.kt +++ b/idea/testData/editor/quickDoc/Lateinit.kt @@ -2,4 +2,4 @@ class Foo { lateinit var foo: String } -//INFO: lateinit allows initializing a non-null property outside of a constructor \ No newline at end of file +//INFO: lateinit allows initializing a non-null property outside of a constructor \ No newline at end of file diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt index d49a8b1512b..5446ec0a8fc 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt @@ -1,8 +1,8 @@ /** * Some documentation. **Bold** *underline* `code` foo: bar (baz) [quux] 'apos' * - * [Kotlin](http://www.kotlinlang.org) - * [a**b**__d__ kas ](http://www.ibm.com) + * [Kotlin](https://www.kotlinlang.org) + * [a**b**__d__ kas ](https://www.ibm.com) * * [C] * @@ -28,7 +28,7 @@ fun test() { } //INFO:
OnMethodUsageWithMarkdown.kt
public fun testMethod(): Unit

Some documentation. Bold underline code foo: bar (baz) quux 'apos'

-//INFO:

Kotlin abd kas

+//INFO:

Kotlin abd kas

//INFO:

C

//INFO:

See this class

//INFO:

This is emphasized text but text_with_underscores has to preserve the underscores. Single stars embedded in a word like Embedded*Star have to be preserved as well.

diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt index 543ffa7a097..d31c54a102d 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt @@ -1,7 +1,7 @@ /** * @see C * @see D - * @see kotlin + * @see kotlin */ fun testMethod() { @@ -17,4 +17,4 @@ fun test() { testMethod(1, "value") } -//INFO:
OnMethodUsageWithSee.kt
public fun testMethod(): Unit

See Also:

C, D, kotlin
+//INFO:
OnMethodUsageWithSee.kt
public fun testMethod(): Unit

See Also:

C, D, kotlin
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181 b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181 index c0489661507..31ff932dcb5 100644 --- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181 +++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt.181 @@ -1,7 +1,7 @@ /** * @see C * @see D - * @see kotlin + * @see kotlin */ fun testMethod() { @@ -17,4 +17,4 @@ fun test() { testMethod(1, "value") } -//INFO:
OnMethodUsageWithSee.kt
public fun testMethod(): Unit

See Also:

C, D, kotlin
+//INFO:
OnMethodUsageWithSee.kt
public fun testMethod(): Unit

See Also:

C, D, kotlin
diff --git a/idea/testData/editor/quickDoc/Tailrec.kt b/idea/testData/editor/quickDoc/Tailrec.kt index c91f9f95f7f..df930f85075 100644 --- a/idea/testData/editor/quickDoc/Tailrec.kt +++ b/idea/testData/editor/quickDoc/Tailrec.kt @@ -2,4 +2,4 @@ foo() } -//INFO: tailrec marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) \ No newline at end of file +//INFO: tailrec marks a function as tail-recursive (allowing the compiler to replace recursion with iteration) \ No newline at end of file diff --git a/idea/testData/gradle/inspections/differentStdlibJdk7GradleVersion/build.gradle b/idea/testData/gradle/inspections/differentStdlibJdk7GradleVersion/build.gradle index d2d55e45e7c..4be7e78f9e4 100644 --- a/idea/testData/gradle/inspections/differentStdlibJdk7GradleVersion/build.gradle +++ b/idea/testData/gradle/inspections/differentStdlibJdk7GradleVersion/build.gradle @@ -7,7 +7,7 @@ buildscript { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } diff --git a/idea/testData/gradle/inspections/differentStdlibJre7GradleVersion/build.gradle b/idea/testData/gradle/inspections/differentStdlibJre7GradleVersion/build.gradle index 49b9fb2bc64..f778a7e178d 100644 --- a/idea/testData/gradle/inspections/differentStdlibJre7GradleVersion/build.gradle +++ b/idea/testData/gradle/inspections/differentStdlibJre7GradleVersion/build.gradle @@ -7,7 +7,7 @@ buildscript { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' + url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1' } } diff --git a/idea/testData/gradle/inspections/noDifferentStdlibCommonGradleVersion/build.gradle b/idea/testData/gradle/inspections/noDifferentStdlibCommonGradleVersion/build.gradle index e0694e9bd49..3ae2d63ef74 100644 --- a/idea/testData/gradle/inspections/noDifferentStdlibCommonGradleVersion/build.gradle +++ b/idea/testData/gradle/inspections/noDifferentStdlibCommonGradleVersion/build.gradle @@ -7,7 +7,7 @@ buildscript { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } diff --git a/idea/testData/gradle/inspections/noDifferentStdlibJdk7GradleVersion/build.gradle b/idea/testData/gradle/inspections/noDifferentStdlibJdk7GradleVersion/build.gradle index bf49d4b43cc..868718510a1 100644 --- a/idea/testData/gradle/inspections/noDifferentStdlibJdk7GradleVersion/build.gradle +++ b/idea/testData/gradle/inspections/noDifferentStdlibJdk7GradleVersion/build.gradle @@ -7,7 +7,7 @@ buildscript { repositories { mavenCentral() maven { - url 'http://dl.bintray.com/kotlin/kotlin-eap' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } diff --git a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle index 2ff50445f49..53372814685 100644 --- a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle +++ b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -35,4 +35,4 @@ project('js') { expectedBy project(':common1') } } - \ No newline at end of file + diff --git a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle index e3f2aed4bff..1cc0a70f3a6 100644 --- a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { @@ -16,5 +16,5 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } diff --git a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle index aade74704b5..034c6d431ea 100644 --- a/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/platformToCommonExpByInComposite/toInclude/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenCentral() - maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { diff --git a/js/js.translator/testData/box/inlineMultiFile/builders.kt b/js/js.translator/testData/box/inlineMultiFile/builders.kt index 3b4c7e05f22..6eca13a2a58 100644 --- a/js/js.translator/testData/box/inlineMultiFile/builders.kt +++ b/js/js.translator/testData/box/inlineMultiFile/builders.kt @@ -23,14 +23,14 @@ fun testAllInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -63,14 +63,14 @@ fun testHtmlNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -103,14 +103,14 @@ fun testBodyNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -143,14 +143,14 @@ fun testBodyHtmlNoInline() : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } diff --git a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt index d9fc57feac6..ae3be3fd4ac 100644 --- a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt +++ b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt @@ -23,14 +23,14 @@ inline fun testAllInline(f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -63,14 +63,14 @@ inline fun testHtmlNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -103,14 +103,14 @@ inline fun testBodyNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } @@ -143,14 +143,14 @@ inline fun testBodyHtmlNoInline(crossinline f: () -> String) : String { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } diff --git a/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt index f64d665ee6d..eaa269cd0f8 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/Creatures.kt @@ -72,7 +72,7 @@ class Logo(override var pos: Vector) : Shape() { fun drawLogo(state: CanvasState) { size = imageSize * (state.size.x / imageSize.x) * relSize // getKotlinLogo() is a 'magic' function here defined only for purposes of demonstration but in fact it just find an element containing the logo - state.context.drawImage(getImage("http://try.kotlinlang.org/static/images/canvas/Kotlin-logo.png"), 0.0, 0.0, + state.context.drawImage(getImage("https://try.kotlinlang.org/static/images/canvas/Kotlin-logo.png"), 0.0, 0.0, imageSize.x, imageSize.y, position.x, position.y, size.x, size.y) diff --git a/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt index e53204c93d1..d19a268bae5 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/Traffic light.kt @@ -29,7 +29,7 @@ val context: CanvasRenderingContext2D } -val PATH_TO_IMAGES = "http://try.kotlinlang.org/static/images/canvas/" +val PATH_TO_IMAGES = "https://try.kotlinlang.org/static/images/canvas/" val state: CanvasState by lazy { CanvasState(canvas) } diff --git a/js/js.translator/testData/webDemoExamples2/builder.kt b/js/js.translator/testData/webDemoExamples2/builder.kt index 77f2fb1e8c3..9dcb694010b 100644 --- a/js/js.translator/testData/webDemoExamples2/builder.kt +++ b/js/js.translator/testData/webDemoExamples2/builder.kt @@ -5,7 +5,7 @@ * In this example we show how to describe an HTML page in Kotlin. * * See this page for details: - * http://confluence.jetbrains.net/display/Kotlin/Type-safe+Groovy-style+builders + * https://confluence.jetbrains.net/display/Kotlin/Type-safe+Groovy-style+builders */ fun main(args: Array) { @@ -19,14 +19,14 @@ fun main(args: Array) { p { +"this format can be used as an alternative markup to XML" } // an element with attributes and text content - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } // mixed content p { +"This is some" b { +"mixed" } +"text. For more see the" - a(href = "http://jetbrains.com/kotlin") { +"Kotlin" } + a(href = "https://jetbrains.com/kotlin") { +"Kotlin" } +"project" } p { +"some text" } diff --git a/js/js.translator/testData/webDemoExamples2/builder.out b/js/js.translator/testData/webDemoExamples2/builder.out index bb5bea9f700..470958d9152 100644 --- a/js/js.translator/testData/webDemoExamples2/builder.out +++ b/js/js.translator/testData/webDemoExamples2/builder.out @@ -11,7 +11,7 @@

this format can be used as an alternative markup to XML

- + Kotlin

@@ -20,7 +20,7 @@ mixed text. For more see the - + Kotlin project diff --git a/js/js.translator/testData/webDemoExamples2/builder1.out b/js/js.translator/testData/webDemoExamples2/builder1.out index d8c05c162c0..e4c1c45486a 100644 --- a/js/js.translator/testData/webDemoExamples2/builder1.out +++ b/js/js.translator/testData/webDemoExamples2/builder1.out @@ -11,7 +11,7 @@

this format can be used as an alternative markup to XML

- + Kotlin

@@ -20,7 +20,7 @@ mixed text. For more see the - + Kotlin project diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle index 24307d629e8..b2d4ddf7da6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle @@ -47,7 +47,7 @@ repositories { mavenLocal() maven { url 'https://maven.google.com' } maven { - url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' + url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } mavenCentral() } @@ -56,4 +56,4 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile 'org.jetbrains.anko:anko-common:0.9' -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts index af9db921fb7..891c13067ec 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts @@ -9,7 +9,7 @@ version = "1.0" repositories { mavenLocal() jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts index bc03e196ba7..72a2c8b1cbe 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts @@ -9,7 +9,7 @@ version = "1.0" repositories { mavenLocal() jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle index 747dd2deb97..a77b4883a01 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle index 8658a0705cd..d41bef549b4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative index d322291e68e..0ef2ee4bd2f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-with-tests/build.gradle.kts.alternative @@ -5,7 +5,7 @@ plugins { repositories { mavenLocal() jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle index 8f685abccc3..d6adaf19e14 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/exported/build.gradle @@ -1,19 +1,19 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform") -} - -repositories { - mavenLocal() - jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } -} - -kotlin { - sourceSets.commonMain { - dependencies { - api("org.jetbrains.kotlin:kotlin-stdlib-common") - } - } - - iosArm64("ios") -} +plugins { + id("org.jetbrains.kotlin.multiplatform") +} + +repositories { + mavenLocal() + jcenter() + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } +} + +kotlin { + sourceSets.commonMain { + dependencies { + api("org.jetbrains.kotlin:kotlin-stdlib-common") + } + } + + iosArm64("ios") +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts index 17b27f9f511..6b864bbc730 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/build.gradle.kts @@ -1,82 +1,82 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform").version("") -} - -repositories { - mavenLocal() - jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } -} - -kotlin { - sourceSets["commonMain"].apply { - dependencies { - api("org.jetbrains.kotlin:kotlin-stdlib-common") - } - } - - sourceSets.create("iosMain").apply { - dependencies { - api(project(":exported")) - } - } - - sourceSets["commonTest"].apply { - dependencies { - api("org.jetbrains.kotlin:kotlin-test-annotations-common") - } - } - - val macos = macosX64("macos64") - val linux = linuxX64("linux64") - val windows = mingwX64("mingw64") - - configure(listOf(macos, linux, windows)) { - - binaries { - - executable() // Executable with default name. - executable("foo") // Custom binary name. - executable("bar", listOf(RELEASE)) // Custom build types. - - // Configure a binary. - executable("baz") { - // Rename an output binary: baz.kexe -> my-baz.kexe. - baseName = "my-baz" - // Use a custom entry point. - entryPoint = "foo.main" - } - - executable("test2") { - compilation = compilations["test"] - } - - sharedLib(listOf(RELEASE)) - staticLib(listOf(RELEASE)) - } - // Check that we can access binaries/tasks: - // Just by name: - println("Check link task: ${binaries["releaseShared"].linkTask.name}") - // Using a typed getter: - println("Check run task: ${binaries.getExecutable("foo", RELEASE).runTask?.name}") - } - - iosArm64("ios") { - binaries { - framework { - export(project(":exported")) - } - framework("custom", listOf(RELEASE)) { - embedBitcode("disable") - linkerOpts = mutableListOf("-L.") - freeCompilerArgs = mutableListOf("-Xtime") - } - } - } - - iosX64("iosSim") { - binaries { - framework() - } - } -} +plugins { + id("org.jetbrains.kotlin.multiplatform").version("") +} + +repositories { + mavenLocal() + jcenter() + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } +} + +kotlin { + sourceSets["commonMain"].apply { + dependencies { + api("org.jetbrains.kotlin:kotlin-stdlib-common") + } + } + + sourceSets.create("iosMain").apply { + dependencies { + api(project(":exported")) + } + } + + sourceSets["commonTest"].apply { + dependencies { + api("org.jetbrains.kotlin:kotlin-test-annotations-common") + } + } + + val macos = macosX64("macos64") + val linux = linuxX64("linux64") + val windows = mingwX64("mingw64") + + configure(listOf(macos, linux, windows)) { + + binaries { + + executable() // Executable with default name. + executable("foo") // Custom binary name. + executable("bar", listOf(RELEASE)) // Custom build types. + + // Configure a binary. + executable("baz") { + // Rename an output binary: baz.kexe -> my-baz.kexe. + baseName = "my-baz" + // Use a custom entry point. + entryPoint = "foo.main" + } + + executable("test2") { + compilation = compilations["test"] + } + + sharedLib(listOf(RELEASE)) + staticLib(listOf(RELEASE)) + } + // Check that we can access binaries/tasks: + // Just by name: + println("Check link task: ${binaries["releaseShared"].linkTask.name}") + // Using a typed getter: + println("Check run task: ${binaries.getExecutable("foo", RELEASE).runTask?.name}") + } + + iosArm64("ios") { + binaries { + framework { + export(project(":exported")) + } + framework("custom", listOf(RELEASE)) { + embedBitcode("disable") + linkerOpts = mutableListOf("-L.") + freeCompilerArgs = mutableListOf("-Xtime") + } + } + } + + iosX64("iosSim") { + binaries { + framework() + } + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts index 26e80c4a28e..a4027a9c3a4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/exported/build.gradle.kts @@ -1,19 +1,19 @@ -plugins { - id("org.jetbrains.kotlin.multiplatform") -} - -repositories { - mavenLocal() - jcenter() - maven { setUrl("http://dl.bintray.com/kotlin/kotlinx.html/") } -} - -kotlin { - sourceSets["commonMain"].apply { - dependencies { - api("org.jetbrains.kotlin:kotlin-stdlib-common") - } - } - - iosArm64("ios") -} +plugins { + id("org.jetbrains.kotlin.multiplatform") +} + +repositories { + mavenLocal() + jcenter() + maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } +} + +kotlin { + sourceSets["commonMain"].apply { + dependencies { + api("org.jetbrains.kotlin:kotlin-stdlib-common") + } + } + + iosArm64("ios") +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/build.gradle index 0775ea9c755..cf1a668654f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } maven { url 'repo' } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/projectLibrary/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/projectLibrary/build.gradle index 4548c08bb63..555d607073c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/projectLibrary/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/projectLibrary/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/publishedLibrary/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/publishedLibrary/build.gradle index 242ee761e90..7c7ee82d32a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/publishedLibrary/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-cinterop/publishedLibrary/build.gradle @@ -7,7 +7,7 @@ version = '1.0' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-libraries/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-libraries/build.gradle index 8f7df251a9f..6159dfa9d3e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-libraries/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-libraries/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { @@ -32,4 +32,4 @@ kotlin { compilations.main.outputKinds += [DYNAMIC, STATIC] } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-tests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-tests/build.gradle index cfc07495670..7ce402184bd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-tests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-tests/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'kotlin-multiplatform' repositories { mavenLocal() jcenter() - maven { url "http://dl.bintray.com/kotlin/kotlinx.html/" } + maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } } kotlin { @@ -25,4 +25,4 @@ kotlin { fromPreset(presets.linuxX64, 'linux64') fromPreset(presets.mingwX64, 'mingw64') } -} \ No newline at end of file +}