diff options
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/.gitignore | 2 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 10 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 8 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle | 19 | ||||
-rw-r--r-- | platform/android/build.gradle | 6 | ||||
-rw-r--r-- | platform/android/gradle/dependencies.gradle (renamed from platform/android/dependencies.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-checkstyle.gradle (renamed from platform/android/MapboxGLAndroidSDK/gradle-checkstyle.gradle) | 2 | ||||
-rw-r--r-- | platform/android/gradle/gradle-config.gradle (renamed from platform/android/MapboxGLAndroidSDKTestApp/gradle-config.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-javadoc.gradle (renamed from platform/android/MapboxGLAndroidSDK/gradle-javadoc.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-lint.gradle (renamed from platform/android/gradle-lint.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-make.gradle (renamed from platform/android/MapboxGLAndroidSDKTestApp/gradle-make.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-publish.gradle (renamed from platform/android/MapboxGLAndroidSDK/gradle-publish.gradle) | 0 | ||||
-rw-r--r-- | platform/android/gradle/gradle-tests-staticblockremover.gradle (renamed from platform/android/MapboxGLAndroidSDK/gradle-tests-staticblockremover.gradle) | 0 |
13 files changed, 15 insertions, 32 deletions
diff --git a/platform/android/.gitignore b/platform/android/.gitignore index 4abd458378..3194c43ca8 100644 --- a/platform/android/.gitignore +++ b/platform/android/.gitignore @@ -16,7 +16,7 @@ MapboxGLAndroidSDK/src/main/assets/ # Local settings local.properties -/configuration.gradle +gradle/configuration.gradle # Token file MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 7fdf5be3f7..707bc80f57 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -149,8 +149,8 @@ configurations { all*.exclude group: 'commons-collections', module: 'commons-collections' } -apply from: 'gradle-javadoc.gradle' -apply from: 'gradle-publish.gradle' -apply from: 'gradle-checkstyle.gradle' -apply from: 'gradle-tests-staticblockremover.gradle' -apply from: '../gradle-lint.gradle' +apply from: "${rootDir}/gradle/gradle-javadoc.gradle" +apply from: "${rootDir}/gradle/gradle-publish.gradle" +apply from: "${rootDir}/gradle/gradle-checkstyle.gradle" +apply from: "${rootDir}/gradle/gradle-tests-staticblockremover.gradle" +apply from: "${rootDir}/gradle/gradle-lint.gradle" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 765b346669..42b0a629e8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -80,9 +80,9 @@ dependencies { androidTestImplementation rootProject.ext.dep.testEspressoIntents } -apply from: 'gradle-make.gradle' -apply from: 'gradle-config.gradle' -apply from: 'gradle-checkstyle.gradle' -apply from: '../gradle-lint.gradle' +apply from: "${rootDir}/gradle/gradle-make.gradle" +apply from: "${rootDir}/gradle/gradle-config.gradle" +apply from: "${rootDir}/gradle/gradle-checkstyle.gradle" +apply from: "${rootDir}/gradle/gradle-lint.gradle" diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle b/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle deleted file mode 100644 index e4e1ba0453..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-checkstyle.gradle +++ /dev/null @@ -1,19 +0,0 @@ -apply plugin: 'checkstyle' - -checkstyle { - toolVersion = "7.1.1" // 7.3 - configFile = "../checkstyle.xml" as File -} - -task checkstyle(type: Checkstyle) { - description 'Checks if the code adheres to coding standards' - group 'verification' - configFile file("../checkstyle.xml") - source 'src' - include '**/*.java' - exclude '**/gen/**' - exclude '**/style/*LayerTest.java' - exclude '**/style/LightTest.java' - classpath = files() - ignoreFailures = false -} diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 28d5363797..88b65e6c80 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -20,8 +20,8 @@ task wrapper(type: Wrapper) { gradleVersion = '3.2.1' } -apply from: rootProject.file('dependencies.gradle') +apply from: "${rootDir}/gradle/dependencies.gradle" // Load build system information. If this file does not exist, run -// `make platform/android/configuration.gradle` -apply from: rootProject.file('configuration.gradle') +// `make platform/android/gradle/configuration.gradle` +apply from: "${rootDir}/gradle/configuration.gradle" diff --git a/platform/android/dependencies.gradle b/platform/android/gradle/dependencies.gradle index a32e18166d..a32e18166d 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle diff --git a/platform/android/MapboxGLAndroidSDK/gradle-checkstyle.gradle b/platform/android/gradle/gradle-checkstyle.gradle index 420ccb473a..41a68f90ce 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle-checkstyle.gradle +++ b/platform/android/gradle/gradle-checkstyle.gradle @@ -12,6 +12,8 @@ task checkstyle(type: Checkstyle) { source 'src' include '**/*.java' exclude '**/gen/**' + exclude '**/style/*LayerTest.java' + exclude '**/style/LightTest.java' exclude '**/style/layers/Property.java' exclude '**/style/layers/PropertyFactory.java' exclude '**/style/layers/*Layer.java' diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-config.gradle b/platform/android/gradle/gradle-config.gradle index 8346806633..8346806633 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-config.gradle +++ b/platform/android/gradle/gradle-config.gradle diff --git a/platform/android/MapboxGLAndroidSDK/gradle-javadoc.gradle b/platform/android/gradle/gradle-javadoc.gradle index 39372b4378..39372b4378 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle-javadoc.gradle +++ b/platform/android/gradle/gradle-javadoc.gradle diff --git a/platform/android/gradle-lint.gradle b/platform/android/gradle/gradle-lint.gradle index cbebeaa74a..cbebeaa74a 100644 --- a/platform/android/gradle-lint.gradle +++ b/platform/android/gradle/gradle-lint.gradle diff --git a/platform/android/MapboxGLAndroidSDKTestApp/gradle-make.gradle b/platform/android/gradle/gradle-make.gradle index 65d971cc96..65d971cc96 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/gradle-make.gradle +++ b/platform/android/gradle/gradle-make.gradle diff --git a/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle b/platform/android/gradle/gradle-publish.gradle index 9805763a99..9805763a99 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle +++ b/platform/android/gradle/gradle-publish.gradle diff --git a/platform/android/MapboxGLAndroidSDK/gradle-tests-staticblockremover.gradle b/platform/android/gradle/gradle-tests-staticblockremover.gradle index 523dc99dd1..523dc99dd1 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle-tests-staticblockremover.gradle +++ b/platform/android/gradle/gradle-tests-staticblockremover.gradle |