Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposal to make use of swift-openapi-generator #799

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b66f84d
Conformance with URLSessionDelegate, URLSessionTaskDelegate migrate t…
timbms Jul 30, 2024
237940e
Got the swift-openapi-generator working on openHAB iOS app:
timbms Aug 7, 2024
c96ec85
Manually modifying openapi - JerseyResponseBuilderDTO for response to…
timbms Aug 16, 2024
470eb88
Merge remote-tracking branch 'origin/async' into openapigen
timbms Aug 18, 2024
eecb27e
Created LoggingMiddleware to be separated from AuthorisationMiddleware
timbms Aug 18, 2024
7a32f39
Subcribe to events and map received events to OpenHABSitemapWidgetEvents
timbms Aug 19, 2024
aaf8b49
Using logger
timbms Aug 20, 2024
ec0fc85
Changed accessModifier to public - To be changed back to internal whe…
timbms Aug 26, 2024
f4e672f
Aligning with develop branch
timbms Sep 12, 2024
f53939e
Merge branch 'develop' into openapigen
timbms Sep 13, 2024
e9764d3
Merge branch 'develop' into openapigen
timbms Sep 14, 2024
b7f6397
Merge current status of develop with first step of migration to SwiftUI
timbms Sep 15, 2024
78912e1
Merge branch 'develop' into openapigen
timbms Sep 15, 2024
c07b57e
Move extensions for models from APIActor.swift to respective files
timbms Sep 15, 2024
30aa8b3
Merge branch 'openapigen' of https://github.com/openhab/openhab-ios i…
timbms Sep 15, 2024
c6ea6e6
Merge branch 'develop' into openapigen
timbms Sep 15, 2024
4ec2b7e
Reusing OpenHABWidget for Watch. Allows to remove complexity.
timbms Sep 15, 2024
52fb51d
Getting rid of ObservableOpenHABSitemapPage for watch
timbms Sep 15, 2024
6941790
Merge branch 'openapigen' of https://github.com/openhab/openhab-ios i…
timbms Sep 15, 2024
9d3c3a6
Merge result
timbms Sep 15, 2024
b6db98b
Properly testing decoding with swift-openapi-generator
timbms Sep 16, 2024
8637c46
Merge branch 'develop' into openapigen
timbms Sep 16, 2024
4514c56
Properly showing selected state in SelectionView
timbms Sep 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ openHAB.ipa
build/
BuildTools/.build
OpenHABCore/Package.resolved

#OpenHABCore/Sources/OpenHABCore/GeneratedSources
OpenHABCore/swift-openapi-generator/
1 change: 1 addition & 0 deletions BuildTools/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ disabled_rules: # rule identifiers to exclude from running

included:
- ../

excluded:
- ../fastlane
- ../OpenHABCore/.build
Expand Down
12 changes: 8 additions & 4 deletions OpenHABCore/Package.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// swift-tools-version:5.9
// swift-tools-version:5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "OpenHABCore",
platforms: [.iOS(.v16), .watchOS(.v9)],
platforms: [.iOS(.v16), .watchOS(.v10), .macOS(.v14)],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
Expand All @@ -16,7 +16,9 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0"),
.package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0")
.package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.0.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand All @@ -25,7 +27,9 @@ let package = Package(
name: "OpenHABCore",
dependencies: [
.product(name: "Alamofire", package: "Alamofire", condition: .when(platforms: [.iOS, .watchOS])),
.product(name: "Kingfisher", package: "Kingfisher", condition: .when(platforms: [.iOS, .watchOS]))
.product(name: "Kingfisher", package: "Kingfisher", condition: .when(platforms: [.iOS, .watchOS])),
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
.product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession")
],
swiftSettings: [.enableUpcomingFeature("BareSlashRegexLiterals")]
),
Expand Down
Loading