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

Always checkout/checkin text files with lf endings

Browse Source 
Different line endings on linux/windows prevents gradle from reusing
build cache since endings make task inputs completely different between
systems
This commit is contained in:
Vyacheslav Gerasimov
2020-02-03 20:08:48 +03:00
parent 7dc24a13e4
commit bcefa68df0
11 changed files with 225 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2
View File
@@ -1,4 +1,6 @@
**/testData/** linguist-vendored **/testData/** linguist-vendored
*Generated.java linguist-generated=true *Generated.java linguist-generated=true
* text=auto
* eol=lf
compiler/cli/bin/* eol=lf compiler/cli/bin/* eol=lf
compiler/cli/bin/*.bat eol=crlf compiler/cli/bin/*.bat eol=crlf
compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt
Vendored
+16 -16
View File
@@ -1,17 +1,17 @@
// FIR_IDENTICAL // FIR_IDENTICAL
// !CHECK_TYPE // !CHECK_TYPE
// FILE: A.java // FILE: A.java
public enum A { public enum A {
ENTRY { ENTRY {
public String s() { public String s() {
return "s"; return "s";
} }
}; };
public abstract String s(); public abstract String s();
} }
// FILE: test.kt // FILE: test.kt
fun main() { fun main() {
checkSubtype<String?>(A.ENTRY.s()) checkSubtype<String?>(A.ENTRY.s())
} }
compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt
Vendored
+13 -13
View File
@@ -1,13 +1,13 @@
public class A() { public class A() {
public val <!REDECLARATION!>FOO<!>: String = "test" public val <!REDECLARATION!>FOO<!>: String = "test"
public class <!REDECLARATION!>FOO<!>() { } public class <!REDECLARATION!>FOO<!>() { }
} }
public class B() { public class B() {
companion object { companion object {
public val <!REDECLARATION!>FOO<!>: String = "test" public val <!REDECLARATION!>FOO<!>: String = "test"
public class <!REDECLARATION!>FOO<!>() { } public class <!REDECLARATION!>FOO<!>() { }
} }
} }
compiler/testData/diagnostics/tests/redeclarations/kt2418.kt
Vendored
+27 -27
View File
@@ -1,27 +1,27 @@
//KT-2418 Front-end allows enum constants with same name //KT-2418 Front-end allows enum constants with same name
package kt2418 package kt2418
enum class A { enum class A {
<!REDECLARATION!>FOO<!>, <!REDECLARATION!>FOO<!>,
<!REDECLARATION!>FOO<!> <!REDECLARATION!>FOO<!>
} }
enum class B { enum class B {
FOO; FOO;
fun FOO() {} fun FOO() {}
} }
enum class C { enum class C {
<!REDECLARATION!>FOO<!>; <!REDECLARATION!>FOO<!>;
val <!REDECLARATION!>FOO<!> = 1 val <!REDECLARATION!>FOO<!> = 1
} }
enum class D { enum class D {
<!REDECLARATION!>FOO<!>; <!REDECLARATION!>FOO<!>;
class <!REDECLARATION!>FOO<!> {} class <!REDECLARATION!>FOO<!> {}
} }
compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/jslib-example/META-INF/MANIFEST.MF
Vendored
+9 -9
View File
@@ -1,9 +1,9 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Ant-Version: Apache Ant 1.9.1 Ant-Version: Apache Ant 1.9.1
Created-By: 1.7.0_72-b14 (Oracle Corporation) Created-By: 1.7.0_72-b14 (Oracle Corporation)
Built-By: JetBrains Built-By: JetBrains
Implementation-Vendor: JetBrains Implementation-Vendor: JetBrains
Implementation-Version: snapshot Implementation-Version: snapshot
Specification-Title: Kotlin JavaScript Lib Specification-Title: Kotlin JavaScript Lib
jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF
Vendored
+8 -8
View File
@@ -1,8 +1,8 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Ant-Version: Apache Ant 1.9.1 Ant-Version: Apache Ant 1.9.1
Created-By: 1.7.0_72-b14 (Oracle Corporation) Created-By: 1.7.0_72-b14 (Oracle Corporation)
Built-By: JetBrains Built-By: JetBrains
Implementation-Vendor: JetBrains Implementation-Vendor: JetBrains
Implementation-Version: snapshot Implementation-Version: snapshot
Specification-Title: Kotlin JavaScript Lib Specification-Title: Kotlin JavaScript Lib
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/groovy-dsl/src/commonMain/kotlin/RootMain.kt
+3 -3
View File
@@ -1,3 +1,3 @@
fun main() { fun main() {
println("<root>.main") println("<root>.main")
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-native-binaries/kotlin-dsl/src/commonMain/kotlin/RootMain.kt
+3 -3
View File
@@ -1,3 +1,3 @@
fun main() { fun main() {
println("<root>.main") println("<root>.main")
} }
libraries/tools/kotlin-maven-plugin/.gitignore
+1 -1
View File
@@ -1 +1 @@
local-repo local-repo
libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/pom.xml
+74 -74
View File
@@ -1,74 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId> <artifactId>${artifactId}</artifactId>
<version>${version}</version> <version>${version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${groupId} ${artifactId}</name> <name>${groupId} ${artifactId}</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>${kotlinVersion}</kotlin.version> <kotlin.version>${kotlinVersion}</kotlin.version>
<kotlin.code.style>official</kotlin.code.style> <kotlin.code.style>official</kotlin.code.style>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-js</artifactId> <artifactId>kotlin-stdlib-js</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src/main/kotlin</sourceDirectory> <sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<executions> <executions>
<execution> <execution>
<id>compile</id> <id>compile</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>js</goal> <goal>js</goal>
</goals> </goals>
<configuration> <configuration>
<sourceMap>true</sourceMap> <!-- source map is useful for debugging in tools that support source maps --> <sourceMap>true</sourceMap> <!-- source map is useful for debugging in tools that support source maps -->
<outputFile>${project.build.outputDirectory}/${project.artifactId}.js</outputFile> <outputFile>${project.build.outputDirectory}/${project.artifactId}.js</outputFile>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- unpack kotlin.js to target/classes/lib for example index.html --> <!-- unpack kotlin.js to target/classes/lib for example index.html -->
<plugin> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>extract-kotlinjs</id> <id>extract-kotlinjs</id>
<phase>prepare-package</phase> <phase>prepare-package</phase>
<goals> <goals>
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeArtifactIds>kotlin-stdlib-js</includeArtifactIds> <includeArtifactIds>kotlin-stdlib-js</includeArtifactIds>
<outputDirectory>${build.outputDirectory}/lib</outputDirectory> <outputDirectory>${build.outputDirectory}/lib</outputDirectory>
<includes>**\/*.js</includes> <includes>**\/*.js</includes>
<excludes>**\/*.meta.js</excludes> <!-- we don't need meta.js files in runtime --> <excludes>**\/*.meta.js</excludes> <!-- we don't need meta.js files in runtime -->
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
libraries/tools/maven-archetypes/kotlin-archetype-jvm/src/main/resources/archetype-resources/pom.xml
+69 -69
View File
@@ -1,69 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId> <artifactId>${artifactId}</artifactId>
<version>${version}</version> <version>${version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>${groupId} ${artifactId}</name> <name>${groupId} ${artifactId}</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.version>${kotlinVersion}</kotlin.version> <kotlin.version>${kotlinVersion}</kotlin.version>
<kotlin.code.style>official</kotlin.code.style> <kotlin.code.style>official</kotlin.code.style>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId> <artifactId>kotlin-test-junit</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src/main/kotlin</sourceDirectory> <sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory> <testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<executions> <executions>
<execution> <execution>
<id>compile</id> <id>compile</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
<phase>test-compile</phase> <phase>test-compile</phase>
<goals> <goals>
<goal>test-compile</goal> <goal>test-compile</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>