diff --git a/.gitattributes b/.gitattributes index 18973d22c60..f0e7ba4de0e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,6 @@ **/testData/** linguist-vendored *Generated.java linguist-generated=true +* text=auto +* eol=lf compiler/cli/bin/* eol=lf compiler/cli/bin/*.bat eol=crlf diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt index 15df5443257..06ef6c3adae 100644 --- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt +++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt @@ -1,17 +1,17 @@ // FIR_IDENTICAL -// !CHECK_TYPE -// FILE: A.java -public enum A { - - ENTRY { - public String s() { - return "s"; - } - }; - public abstract String s(); -} - -// FILE: test.kt -fun main() { - checkSubtype(A.ENTRY.s()) -} +// !CHECK_TYPE +// FILE: A.java +public enum A { + + ENTRY { + public String s() { + return "s"; + } + }; + public abstract String s(); +} + +// FILE: test.kt +fun main() { + checkSubtype(A.ENTRY.s()) +} diff --git a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt index c0b49246c3c..e12816b85f7 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt @@ -1,13 +1,13 @@ -public class A() { - public val FOO: String = "test" - - public class FOO() { } -} - -public class B() { - companion object { - public val FOO: String = "test" - - public class FOO() { } - } -} +public class A() { + public val FOO: String = "test" + + public class FOO() { } +} + +public class B() { + companion object { + public val FOO: String = "test" + + public class FOO() { } + } +} diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt b/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt index c9419f04ff9..0363a94b7bf 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2418.kt @@ -1,27 +1,27 @@ -//KT-2418 Front-end allows enum constants with same name - -package kt2418 - -enum class A { - FOO, - FOO -} - -enum class B { - FOO; - - fun FOO() {} -} - -enum class C { - FOO; - - val FOO = 1 -} - -enum class D { - FOO; - - class FOO {} -} - +//KT-2418 Front-end allows enum constants with same name + +package kt2418 + +enum class A { + FOO, + FOO +} + +enum class B { + FOO; + + fun FOO() {} +} + +enum class C { + FOO; + + val FOO = 1 +} + +enum class D { + FOO; + + class FOO {} +} + diff --git a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF index 6bdb182f242..242cad08dac 100644 --- a/compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF +++ b/compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.9.1 -Created-By: 1.7.0_72-b14 (Oracle Corporation) -Built-By: JetBrains -Implementation-Vendor: JetBrains -Implementation-Version: snapshot -Specification-Title: Kotlin JavaScript Lib - - +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.9.1 +Created-By: 1.7.0_72-b14 (Oracle Corporation) +Built-By: JetBrains +Implementation-Vendor: JetBrains +Implementation-Version: snapshot +Specification-Title: Kotlin JavaScript Lib + + diff --git a/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF b/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF index 5d1ec1e9192..9ed17555cdc 100644 --- a/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF +++ b/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.9.1 -Created-By: 1.7.0_72-b14 (Oracle Corporation) -Built-By: JetBrains -Implementation-Vendor: JetBrains -Implementation-Version: snapshot -Specification-Title: Kotlin JavaScript Lib - +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.9.1 +Created-By: 1.7.0_72-b14 (Oracle Corporation) +Built-By: JetBrains +Implementation-Vendor: JetBrains +Implementation-Version: snapshot +Specification-Title: Kotlin JavaScript Lib + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/RootMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/RootMain.kt index 6910c0e3d0a..9530a2d8a17 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/RootMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/RootMain.kt @@ -1,3 +1,3 @@ -fun main() { - println(".main") -} +fun main() { + println(".main") +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/RootMain.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/RootMain.kt index 6910c0e3d0a..9530a2d8a17 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/RootMain.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/RootMain.kt @@ -1,3 +1,3 @@ -fun main() { - println(".main") -} +fun main() { + println(".main") +} diff --git a/libraries/tools/kotlin-maven-plugin/.gitignore b/libraries/tools/kotlin-maven-plugin/.gitignore index 51803d7b481..b97b22398a9 100644 --- a/libraries/tools/kotlin-maven-plugin/.gitignore +++ b/libraries/tools/kotlin-maven-plugin/.gitignore @@ -1 +1 @@ -local-repo +local-repo diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml index b56798f923d..353ccf4f7eb 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml @@ -1,74 +1,74 @@ - - - - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - jar - - ${groupId} ${artifactId} - - - UTF-8 - ${kotlinVersion} - official - 4.12 - - - - - org.jetbrains.kotlin - kotlin-stdlib-js - ${kotlin.version} - - - - - src/main/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - compile - compile - - js - - - true - ${project.build.outputDirectory}/${project.artifactId}.js - - - - - - - - maven-dependency-plugin - - - extract-kotlinjs - prepare-package - - unpack-dependencies - - - kotlin-stdlib-js - ${build.outputDirectory}/lib - **\/*.js - **\/*.meta.js - - - - - - - - + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + jar + + ${groupId} ${artifactId} + + + UTF-8 + ${kotlinVersion} + official + 4.12 + + + + + org.jetbrains.kotlin + kotlin-stdlib-js + ${kotlin.version} + + + + + src/main/kotlin + + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + + compile + compile + + js + + + true + ${project.build.outputDirectory}/${project.artifactId}.js + + + + + + + + maven-dependency-plugin + + + extract-kotlinjs + prepare-package + + unpack-dependencies + + + kotlin-stdlib-js + ${build.outputDirectory}/lib + **\/*.js + **\/*.meta.js + + + + + + + + diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/src/main/resources/archetype-resources/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/src/main/resources/archetype-resources/pom.xml index 2c89faea1ff..ae68b3ae08e 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/src/main/resources/archetype-resources/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/src/main/resources/archetype-resources/pom.xml @@ -1,69 +1,69 @@ - - - - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - jar - - ${groupId} ${artifactId} - - - UTF-8 - ${kotlinVersion} - official - 4.12 - - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test-junit - ${kotlin.version} - test - - - junit - junit - ${junit.version} - test - - - - - src/main/kotlin - src/test/kotlin - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - - - - + + + + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + jar + + ${groupId} ${artifactId} + + + UTF-8 + ${kotlinVersion} + official + 4.12 + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test-junit + ${kotlin.version} + test + + + junit + junit + ${junit.version} + test + + + + + src/main/kotlin + src/test/kotlin + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + + +