From e997683fa65b2be89d7762d14428ab42617dbb07 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Wed, 21 Sep 2022 17:40:35 +0530 Subject: [PATCH 01/13] add: spotless --- build.gradle | 10 ++++++---- spotless.gradle | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 spotless.gradle diff --git a/build.gradle b/build.gradle index 623b3d1bac..a3a373d9db 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,12 @@ buildscript { apply from: 'dependencies.gradle' } +plugins { + id('com.diffplug.spotless') version('6.11.0') +} + +apply from: "$project.rootDir/spotless.gradle" + allprojects { repositories { google() @@ -93,7 +99,3 @@ allprojects { } } } - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/spotless.gradle b/spotless.gradle new file mode 100644 index 0000000000..3e0b928b05 --- /dev/null +++ b/spotless.gradle @@ -0,0 +1,29 @@ +/* + * + * * Copyright © 2022 by Navi Technologies Limited + * * All rights reserved. Strictly confidential + * + */ + +spotless { + // optional: limit format enforcement to just the files changed by this feature branch + ratchetFrom 'origin/development' + + format 'misc', { + // define the files to apply `misc` to + target '**/*.gradle', '**/*.md', '**/.gitignore' + + // define the steps to apply to those files + indentWithSpaces() + trimTrailingWhitespace() + endWithNewline() + } + + kotlin { + target '**/*.kt' + ktlint() + trimTrailingWhitespace() + indentWithSpaces() + endWithNewline() + } +} From 4705cad9cc588eccc145251718868d34a9bb65a6 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 09:56:06 +0530 Subject: [PATCH 02/13] rm: ktlint --- spotless.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spotless.gradle b/spotless.gradle index 3e0b928b05..6da106729a 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -6,22 +6,19 @@ */ spotless { - // optional: limit format enforcement to just the files changed by this feature branch ratchetFrom 'origin/development' format 'misc', { - // define the files to apply `misc` to target '**/*.gradle', '**/*.md', '**/.gitignore' - // define the steps to apply to those files - indentWithSpaces() trimTrailingWhitespace() + indentWithSpaces() endWithNewline() } kotlin { target '**/*.kt' - ktlint() + trimTrailingWhitespace() indentWithSpaces() endWithNewline() From fb28cef58a78c75da48d6d8339f002f4c7520afe Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 10:18:54 +0530 Subject: [PATCH 03/13] add: Android Suggestion CI --- .github/workflows/android_suggestion.yml | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/android_suggestion.yml diff --git a/.github/workflows/android_suggestion.yml b/.github/workflows/android_suggestion.yml new file mode 100644 index 0000000000..7c158dc684 --- /dev/null +++ b/.github/workflows/android_suggestion.yml @@ -0,0 +1,27 @@ +name: Android Suggestion CI + +on: + pull_request: + branches: [ master, release-*, development ] + +jobs: + spotless: + name: Spotless + runs-on: [ self-hosted ] + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - run: ./gradlew spotlessApply + - uses: reviewdog/action-suggester@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + tool_name: spotless \ No newline at end of file From abea5f47cf578deae7047768e13829ab48306450 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 11:00:44 +0530 Subject: [PATCH 04/13] fix: Android Suggestion CI --- .github/workflows/android_suggestion.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_suggestion.yml b/.github/workflows/android_suggestion.yml index 7c158dc684..0d5bf8f2d3 100644 --- a/.github/workflows/android_suggestion.yml +++ b/.github/workflows/android_suggestion.yml @@ -2,15 +2,18 @@ name: Android Suggestion CI on: pull_request: - branches: [ master, release-*, development ] + branches: [ development ] jobs: spotless: - name: Spotless + runs-on: [ self-hosted ] + steps: - name: Checkout uses: actions/checkout@v2 + - name: Fetch origin/development + run: git fetch origin development - name: set up JDK 11 uses: actions/setup-java@v2 with: From 8b4365278819d982e408fbc871f4de0ea564614a Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 11:55:58 +0530 Subject: [PATCH 05/13] add: license + java in spotless --- spotless.gradle | 10 ++++++++++ spotless.license | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 spotless.license diff --git a/spotless.gradle b/spotless.gradle index 6da106729a..5a4fd8d2a9 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -19,6 +19,16 @@ spotless { kotlin { target '**/*.kt' + licenseHeaderFile rootProject.file('spotless.license') + trimTrailingWhitespace() + indentWithSpaces() + endWithNewline() + } + + java { + target '**/*.java' + + licenseHeaderFile rootProject.file('spotless.license') trimTrailingWhitespace() indentWithSpaces() endWithNewline() diff --git a/spotless.license b/spotless.license new file mode 100644 index 0000000000..8b8e32bcbb --- /dev/null +++ b/spotless.license @@ -0,0 +1,7 @@ +/* + * + * * Copyright © $YEAR by Navi Technologies Limited + * * All rights reserved. Strictly confidential + * + */ + From b18b2e0244b27cd26e006011909cd6eb38c3a290 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 12:13:51 +0530 Subject: [PATCH 06/13] add: kt + java formatters --- spotless.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spotless.gradle b/spotless.gradle index 5a4fd8d2a9..171425b7f9 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -23,6 +23,7 @@ spotless { trimTrailingWhitespace() indentWithSpaces() endWithNewline() + ktfmt().kotlinlangStyle() } java { @@ -32,5 +33,7 @@ spotless { trimTrailingWhitespace() indentWithSpaces() endWithNewline() + removeUnusedImports() + googleJavaFormat() } } From 5005636e393ec25ea878e369c16eec82a706d1d7 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 12:22:54 +0530 Subject: [PATCH 07/13] test-commit for spotless apply --- .../com/navi/insurance/health/fragment/EmiScheduleFragment.kt | 1 + .../com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt index ad9dda57ad..f80674134a 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt @@ -22,6 +22,7 @@ import com.navi.insurance.health.interfaces.EmiTimelineClickListener import com.navi.insurance.models.EmiTimelineItem import com.navi.insurance.util.Constants.EMI_TIMELINE_DATA + class EmiScheduleFragment: BaseFragment(), EmiTimelineClickListener { private lateinit var binding: FragmentEmiScheduleBinding diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 888be54ec4..562f9b75e2 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -21,6 +21,7 @@ import com.navi.naviwidgets.extensions.setTextFieldData import com.navi.naviwidgets.models.response.TextFieldData import kotlin.math.roundToInt + class CollapsibleAmountSliderView @JvmOverloads constructor( context: Context?, attrs: AttributeSet? = null From 15f21163aa882b9dcaf4124a5d268a5dfd7c14d9 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 12:58:13 +0530 Subject: [PATCH 08/13] rm: spotless.gradle header --- spotless.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/spotless.gradle b/spotless.gradle index 171425b7f9..f1a4e9d34c 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -1,10 +1,3 @@ -/* - * - * * Copyright © 2022 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - spotless { ratchetFrom 'origin/development' From 3b4df322011f2f2c767a044ce46778c4ab9ab3dc Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 14:50:00 +0530 Subject: [PATCH 09/13] test commit --- .github/workflows/android_suggestion.yml | 2 +- .../navi/naviwidgets/views/CollapsibleAmountSliderView.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android_suggestion.yml b/.github/workflows/android_suggestion.yml index 0d5bf8f2d3..1908826e45 100644 --- a/.github/workflows/android_suggestion.yml +++ b/.github/workflows/android_suggestion.yml @@ -27,4 +27,4 @@ jobs: - uses: reviewdog/action-suggester@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} - tool_name: spotless \ No newline at end of file + tool_name: spotless diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 562f9b75e2..4da461f314 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -22,9 +22,8 @@ import com.navi.naviwidgets.models.response.TextFieldData import kotlin.math.roundToInt -class CollapsibleAmountSliderView @JvmOverloads constructor( - context: Context?, - attrs: AttributeSet? = null +class CollapsibleAmountSliderView @JvmOverloads constructor( + context: Context?, attrs : AttributeSet? = null ) : LinearLayout(context, attrs), SeekBar.OnSeekBarChangeListener { From 313e19ac3751aa8fa5bce6315244ee54d76bbca8 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 14:55:00 +0530 Subject: [PATCH 10/13] test commit --- .../com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 4da461f314..8b94bb8dd4 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -1,3 +1,4 @@ + package com.navi.naviwidgets.views /* * From a6da0d4389c9662f0e9ad337f60114e7d5101810 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 15:00:52 +0530 Subject: [PATCH 11/13] Update navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt Co-authored-by: github-actions[bot] <278+github-actions[bot]@users.noreply.github.cmd.navi-tech.in> --- .../navi/naviwidgets/views/CollapsibleAmountSliderView.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 8b94bb8dd4..658f3026ed 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -1,4 +1,10 @@ +/* + * + * * Copyright © 2022 by Navi Technologies Limited + * * All rights reserved. Strictly confidential + * + */ package com.navi.naviwidgets.views /* * From d43f9074b24e338d8730a6c077be94981370dea5 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 15:03:27 +0530 Subject: [PATCH 12/13] revert commit --- .../health/fragment/EmiScheduleFragment.kt | 15 +++++++-------- .../views/CollapsibleAmountSliderView.kt | 7 +++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt index f80674134a..5df4e64635 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt @@ -22,7 +22,6 @@ import com.navi.insurance.health.interfaces.EmiTimelineClickListener import com.navi.insurance.models.EmiTimelineItem import com.navi.insurance.util.Constants.EMI_TIMELINE_DATA - class EmiScheduleFragment: BaseFragment(), EmiTimelineClickListener { private lateinit var binding: FragmentEmiScheduleBinding @@ -39,15 +38,15 @@ class EmiScheduleFragment: BaseFragment(), EmiTimelineClickListener { } override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? ): View { binding = DataBindingUtil.inflate( - inflater, - R.layout.fragment_emi_schedule, - container, - false + inflater, + R.layout.fragment_emi_schedule, + container, + false ) binding.rvTimeline.adapter = diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt index 8b94bb8dd4..888be54ec4 100644 --- a/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt +++ b/navi-widgets/src/main/java/com/navi/naviwidgets/views/CollapsibleAmountSliderView.kt @@ -1,4 +1,3 @@ - package com.navi.naviwidgets.views /* * @@ -22,9 +21,9 @@ import com.navi.naviwidgets.extensions.setTextFieldData import com.navi.naviwidgets.models.response.TextFieldData import kotlin.math.roundToInt - -class CollapsibleAmountSliderView @JvmOverloads constructor( - context: Context?, attrs : AttributeSet? = null +class CollapsibleAmountSliderView @JvmOverloads constructor( + context: Context?, + attrs: AttributeSet? = null ) : LinearLayout(context, attrs), SeekBar.OnSeekBarChangeListener { From 43c1360f9a13ec8fc5c96ae5cb09bcfb5dd270a0 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 22 Sep 2022 15:06:21 +0530 Subject: [PATCH 13/13] revert commit --- .../health/fragment/EmiScheduleFragment.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt index 5df4e64635..ad9dda57ad 100644 --- a/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt +++ b/navi-insurance/src/main/java/com/navi/insurance/health/fragment/EmiScheduleFragment.kt @@ -38,15 +38,15 @@ class EmiScheduleFragment: BaseFragment(), EmiTimelineClickListener { } override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? ): View { binding = DataBindingUtil.inflate( - inflater, - R.layout.fragment_emi_schedule, - container, - false + inflater, + R.layout.fragment_emi_schedule, + container, + false ) binding.rvTimeline.adapter =