From 4105cdd3cb6222cf34a2afa1486aebb15bdd3d60 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 18 Sep 2014 15:18:41 +0200 Subject: [PATCH] Change/fix indentation of Gradle files --- build.gradle | 95 +++++++++---------- .../library/build.gradle | 26 ++--- plugins/HoloColorPicker/build.gradle | 26 ++--- plugins/ckChangeLog/library/build.gradle | 26 ++--- plugins/openpgp-api-library/build.gradle | 2 +- tests-on-jvm/build.gradle | 2 +- 6 files changed, 88 insertions(+), 89 deletions(-) diff --git a/build.gradle b/build.gradle index 331d3fc76..06bef66a8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - repositories { - mavenCentral() - } + repositories { + mavenCentral() + } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' - classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' - } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' + } } apply plugin: 'android-sdk-manager' @@ -18,59 +18,58 @@ repositories { } dependencies { - compile project(':plugins:Android-PullToRefresh:library') - compile project(':plugins:ckChangeLog:library') - compile project(':plugins:HoloColorPicker') - compile project(':plugins:openpgp-api-library') - compile 'com.android.support:support-v13:19.1.0' - compile fileTree(dir: 'libs', include: '*.jar') + compile project(':plugins:Android-PullToRefresh:library') + compile project(':plugins:ckChangeLog:library') + compile project(':plugins:HoloColorPicker') + compile project(':plugins:openpgp-api-library') + compile 'com.android.support:support-v13:19.1.0' + compile fileTree(dir: 'libs', include: '*.jar') } project.ext.preDexLibs = !project.hasProperty('disablePreDex') subprojects { - project.plugins.whenPluginAdded { plugin -> - if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) || - "com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) { - project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs + project.plugins.whenPluginAdded { plugin -> + if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) || + "com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) { + project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs + } } - } } android { - compileSdkVersion 19 - buildToolsVersion '20.0.0' + compileSdkVersion 19 + buildToolsVersion '20.0.0' - dexOptions { - preDexLibraries = rootProject.ext.preDexLibs - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] + dexOptions { + preDexLibraries = rootProject.ext.preDexLibs } - androidTest { - manifest.srcFile 'tests/AndroidManifest.xml' - java.srcDirs = ['tests/src'] - assets.srcDirs = ['tests/assets'] + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + androidTest { + manifest.srcFile 'tests/AndroidManifest.xml' + java.srcDirs = ['tests/src'] + assets.srcDirs = ['tests/assets'] + } } - } - - // Do not abort build if lint finds errors - lintOptions { - abortOnError false - } + // Do not abort build if lint finds errors + lintOptions { + abortOnError false + } - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' - } + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/NOTICE' + } } check.dependsOn 'checkstyle' @@ -83,7 +82,7 @@ task checkstyle(type: Checkstyle) { classpath = files() } -task testsOnJVM(type :GradleBuild, dependsOn: assemble) { - buildFile = 'tests-on-jvm/build.gradle' - tasks = ['test'] +task testsOnJVM(type: GradleBuild, dependsOn: assemble) { + buildFile = 'tests-on-jvm/build.gradle' + tasks = ['test'] } diff --git a/plugins/Android-PullToRefresh/library/build.gradle b/plugins/Android-PullToRefresh/library/build.gradle index 6d617a45f..e56d030f7 100644 --- a/plugins/Android-PullToRefresh/library/build.gradle +++ b/plugins/Android-PullToRefresh/library/build.gradle @@ -1,21 +1,21 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion '20.0.0' + compileSdkVersion 19 + buildToolsVersion '20.0.0' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false } - } - - // Do not abort build if lint finds errors - lintOptions { - abortOnError false - } } archivesBaseName = 'PullToRefresh' diff --git a/plugins/HoloColorPicker/build.gradle b/plugins/HoloColorPicker/build.gradle index 610b12133..6880741e9 100644 --- a/plugins/HoloColorPicker/build.gradle +++ b/plugins/HoloColorPicker/build.gradle @@ -1,19 +1,19 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion '20.0.0' + compileSdkVersion 19 + buildToolsVersion '20.0.0' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false } - } - - // Do not abort build if lint finds errors - lintOptions { - abortOnError false - } } diff --git a/plugins/ckChangeLog/library/build.gradle b/plugins/ckChangeLog/library/build.gradle index b7eec9000..f03c2e2e6 100644 --- a/plugins/ckChangeLog/library/build.gradle +++ b/plugins/ckChangeLog/library/build.gradle @@ -1,21 +1,21 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion '20.0.0' + compileSdkVersion 19 + buildToolsVersion '20.0.0' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false } - } - - // Do not abort build if lint finds errors - lintOptions { - abortOnError false - } } archivesBaseName = 'ckChangeLog' diff --git a/plugins/openpgp-api-library/build.gradle b/plugins/openpgp-api-library/build.gradle index 1c5461493..91d20ebf6 100644 --- a/plugins/openpgp-api-library/build.gradle +++ b/plugins/openpgp-api-library/build.gradle @@ -27,7 +27,7 @@ android { assets.srcDirs = ['assets'] } } - + // Do not abort build if lint finds errors lintOptions { abortOnError false diff --git a/tests-on-jvm/build.gradle b/tests-on-jvm/build.gradle index 258bad1ab..a713f3694 100644 --- a/tests-on-jvm/build.gradle +++ b/tests-on-jvm/build.gradle @@ -1,5 +1,5 @@ repositories { - mavenCentral() + mavenCentral() } apply plugin: 'java'