Merge pull request #52 from playola-radio/develop

0.8.0

Author: briankeane

.circleci/config.yml

@@ -4,6 +4,27 @@ orbs:
   ruby: circleci/ruby@2.0.0
 
 jobs:
+  swiftlint_check:
+    macos:
+      xcode: 16.2.0
+    steps:
+      - checkout
+      - run:
+          name: Install Bundler
+          command: gem install bundler
+      - run:
+          name: Install Fastlane
+          command: bundle install
+      - run:
+          name: Install SwiftLint (Homebrew)
+          command: brew install swiftlint
+      - run:
+          name: Run SwiftLint via Fastlane
+          command: bundle exec fastlane lint_code
+      - run:
+          name: Run swift-format lint check
+          command: bundle exec fastlane format_check
+
   test:
     macos:
       xcode: 16.2.0
@@ -27,6 +48,10 @@ jobs:
 
 workflows:
   version: 2
+  lint-codebase:
+    jobs:
+      - swiftlint_check
+  
   build-test:
     jobs:
       - test

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  lint:
+    runs-on: macos-latest
+    name: SwiftLint
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Install SwiftLint
+      run: brew install swiftlint
+      
+    - name: Install Fastlane
+      run: |
+        gem install bundler
+        bundle install
+        
+    - name: Run SwiftLint
+      run: bundle exec fastlane lint_code
+
+  build-and-test:
+    runs-on: macos-latest
+    name: Build and Test
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Select Xcode version
+      run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
+      
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install
+        
+    - name: Run tests
+      run: bundle exec fastlane tests

.swiftlint.yml

@@ -1,31 +1,40 @@
+# SwiftLint Configuration
 disabled_rules:
   - trailing_whitespace
-  - line_length
-
-opt_in_rules:
-  - empty_count
-  - empty_string
-  - redundant_nil_coalescing
+  - trailing_comma
+  - opening_brace
+  - closure_parameter_position
+  - todo
 
 excluded:
   - Carthage
   - Pods
   - .build
+  - DerivedData
 
-function_parameter_count:
-  warning: 6
-  error: 8
+# General configuration
+line_length:
+  warning: 120
+  error: 200
 
+# Allow shorter variable names in specific contexts
 identifier_name:
-  min_length: 2
-  allowed_symbols: "_"
-
-type_name:
-  min_length: 3
+  min_length:
+    warning: 2
+    error: 1
+  excluded:
+    - "to"  # Common parameter name in Mail.swift
+    - "fm"  # Enum case in RadioStation.swift
+    - "i"   # Common loop index
+    - "j"   # Common loop index
+    - "k"   # Common loop index
+  allowed_symbols:
+    - "_"  # Common in variable names
 
-vertical_whitespace:
-  max_empty_lines: 2
+type_body_length:
+  warning: 1000
+  error: 1000
 
-cyclomatic_complexity:
-  warning: 15
-  error: 25
+file_length:
+  warning: 1000
+  error: 1000

Package.swift

@@ -26,14 +26,14 @@ let package = Package(
       name: "PlayolaPlayer",
       resources: [.copy("MockData")],
       plugins: [
-        //              .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")
+        .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")
       ]
     ),
     .testTarget(
       name: "PlayolaPlayerTests",
       dependencies: ["PlayolaPlayer"],
       plugins: [
-        //              .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")
+        .plugin(name: "SwiftLintBuildToolPlugin", package: "SwiftLintPlugins")
       ]
     ),
   ]

PlayolaPlayerExample/PlayolaPlayerExample/ContentView.swift

