diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml deleted file mode 100644 index f88453a..0000000 --- a/.github/workflows/ci-pull-request.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: CI - Pull Request -on: - pull_request: - branches: - - main - push: - branches: - - develop - workflow_dispatch: - -jobs: - build-swiftpm: - name: Build SwiftPM - uses: oversizedev/GithubWorkflows/.github/workflows/build-swiftpm.yml@main - strategy: - matrix: - packages: - - OversizeKit - - OversizeCalendarKit - - OversizeContactsKit - - OversizeLocationKit - - OversizeNoticeKit - - OversizeNotificationKit - - OversizeOnboardingKit - - OversizePhotoKit - with: - package: ${{ matrix.packages }} - secrets: inherit - - build-example: - name: Build Example - needs: build-swiftpm - uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main - strategy: - matrix: - destination: - - platform=iOS Simulator,name=iPhone 15 Pro,OS=17.0.1 - - platform=iOS Simulator,name=iPhone 15 Pro,OS=17.5 - - platform=iOS Simulator,name=iPad Air (5th generation),OS=17.0.1 - - platform=iOS Simulator,name=iPad Air (5th generation),OS=17.5 - - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=17.0 - - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=17.5 - with: - path: AppExample/Example - scheme: Example - destination: ${{ matrix.destination }} - secrets: inherit - - build-watchOS-example: - name: Build watchOS Example - needs: build-swiftpm - uses: oversizedev/GithubWorkflows/.github/workflows/build-app.yml@main - strategy: - matrix: - destination: - - platform=watchOS Simulator,name=Apple Watch SE (44mm) (2nd generation),OS=10.0 - - platform=watchOS Simulator,name=Apple Watch SE (44mm) (2nd generation),OS=10.5 - with: - path: AppExample/Example - scheme: Example (watchOS) Watch App - destination: ${{ matrix.destination }} - secrets: inherit - -# tests: -# name: Test -# needs: build-example -# uses: oversizedev/GithubWorkflows/.github/workflows/test.yml@main -# secrets: inherit diff --git a/.github/workflows/ci-push.yml b/.github/workflows/ci.yml similarity index 92% rename from .github/workflows/ci-push.yml rename to .github/workflows/ci.yml index 4bfd297..3efcb60 100644 --- a/.github/workflows/ci-push.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - OversizeOnboardingKit - OversizePhotoKit destination: - - platform=iOS Simulator,name=iPhone 16,OS=18.0 + - platform=iOS Simulator,name=iPhone 16,OS=18.1 - platform=macOS,arch=arm64 with: package: ${{ matrix.packages }} @@ -40,7 +40,7 @@ jobs: strategy: matrix: destination: - - platform=iOS Simulator,name=iPhone 16,OS=18.0 + - platform=iOS Simulator,name=iPhone 16,OS=18.1 - platform=macOS,arch=arm64 with: path: AppExample/Example diff --git a/Package.swift b/Package.swift index de7c73d..1795262 100644 --- a/Package.swift +++ b/Package.swift @@ -6,10 +6,10 @@ import PackageDescription let remoteDependencies: [PackageDescription.Package.Dependency] = [ .package(url: "https://github.com/oversizedev/OversizeUI.git", .upToNextMajor(from: "3.0.2")), - .package(url: "https://github.com/oversizedev/OversizeCore.git", .upToNextMajor(from: "2.0.0")), + .package(url: "https://github.com/oversizedev/OversizeCore.git", .upToNextMajor(from: "1.3.0")), .package(url: "https://github.com/oversizedev/OversizeServices.git", .upToNextMajor(from: "1.4.0")), .package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.4.0")), - .package(url: "https://github.com/oversizedev/OversizeComponents.git", .upToNextMajor(from: "1.2.0")), + .package(url: "https://github.com/oversizedev/OversizeComponents.git", .upToNextMajor(from: "2.0.0")), .package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "2.0.0")), .package(url: "https://github.com/oversizedev/OversizeNetwork.git", .upToNextMajor(from: "0.4.0")), .package(url: "https://github.com/oversizedev/OversizeModels.git", .upToNextMajor(from: "0.1.0")), @@ -32,10 +32,10 @@ let developmentDependencies: [PackageDescription.Package.Dependency] = [ .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")), ] -var dependencies: [PackageDescription.Package.Dependency] = [] +var dependencies: [PackageDescription.Package.Dependency] = remoteDependencies -if ProcessInfo.processInfo.environment["BUILD_MODE"] == "PRODUCTION" { - dependencies = remoteDependencies +if ProcessInfo.processInfo.environment["BUILD_MODE"] == "DEV" { + dependencies = developmentDependencies } let package = Package( @@ -56,7 +56,7 @@ let package = Package( .library(name: "OversizeNotificationKit", targets: ["OversizeNotificationKit"]), .library(name: "OversizePhotoKit", targets: ["OversizePhotoKit"]), ], - dependencies: developmentDependencies, + dependencies: dependencies, targets: [ .target( name: "OversizeKit", diff --git a/Sources/OversizeKit/SettingsKit/SettingsRouter/Screens.swift b/Sources/OversizeKit/SettingsKit/SettingsRouter/Screens.swift index 33e34fe..d7d20db 100644 --- a/Sources/OversizeKit/SettingsKit/SettingsRouter/Screens.swift +++ b/Sources/OversizeKit/SettingsKit/SettingsRouter/Screens.swift @@ -76,15 +76,15 @@ public extension SettingsScreen { } } -//public struct SettingsNavigateAction { +// public struct SettingsNavigateAction { // public typealias Action = (SettingsNavigationType) -> Void // public let action: Action // public func callAsFunction(_ navigationType: SettingsNavigationType) { // action(navigationType) // } -//} +// } -//public enum SettingsNavigationType { +// public enum SettingsNavigationType { // case move(SettingsScreen) // case backToRoot // case back(Int = 1) @@ -94,7 +94,7 @@ public extension SettingsScreen { // case dismissFullScreenCover // case dismissDisabled(_ isDismissDisabled: Bool = true) // case presentHUD(_ text: String, type: HUDMessageType) -//} +// } // // public struct SettingsNavigateEnvironmentKey: EnvironmentKey { diff --git a/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsRouting.swift b/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsRouting.swift index 3045579..11aca22 100644 --- a/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsRouting.swift +++ b/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsRouting.swift @@ -3,14 +3,11 @@ // SettingsRouting.swift, created on 10.05.2024 // - import OversizeRouter - import SwiftUI +import OversizeRouter +import SwiftUI - public struct SettingsRoutingView: View { - - public init() { - - } +public struct SettingsRoutingView: View { + public init() {} public var body: some View { RoutingView { @@ -20,4 +17,4 @@ } .systemServices() } - } +} diff --git a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift index dec2871..22fd90d 100644 --- a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift @@ -12,7 +12,6 @@ import SwiftUI // swiftlint:disable line_length public struct SettingsView: View { - @Environment(Router.self) var router @Environment(\.iconStyle) var iconStyle: IconStyle @Environment(\.theme) var theme: ThemeSettings