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

Auto code reformat

Browse Source
This commit is contained in:
Pavel Punegov
2018-12-07 16:02:02 +03:00
committed by Pavel Punegov
parent f5cc8a4d1e
commit 53838e39c8
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+7 -7
View File
@@ -64,7 +64,7 @@ task renamePackage(type: Copy) {
dependsOn('generateCompilerProto') dependsOn('generateCompilerProto')
from 'build/generated/source/proto/compiler/java' from 'build/generated/source/proto/compiler/java'
into 'build/renamed/source/proto/compiler/java' into 'build/renamed/source/proto/compiler/java'
filter {line -> line.replaceAll("com.google.protobuf", "org.jetbrains.kotlin.protobuf")} filter { line -> line.replaceAll("com.google.protobuf", "org.jetbrains.kotlin.protobuf") }
outputs.dir('build/renamed') outputs.dir('build/renamed')
} }
@@ -145,7 +145,7 @@ dependencies {
} }
classes.dependsOn 'compilerClasses','cli_bcClasses','bc_frontendClasses' classes.dependsOn 'compilerClasses', 'cli_bcClasses', 'bc_frontendClasses'
// These are just a couple of aliases // These are just a couple of aliases
@@ -208,11 +208,11 @@ targetList.each { target ->
"-Djava.library.path=${project.buildDir}/nativelibs/$hostName", "-Djava.library.path=${project.buildDir}/nativelibs/$hostName",
"-Dfile.encoding=UTF-8"] "-Dfile.encoding=UTF-8"]
def defaultArgs = ['-nopack', '-nostdlib', '-nodefaultlibs', '-ea' ] def defaultArgs = ['-nopack', '-nostdlib', '-nodefaultlibs', '-ea']
if (target != "wasm32") defaultArgs += '-g' if (target != "wasm32") defaultArgs += '-g'
def konanArgs = [*defaultArgs, def konanArgs = [*defaultArgs,
'-target', target, '-target', target,
"-Xruntime=${project(':runtime').file('build/' + target +'/runtime.bc')}", "-Xruntime=${project(':runtime').file('build/' + target + '/runtime.bc')}",
*project.globalBuildArgs] *project.globalBuildArgs]
task("${target}Stdlib", type: JavaExec) { task("${target}Stdlib", type: JavaExec) {
@@ -255,7 +255,7 @@ targetList.each { target ->
task run { task run {
doLast { doLast {
logger.quiet("Run the outer project 'demo' target to compile the test source." ) logger.quiet("Run the outer project 'demo' target to compile the test source.")
} }
} }
@@ -281,7 +281,7 @@ task trove4jCopy(type: Copy) {
externalJars.each { arg -> externalJars.each { arg ->
def jar = arg.replace('_', '-') // :( def jar = arg.replace('_', '-') // :(
task ("${arg}Copy", type:Copy) { task("${arg}Copy", type: Copy) {
from configurations.getByName("kotlin_${arg}_jar") { from configurations.getByName("kotlin_${arg}_jar") {
include "kotlin-${jar}*.jar" include "kotlin-${jar}*.jar"
rename "kotlin-${jar}(.*).jar", "kotlin-${jar}.jar" rename "kotlin-${jar}(.*).jar", "kotlin-${jar}.jar"
@@ -292,7 +292,7 @@ externalJars.each { arg ->
} }
task external_jars(type: Copy) { task external_jars(type: Copy) {
dependsOn externalJars.collect{"${it}Copy"} dependsOn externalJars.collect { "${it}Copy" }
dependsOn trove4jCopy dependsOn trove4jCopy
from configurations.compilerCompile { from configurations.compilerCompile {