@@ -180,11 +180,13 @@ struct ContentView: View {
           // Main playback controls
           HStack(spacing: 40) {
             // Station picker
-            Button(action: { showingStationPicker.toggle() }) {
-              Image(systemName: "list.bullet")
-                .font(.title2)
-                .foregroundColor(.white.opacity(0.8))
-            }
+            Button(
+              action: { showingStationPicker.toggle() },
+              label: {
+                Image(systemName: "list.bullet")
+                  .font(.title2)
+                  .foregroundColor(.white.opacity(0.8))
+              })
 
             // Play/Stop button (current time)
             Button(action: playOrPause) {
@@ -293,23 +295,25 @@ struct StationPickerView: View {
   var body: some View {
     NavigationView {
       List(stations, id: \.0) { station in
-        Button(action: {
-          Task {
-            do {
-              try await PlayolaStationPlayer.shared.play(stationId: station.0)
-            } catch {
-              print("Failed to start playback: \(error)")
+        Button(
+          action: {
+            Task {
+              do {
+                try await PlayolaStationPlayer.shared.play(stationId: station.0)
+              } catch {
+                print("Failed to start playback: \(error)")
+              }
             }
-          }
-          dismiss()
-        }) {
-          HStack {
-            Image(systemName: "radio")
-              .foregroundColor(.blue)
-            Text(station.1)
-            Spacer()
-          }
-        }
+            dismiss()
+          },
+          label: {
+            HStack {
+              Image(systemName: "radio")
+                .foregroundColor(.blue)
+              Text(station.1)
+              Spacer()
+            }
+          })
       }
       .navigationTitle("Select Station")
       .navigationBarItems(trailing: Button("Done") { dismiss() })

PlayolaPlayerExample/PlayolaPlayerExampleTests/PlayolaPlayerExampleTests.swift

@@ -24,7 +24,8 @@ final class PlayolaPlayerExampleTests: XCTestCase {
     // Use XCTAssert and related functions to verify your tests produce the correct results.
     // Any test you write for XCTest can be annotated as throws and async.
     // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
-    // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions
+    // afterwards.
   }
 
   func testPerformanceExample() throws {

PlayolaPlayerExample/PlayolaPlayerExampleUITests/PlayolaPlayerExampleUITests.swift

@@ -15,7 +15,8 @@ final class PlayolaPlayerExampleUITests: XCTestCase {
     // In UI tests it is usually best to stop immediately when a failure occurs.
     continueAfterFailure = false
 
-    // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+    // In UI tests it's important to set the initial state - such as interface orientation - required for your tests
+    // before they run. The setUp method is a good place to do this.
   }
 
   override func tearDownWithError() throws {

PlayolaPlayerExample/PlayolaPlayerExampleUITests/PlayolaPlayerExampleUITestsLaunchTests.swift

@@ -9,7 +9,7 @@ import XCTest
 
 final class PlayolaPlayerExampleUITestsLaunchTests: XCTestCase {
 
-  override class var runsForEachTargetApplicationUIConfiguration: Bool {
+  override static var runsForEachTargetApplicationUIConfiguration: Bool {
     true
   }
 

Sources/PlayolaPlayer/Models/RelatedText.swift

@@ -30,7 +30,16 @@ extension RelatedText {
     return RelatedText(
       title: "Why I chose this song",
       body:
-        "So John Mayer was, I forget which CD it was, it was, you know, John Mayer's gone through a bunch of different phases, and he went through this phase, I can picture the front of the record. It's got something like Olivia on it. Something like Olivia. Born and Raised, I think is the record it was on. He's gone through so many different phases in his career. He's bopped in and out of every musical genre you can be in. He's done it all. He's obviously one of the top five guitar players of all time, and I think he's a better songwriter than he is a guitar player. And it's like, you know, it's, he's just this person who transcends what we call music. He's just so far on his own level that it is nearly inhuman, you know. It's like just something totally different that, that we're just kind of lucky to be existing at the same time. So this is a song by John Mayer."
+        "So John Mayer was, I forget which CD it was, it was, you know, John Mayer's gone through a bunch of different "
+        + "phases, and he went through this phase, I can picture the front of the record. It's got something like "
+        + "Olivia "
+        + "on it. Something like Olivia. Born and Raised, I think is the record it was on. He's gone through so many "
+        + "different phases in his career. He's bopped in and out of every musical genre you can be in. He's done it "
+        + "all. He's obviously one of the top five guitar players of all time, and I think he's a better songwriter "
+        + "than he is a guitar player. And it's like, you know, it's, he's just this person who transcends what we "
+        + "call music. He's just so far on his own level that it is nearly inhuman, you know. It's like just "
+        + "something totally different that, that we're just kind of lucky to be existing at the same time. So this "
+        + "is a song by John Mayer."
     )
   }
   public static var mocks: [RelatedText] {

Sources/PlayolaPlayer/Models/Schedule.swift

@@ -57,10 +57,14 @@ public struct Schedule: Sendable {
 
 extension Schedule {
   public static let mock: Schedule = {
-    let url = Bundle.module.url(
-      forResource: "MockSchedule", withExtension: "json", subdirectory: "MockData")!
-    let data = try! Data(contentsOf: url, options: .dataReadingMapped)
-    let spins = try! JSONDecoderWithIsoFull().decode([Spin].self, from: data)
+    guard
+      let url = Bundle.module.url(
+        forResource: "MockSchedule", withExtension: "json", subdirectory: "MockData"),
+      let data = try? Data(contentsOf: url, options: .dataReadingMapped),
+      let spins = try? JSONDecoderWithIsoFull().decode([Spin].self, from: data)
+    else {
+      fatalError("Failed to load mock schedule data")
+    }
     return Schedule(stationId: spins[0].stationId, spins: spins)
   }()
 }