1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00

Change/fix indentation of Gradle files

This commit is contained in:
cketti 2014-09-18 15:18:41 +02:00
parent 082dd953b2
commit 4105cdd3cb
6 changed files with 88 additions and 89 deletions

View File

@ -1,12 +1,12 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.12.2' classpath 'com.android.tools.build:gradle:0.12.2'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
} }
} }
apply plugin: 'android-sdk-manager' apply plugin: 'android-sdk-manager'
@ -18,59 +18,58 @@ repositories {
} }
dependencies { dependencies {
compile project(':plugins:Android-PullToRefresh:library') compile project(':plugins:Android-PullToRefresh:library')
compile project(':plugins:ckChangeLog:library') compile project(':plugins:ckChangeLog:library')
compile project(':plugins:HoloColorPicker') compile project(':plugins:HoloColorPicker')
compile project(':plugins:openpgp-api-library') compile project(':plugins:openpgp-api-library')
compile 'com.android.support:support-v13:19.1.0' compile 'com.android.support:support-v13:19.1.0'
compile fileTree(dir: 'libs', include: '*.jar') compile fileTree(dir: 'libs', include: '*.jar')
} }
project.ext.preDexLibs = !project.hasProperty('disablePreDex') project.ext.preDexLibs = !project.hasProperty('disablePreDex')
subprojects { subprojects {
project.plugins.whenPluginAdded { plugin -> project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) || if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) ||
"com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) { "com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
}
} }
}
} }
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '20.0.0' buildToolsVersion '20.0.0'
dexOptions { dexOptions {
preDexLibraries = rootProject.ext.preDexLibs preDexLibraries = rootProject.ext.preDexLibs
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
} }
androidTest { sourceSets {
manifest.srcFile 'tests/AndroidManifest.xml' main {
java.srcDirs = ['tests/src'] manifest.srcFile 'AndroidManifest.xml'
assets.srcDirs = ['tests/assets'] 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 packagingOptions {
lintOptions { exclude 'META-INF/DEPENDENCIES'
abortOnError false exclude 'META-INF/LICENSE'
} exclude 'META-INF/NOTICE'
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
}
} }
check.dependsOn 'checkstyle' check.dependsOn 'checkstyle'
@ -83,7 +82,7 @@ task checkstyle(type: Checkstyle) {
classpath = files() classpath = files()
} }
task testsOnJVM(type :GradleBuild, dependsOn: assemble) { task testsOnJVM(type: GradleBuild, dependsOn: assemble) {
buildFile = 'tests-on-jvm/build.gradle' buildFile = 'tests-on-jvm/build.gradle'
tasks = ['test'] tasks = ['test']
} }

View File

@ -1,21 +1,21 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '20.0.0' buildToolsVersion '20.0.0'
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src'] java.srcDirs = ['src']
res.srcDirs = ['res'] res.srcDirs = ['res']
}
} }
}
// Do not abort build if lint finds errors // Do not abort build if lint finds errors
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
} }
archivesBaseName = 'PullToRefresh' archivesBaseName = 'PullToRefresh'

View File

@ -1,19 +1,19 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '20.0.0' buildToolsVersion '20.0.0'
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src'] java.srcDirs = ['src']
res.srcDirs = ['res'] res.srcDirs = ['res']
}
} }
}
// Do not abort build if lint finds errors // Do not abort build if lint finds errors
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
} }

View File

@ -1,21 +1,21 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '20.0.0' buildToolsVersion '20.0.0'
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src'] java.srcDirs = ['src']
res.srcDirs = ['res'] res.srcDirs = ['res']
}
} }
}
// Do not abort build if lint finds errors // Do not abort build if lint finds errors
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
} }
archivesBaseName = 'ckChangeLog' archivesBaseName = 'ckChangeLog'

View File

@ -1,5 +1,5 @@
repositories { repositories {
mavenCentral() mavenCentral()
} }
apply plugin: 'java' apply plugin: 'java'