Skip to content

Commit

Permalink
Fix indent of .gradle files
Browse files Browse the repository at this point in the history
Summary:
In most .gradle files, lines are indented with 4 spaces, but in some places they are indented with 2 spaces. This PR fixes them and enforce it by adding .editorconfig settings.
Closes facebook#10267

Differential Revision: D4048335

Pulled By: lacker

fbshipit-source-id: df2f2556380f56672cf85690eb1c80e640a6aedf
  • Loading branch information
kt3k authored and Facebook Github Bot committed Oct 19, 2016
1 parent 580b881 commit 7167680
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2

[*.gradle]
indent_size = 4
10 changes: 5 additions & 5 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) {
}

task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
from "$buildDir/react-ndk/exported"
into "src/main/jni/prebuilt/lib"
from "$buildDir/react-ndk/exported"
into "src/main/jni/prebuilt/lib"
}

android {
Expand Down Expand Up @@ -243,9 +243,9 @@ android {
jniLibs.srcDir "$buildDir/react-ndk/exported"
res.srcDirs = ['src/main/res/devsupport', 'src/main/res/shell', 'src/main/res/views/modal']
java {
srcDirs = ['src/main/java', 'src/main/libraries/soloader/java', 'src/main/jni/first-party/fb/jni/java']
exclude 'com/facebook/react/processing'
exclude 'com/facebook/react/module/processing'
srcDirs = ['src/main/java', 'src/main/libraries/soloader/java', 'src/main/jni/first-party/fb/jni/java']
exclude 'com/facebook/react/processing'
exclude 'com/facebook/react/module/processing'
}
}

Expand Down
4 changes: 2 additions & 2 deletions local-cli/generator-android/templates/src/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ dependencies {
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
from configurations.compile
into 'libs'
}

0 comments on commit 7167680

Please sign in to comment.