chore: formatted kotlin files

BreX900 · Nov 19, 2023 · b704a9c · b704a9c
1 parent 793eb54
commit b704a9c
Show file tree

Hide file tree

Showing 16 changed files with 1,119 additions and 675 deletions.
diff --git a/.github/workflows/stripe_terminal_integration.yml b/.github/workflows/stripe_terminal_integration.yml
@@ -34,6 +34,14 @@ jobs:
 
       - name: Analyze code
         run: flutter analyze --no-fatal-infos
+
+      # Android
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+      - run: ./gradlew spotlessCheck
+        working-directory: stripe_terminal/android
 
   integration-example:
     runs-on: macos-latest
@@ -45,10 +53,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: setup-cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with:
-          podfile-path: stripe_terminal/example/ios/Podfile.lock
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: '3.16.x'
@@ -65,4 +69,9 @@ jobs:
       - name: Analyze code
         run: flutter analyze --no-fatal-infos
 
+      # IOS
+      - uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          podfile-path: stripe_terminal/example/ios/Podfile.lock
+
       - run: pod install --deployment --project-directory=ios
diff --git a/stripe_terminal/README.md b/stripe_terminal/README.md
@@ -169,3 +169,6 @@ Much code in this plugin is auto generated:
 - [one_for_all](https://pub.dev/packages/one_for_all) is used to generate the code for communication between platforms.
   Run this [script](tool/generate_api.dart)
 - [index_generator](https://pub.dev/packages/index_generator) is used to generate library exports
+
+### Android
+Format code with `./gradlew spotlessApply`
diff --git a/stripe_terminal/android/build.gradle b/stripe_terminal/android/build.gradle
@@ -1,6 +1,3 @@
-group 'packages.mek'
-version '1.0-SNAPSHOT'
-
 buildscript {
     ext.kotlin_version = '1.7.10'
     repositories {
@@ -14,6 +11,13 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.diffplug.spotless" version "6.22.0"
+}
+
+group 'packages.mek'
+version '1.0-SNAPSHOT'
+
 allprojects {
     repositories {
         google()
@@ -68,4 +72,11 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api "com.stripe:stripeterminal-localmobile:3.2.0"
     api "com.stripe:stripeterminal-core:3.2.0"
+}
+
+spotless {
+    kotlin {
+        target("**/*.kt")
+        ktlint("1.0.1")
+    }
 }
diff --git a/stripe_terminal/android/src/main/kotlin/mek/stripeterminal/Extensions.kt b/stripe_terminal/android/src/main/kotlin/mek/stripeterminal/Extensions.kt
@@ -2,4 +2,4 @@ package mek.stripeterminal
 
 fun <K, V> Map<K, V>.toHashMap(): HashMap<K, V> {
     return hashMapOf(*map { (k, v) -> k to v }.toTypedArray())
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ package mek.stripeterminal @@
     fun <K, V> Map<K, V>.toHashMap(): HashMap<K, V> {
         return hashMapOf(*map { (k, v) -> k to v }.toTypedArray())
-    }
+    }