From 57eb76948d688706b3de5bf32832027ecd0e5217 Mon Sep 17 00:00:00 2001 From: nikit19 Date: Sun, 14 Oct 2018 14:01:38 +0530 Subject: [PATCH 1/4] chore: add ktlint in Travis --- .travis.yml | 1 + app/build.gradle | 21 +++++++++++++++++++ .../openevent/general/CircleTransform.kt | 1 + .../openevent/general/OpenEventGeneral.kt | 1 + .../general/attendees/AttendeeApi.kt | 1 + .../general/attendees/AttendeeFragment.kt | 4 ++-- .../general/attendees/AttendeeService.kt | 3 +-- .../general/attendees/AttendeeViewHolder.kt | 1 + .../general/attendees/AttendeeViewModel.kt | 1 + .../openevent/general/auth/AuthApi.kt | 1 + .../openevent/general/auth/ProfileFragment.kt | 1 + .../fossasia/openevent/general/di/Modules.kt | 1 + .../general/event/EventDetailsFragment.kt | 1 + .../openevent/general/event/EventService.kt | 6 ++---- .../openevent/general/event/EventUtils.kt | 12 ++++------- .../general/event/EventsRecyclerAdapter.kt | 1 + .../event/topic/SimilarEventsFragment.kt | 1 + .../favorite/FavoriteEventsRecyclerAdapter.kt | 1 + .../general/favorite/FavoriteFragment.kt | 1 + .../general/order/OrderCompletedFragment.kt | 1 + .../general/order/OrderDetailsFragment.kt | 1 + .../general/order/OrdersUnderUserVM.kt | 9 +++----- .../general/search/SearchFragment.kt | 4 ++-- .../general/search/SearchTimeActivity.kt | 1 + .../general/search/SearchViewModel.kt | 3 +-- .../general/settings/SettingsFragment.kt | 1 + .../general/social/SocialLinksService.kt | 3 +-- .../openevent/general/ticket/TicketService.kt | 3 +-- .../general/ticket/TicketsRecyclerAdapter.kt | 1 + .../openevent/general/DependencyTest.kt | 1 + .../openevent/general/event/EventUtilsTest.kt | 1 + 31 files changed, 59 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index c596517d9..3d8c356a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ install: - echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-27" script: - ./gradlew build + - ./gradlew ktlint after_success: - bash scripts/prep-key.sh - bash scripts/update-apk.sh diff --git a/app/build.gradle b/app/build.gradle index 50d367f1c..8e260f1cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,10 @@ repositories { mavenCentral() } +configurations { + ktlint +} + dependencies { def lifecycle_version = "1.1.1" def koin_version = "0.9.3" @@ -119,9 +123,26 @@ dependencies { //QR Code implementation 'com.journeyapps:zxing-android-embedded:3.6.0' + // ktlint + ktlint "com.github.shyiko:ktlint:0.15.0" + testImplementation 'junit:junit:4.12' testImplementation "io.mockk:mockk:1.8.9" testImplementation 'org.threeten:threetenbp:1.3.7' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } + +task ktlint(type: JavaExec, group: "verification") { + description = "Check Kotlin code style." + classpath = configurations.ktlint + main = "com.github.shyiko.ktlint.Main" + args "src/**/*.kt" +} + +task ktlintFormat(type: JavaExec, group: "formatting") { + description = "Fix Kotlin code style deviations." + main = "com.github.shyiko.ktlint.Main" + classpath = configurations.ktlint + args "-F", "src/**/*.kt" +} diff --git a/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt b/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt index 77642da6a..de7fb6738 100644 --- a/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt +++ b/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.graphics.* diff --git a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt index b65e7fa4a..e050cfe2f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt +++ b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.content.Context diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt index 7665f0b84..8d0e96846 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import io.reactivex.Completable diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt index 156eee298..e161a6d75 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.app.AlertDialog @@ -174,8 +175,7 @@ class AttendeeFragment : Fragment() { selectedPaymentOption = paymentOptions[p2] if (selectedPaymentOption == "Stripe") rootView.stripePayment.visibility = View.VISIBLE - else - rootView.stripePayment.visibility = View.GONE + else rootView.stripePayment.visibility = View.GONE } } diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeService.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeService.kt index 5d712cd33..91054be18 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeService.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeService.kt @@ -32,8 +32,7 @@ class AttendeeService( return formsSingle.flatMap { if (it.isNotEmpty()) formsSingle - else - attendeeApi.getCustomFormsForAttendees(id, filter) + else attendeeApi.getCustomFormsForAttendees(id, filter) .map { attendeeDao.insertCustomForms(it) } diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt index 879d16816..2d9139be1 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.support.design.widget.TextInputLayout diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt index 7201781eb..9def6bf42 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.arch.lifecycle.MutableLiveData diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt b/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt index b7936f577..bfc70cb43 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.auth import io.reactivex.Single diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt index e5d8b9517..65c3e3d53 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.auth import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt index b8ab27f74..b86ee5390 100644 --- a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt +++ b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.di import android.arch.persistence.room.Room diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index 2b885488f..0a6071cc8 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt index 961ecca6d..a72ddae67 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt @@ -20,8 +20,7 @@ class EventService( return eventsFlowable.switchMap { if (it.isNotEmpty()) eventsFlowable - else - eventApi.getEvents() + else eventApi.getEvents() .map { eventDao.insertEvents(it) eventTopicsDao.insertEventTopics(getEventTopicList(it)) @@ -97,8 +96,7 @@ class EventService( return eventsFlowable.switchMap { if (it.isNotEmpty()) eventsFlowable - else - eventTopicApi.getEventsUnderTopicId(id) + else eventTopicApi.getEventsUnderTopicId(id) .toFlowable() .map { eventDao.insertEvents(it) diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventUtils.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventUtils.kt index 677789c78..0b128b0bc 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventUtils.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventUtils.kt @@ -109,8 +109,7 @@ object EventUtils { try { if (startingDate != endingDate) return "${getFormattedDateShort(startsAt)}, ${getFormattedTime(startsAt)}" - else - return "${getFormattedDateWithoutYear(startsAt)}" + else return "${getFormattedDateWithoutYear(startsAt)}" } catch (e: IllegalArgumentException) { Timber.e(e, "Error formatting time") return "" @@ -123,8 +122,7 @@ object EventUtils { try { if (startingDate != endingDate) return "- ${getFormattedDateShort(endsAt)}, ${getFormattedTime(endsAt)} ${getFormattedTimeZone(endsAt)}" - else - return "${getFormattedTime(startsAt)} - ${getFormattedTime(endsAt)} ${getFormattedTimeZone(endsAt)}" + else return "${getFormattedTime(startsAt)} - ${getFormattedTime(endsAt)} ${getFormattedTimeZone(endsAt)}" } catch (e: IllegalArgumentException) { Timber.e(e, "Error formatting time") return "" @@ -137,8 +135,7 @@ object EventUtils { try { if (startingDate != endingDate) return "$startingDate at ${getFormattedTime(startsAt)} - $endingDate at ${getFormattedTime(endsAt)} (${getFormattedTimeZone(endsAt)})" - else - return "$startingDate from ${getFormattedTime(startsAt)} to ${getFormattedTime(endsAt)} (${getFormattedTimeZone(endsAt)})" + else return "$startingDate from ${getFormattedTime(startsAt)} to ${getFormattedTime(endsAt)} (${getFormattedTimeZone(endsAt)})" } catch (e: IllegalArgumentException) { Timber.e(e, "Error formatting time") return "" @@ -151,8 +148,7 @@ object EventUtils { try { if (startingDate != endingDate) return "$startingDate - $endingDate • ${getFormattedTime(startsAt)} ${getFormattedTimeZone(startsAt)}" - else - return "$startingDate • ${getFormattedTime(startsAt)} ${getFormattedTimeZone(startsAt)}" + else return "$startingDate • ${getFormattedTime(startsAt)} ${getFormattedTimeZone(startsAt)}" } catch (e: IllegalArgumentException) { Timber.e(e, "Error formatting time") return "" diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt index deda73fec..7112c05cb 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import android.support.v7.widget.RecyclerView diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt index bf1ef55e2..1e0fa72bd 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event.topic import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt index fc6f3e076..4d49c97b3 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.favorite import android.support.v7.widget.RecyclerView diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt index 6c92d9aff..49a7c7020 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.favorite import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt index 2e32c6593..aabfaa337 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.order import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt index 7957f50d0..d8f229b6c 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.order import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt index ca7aefa8c..c2f713b72 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserVM.kt @@ -45,8 +45,7 @@ class OrdersUnderUserVM( if (idList.size != 0) eventsUnderUser(query) - else - progress.value = false + else progress.value = false }, { message.value = "Failed to list Orders under a user" Timber.d(it, "Failed to list Orders under a user ") @@ -103,13 +102,11 @@ class OrdersUnderUserVM( val formattedSubQuery = if (subQuery != "") subQuery.substring(1) // remove "," from the beginning - else - "" // if there are no orders + else "" // if there are no orders return if (idList.size == 1) "[{\"name\":\"id\",\"op\":\"eq\",\"val\":\"$eventId\"}]" - else - "[{\"or\":[$formattedSubQuery]}]" + else "[{\"or\":[$formattedSubQuery]}]" } override fun onCleared() { diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt index f791982c2..734068702 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.search import android.arch.lifecycle.Observer @@ -130,8 +131,7 @@ class SearchFragment : Fragment() { rootView.fabSearch.visibility = View.GONE if (searchViewModel.savedLocation != null && TextUtils.isEmpty(rootView.locationTextView.text.toString()) && rootView.timeTextView.text == "Anytime") searchViewModel.loadEvents(searchViewModel.savedLocation.nullToEmpty(), searchViewModel.savedDate.nullToEmpty()) - else - searchViewModel.loadEvents(rootView.locationTextView.text.toString().nullToEmpty(), rootView.timeTextView.text.toString().nullToEmpty()) + else searchViewModel.loadEvents(rootView.locationTextView.text.toString().nullToEmpty(), rootView.timeTextView.text.toString().nullToEmpty()) loadEventsAgain = true return false } diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt index cf575ea77..936c1388d 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.search import android.app.DatePickerDialog diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt index 6b806d73b..9cb2ca02e 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchViewModel.kt @@ -32,8 +32,7 @@ class SearchViewModel(private val eventService: EventService, private val prefer "[{\"name\":\"name\",\"op\":\"ilike\",\"val\":\"%$searchEvent%\"}]" else if (time == "Anytime") "[{\"and\":[{\"name\":\"location-name\",\"op\":\"ilike\",\"val\":\"%$location%\"},{\"name\":\"name\",\"op\":\"ilike\",\"val\":\"%$searchEvent%\"}]}]" - else - "[{\"and\":[{\"name\":\"location-name\",\"op\":\"ilike\",\"val\":\"%$location%\"},{\"name\":\"name\",\"op\":\"ilike\",\"val\":\"%$searchEvent%\"},{\"name\":\"starts-at\",\"op\":\"ge\",\"val\":\"$savedDate%\"},{\"name\":\"starts-at\",\"op\":\"lt\",\"val\":\"$savedNextDate%\"}]}]" + else "[{\"and\":[{\"name\":\"location-name\",\"op\":\"ilike\",\"val\":\"%$location%\"},{\"name\":\"name\",\"op\":\"ilike\",\"val\":\"%$searchEvent%\"},{\"name\":\"starts-at\",\"op\":\"ge\",\"val\":\"$savedDate%\"},{\"name\":\"starts-at\",\"op\":\"lt\",\"val\":\"$savedNextDate%\"}]}]" compositeDisposable.add(eventService.getSearchEvents(query) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt index e8b45e686..76aa49295 100644 --- a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.settings import android.app.AlertDialog diff --git a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksService.kt b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksService.kt index 8b7819ed2..753026894 100644 --- a/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksService.kt +++ b/app/src/main/java/org/fossasia/openevent/general/social/SocialLinksService.kt @@ -13,8 +13,7 @@ class SocialLinksService( return socialFlowable.switchMap { if (it.isNotEmpty()) socialFlowable - else - socialLinkApi.getSocialLinks(id) + else socialLinkApi.getSocialLinks(id) .map { socialLinksDao.insertSocialLinks(it) } diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketService.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketService.kt index e4e1e8227..bb197b548 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketService.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketService.kt @@ -10,8 +10,7 @@ class TicketService(private val ticketApi: TicketApi, private val ticketDao: Tic return ticketFlowable.switchMap { if (it.isNotEmpty()) ticketFlowable - else - ticketApi.getTickets(id) + else ticketApi.getTickets(id) .map { ticketDao.insertTickets(it) } diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt index e2ac3a82f..394af2c85 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.ticket import android.support.v7.widget.RecyclerView diff --git a/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt b/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt index 02def1b27..04ab61427 100644 --- a/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt +++ b/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.app.Application diff --git a/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt b/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt index 603bb9f00..20fb152f5 100644 --- a/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt +++ b/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt @@ -1,3 +1,4 @@ +/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import io.mockk.MockKAnnotations From c95a1d2c988c8fd54891a03d3f8bec90bff8c18e Mon Sep 17 00:00:00 2001 From: nikit19 Date: Sun, 14 Oct 2018 22:51:33 +0530 Subject: [PATCH 2/4] remove wildcard comment --- .../main/java/org/fossasia/openevent/general/CircleTransform.kt | 1 - .../main/java/org/fossasia/openevent/general/OpenEventGeneral.kt | 1 - .../java/org/fossasia/openevent/general/attendees/AttendeeApi.kt | 1 - .../org/fossasia/openevent/general/attendees/AttendeeFragment.kt | 1 - .../fossasia/openevent/general/attendees/AttendeeViewHolder.kt | 1 - .../fossasia/openevent/general/attendees/AttendeeViewModel.kt | 1 - app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt | 1 - .../java/org/fossasia/openevent/general/auth/ProfileFragment.kt | 1 - app/src/main/java/org/fossasia/openevent/general/di/Modules.kt | 1 - .../org/fossasia/openevent/general/event/EventDetailsFragment.kt | 1 - .../fossasia/openevent/general/event/EventsRecyclerAdapter.kt | 1 - .../openevent/general/event/topic/SimilarEventsFragment.kt | 1 - .../openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt | 1 - .../org/fossasia/openevent/general/favorite/FavoriteFragment.kt | 1 - .../fossasia/openevent/general/order/OrderCompletedFragment.kt | 1 - .../org/fossasia/openevent/general/order/OrderDetailsFragment.kt | 1 - .../java/org/fossasia/openevent/general/search/SearchFragment.kt | 1 - .../org/fossasia/openevent/general/search/SearchTimeActivity.kt | 1 - .../org/fossasia/openevent/general/settings/SettingsFragment.kt | 1 - .../fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt | 1 - .../test/java/org/fossasia/openevent/general/DependencyTest.kt | 1 - .../java/org/fossasia/openevent/general/event/EventUtilsTest.kt | 1 - 22 files changed, 22 deletions(-) diff --git a/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt b/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt index de7fb6738..77642da6a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt +++ b/app/src/main/java/org/fossasia/openevent/general/CircleTransform.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.graphics.* diff --git a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt index e050cfe2f..b65e7fa4a 100644 --- a/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt +++ b/app/src/main/java/org/fossasia/openevent/general/OpenEventGeneral.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.content.Context diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt index 8d0e96846..7665f0b84 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeApi.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import io.reactivex.Completable diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt index e161a6d75..82367f864 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.app.AlertDialog diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt index 2d9139be1..879d16816 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewHolder.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.support.design.widget.TextInputLayout diff --git a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt index 9def6bf42..7201781eb 100644 --- a/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt +++ b/app/src/main/java/org/fossasia/openevent/general/attendees/AttendeeViewModel.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.attendees import android.arch.lifecycle.MutableLiveData diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt b/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt index bfc70cb43..b7936f577 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.auth import io.reactivex.Single diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt index 65c3e3d53..e5d8b9517 100644 --- a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.auth import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt index b86ee5390..b8ab27f74 100644 --- a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt +++ b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.di import android.arch.persistence.room.Room diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt index 0a6071cc8..2b885488f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt index 7112c05cb..deda73fec 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsRecyclerAdapter.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import android.support.v7.widget.RecyclerView diff --git a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt index 1e0fa72bd..bf1ef55e2 100644 --- a/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/event/topic/SimilarEventsFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event.topic import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt index 4d49c97b3..fc6f3e076 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteEventsRecyclerAdapter.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.favorite import android.support.v7.widget.RecyclerView diff --git a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt index 49a7c7020..6c92d9aff 100644 --- a/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/favorite/FavoriteFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.favorite import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt index aabfaa337..2e32c6593 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderCompletedFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.order import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt index d8f229b6c..7957f50d0 100644 --- a/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/order/OrderDetailsFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.order import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt index 734068702..4f9b9e52f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.search import android.arch.lifecycle.Observer diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt index 936c1388d..cf575ea77 100644 --- a/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt +++ b/app/src/main/java/org/fossasia/openevent/general/search/SearchTimeActivity.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.search import android.app.DatePickerDialog diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt index 76aa49295..e8b45e686 100644 --- a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt +++ b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.settings import android.app.AlertDialog diff --git a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt index 394af2c85..e2ac3a82f 100644 --- a/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt +++ b/app/src/main/java/org/fossasia/openevent/general/ticket/TicketsRecyclerAdapter.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.ticket import android.support.v7.widget.RecyclerView diff --git a/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt b/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt index 04ab61427..02def1b27 100644 --- a/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt +++ b/app/src/test/java/org/fossasia/openevent/general/DependencyTest.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general import android.app.Application diff --git a/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt b/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt index 20fb152f5..603bb9f00 100644 --- a/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt +++ b/app/src/test/java/org/fossasia/openevent/general/event/EventUtilsTest.kt @@ -1,4 +1,3 @@ -/* ktlint-disable no-wildcard-imports */ package org.fossasia.openevent.general.event import io.mockk.MockKAnnotations From 455baab60ee0c3bec31d994476b59d40055a2116 Mon Sep 17 00:00:00 2001 From: nikit19 Date: Mon, 15 Oct 2018 00:23:54 +0530 Subject: [PATCH 3/4] update --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8e260f1cf..6412be7d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -137,12 +137,12 @@ task ktlint(type: JavaExec, group: "verification") { description = "Check Kotlin code style." classpath = configurations.ktlint main = "com.github.shyiko.ktlint.Main" - args "src/**/*.kt" + args "--androidsrc/**/*.kt" } task ktlintFormat(type: JavaExec, group: "formatting") { description = "Fix Kotlin code style deviations." main = "com.github.shyiko.ktlint.Main" classpath = configurations.ktlint - args "-F", "src/**/*.kt" + args "-F", "--androidsrc/**/*.kt" } From c113f099e2247fa01d7ab71c2968a6b8ebbcf9c6 Mon Sep 17 00:00:00 2001 From: nikit19 Date: Mon, 15 Oct 2018 19:52:36 +0530 Subject: [PATCH 4/4] minor changes --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6412be7d9..7692c22b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -137,12 +137,12 @@ task ktlint(type: JavaExec, group: "verification") { description = "Check Kotlin code style." classpath = configurations.ktlint main = "com.github.shyiko.ktlint.Main" - args "--androidsrc/**/*.kt" + args "--android src/**/*.kt" } task ktlintFormat(type: JavaExec, group: "formatting") { description = "Fix Kotlin code style deviations." main = "com.github.shyiko.ktlint.Main" classpath = configurations.ktlint - args "-F", "--androidsrc/**/*.kt" + args "-F", "--android src/**/*.kt" }