summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2019-07-03 20:14:26 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2019-07-04 12:08:49 +0200
commitdd16eadc382fe853f4b877fbcfd909d103a339f5 (patch)
treeaa1ec40ae3fccc4745434a16a108d9814a8a51ec /Makefile
parent16f1854a9ca98c00a5058c55e8a59df2c3463f4d (diff)
downloadqtlocation-mapboxgl-dd16eadc382fe853f4b877fbcfd909d103a339f5.tar.gz
[android] - add ktlint, optimise code for ktlint validation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index aefd0b0458..2e5e8f623b 100644
--- a/Makefile
+++ b/Makefile
@@ -791,21 +791,26 @@ android-gfxinfo:
test-code-android:
node platform/android/scripts/generate-test-code.js
-# Runs checkstyle and lint on the Android code
+# Runs checkstyle and lint on the java code
.PHONY: android-check
-android-check : android-checkstyle run-android-nitpick android-lint-sdk android-lint-test-app
+android-check : android-checkstyle run-android-nitpick android-lint-sdk android-lint-test-app android-ktlint
-# Runs checkstyle on the Android code
+# Runs checkstyle on the java code
.PHONY: android-checkstyle
android-checkstyle: platform/android/gradle/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:checkstyle :MapboxGLAndroidSDKTestApp:checkstyle
-# Runs lint on the Android SDK code
+# Runs checkstyle on the kotlin code
+.PHONY: android-ktlint
+android-ktlint:
+ cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none ktlint
+
+# Runs lint on the Android SDK java code
.PHONY: android-lint-sdk
android-lint-sdk: platform/android/gradle/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:lint
-# Runs lint on the Android test app code
+# Runs lint on the Android test app java code
.PHONY: android-lint-test-app
android-lint-test-app: platform/android/gradle/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:lint