diff --git a/IonicPortals.podspec b/IonicPortals.podspec index b90ef96..14285ac 100644 --- a/IonicPortals.podspec +++ b/IonicPortals.podspec @@ -5,11 +5,11 @@ Pod::Spec.new do |s| s.social_media_url = 'https://twitter.com/capacitorjs' s.license = 'Commercial' s.homepage = 'https://ionic.io/portals' - s.ios.deployment_target = '13.0' + s.ios.deployment_target = '14.0' s.authors = { 'Ionic Team' => 'hi@ionicframework.com' } s.source = { git: 'https://github.com/ionic-team/ionic-portals-ios.git', tag: s.version.to_s } s.source_files = 'Sources/IonicPortals/**/*.swift' - s.dependency 'Capacitor', '~> 6.0' + s.dependency 'Capacitor', '~> 7.0.0' s.dependency 'IonicLiveUpdates', '>= 0.5.0', '< 0.6.0' s.swift_version = '5.7' end diff --git a/Package.swift b/Package.swift index cdc7052..e502682 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "IonicPortals", - platforms: [.iOS(.v13)], + platforms: [.iOS(.v14)], products: [ .library( name: "IonicPortals", @@ -12,7 +12,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor-swift-pm", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/ionic-team/capacitor-swift-pm", .upToNextMajor(from: "7.0.0")), .package(url: "https://github.com/ionic-team/ionic-live-updates-releases", "0.5.0"..<"0.6.0"), .package(url: "https://github.com/pointfreeco/swift-clocks", .upToNextMajor(from: "1.0.2")) ], diff --git a/Sources/IonicPortals/JSONDecoder+JSObject.swift b/Sources/IonicPortals/JSONDecoder+JSObject.swift deleted file mode 100644 index 6b8af91..0000000 --- a/Sources/IonicPortals/JSONDecoder+JSObject.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// JSONDecoder+JSObject.swift -// IonicPortals -// -// Created by Steven Sherry on 3/3/22. -// - -import Foundation -import Capacitor - -public extension JSONDecoder { - @available(*, deprecated, renamed: "decodeJsObject") - func decodeJSObject(_ type: T.Type, from object: JSObject) throws -> T { - try decodeJsObject(type, from: object) - } - - @available(*, deprecated, message: "Use JSValueDecoder from Capacitor. This will be removed in the next release.") - func decodeJsObject(_ type: T.Type, from object: JSObject) throws -> T { - let data = try JSONSerialization.data(withJSONObject: object, options: []) - return try decode(T.self, from: data) - } -} - diff --git a/Sources/IonicPortals/JSONEncoder+JSObject.swift b/Sources/IonicPortals/JSONEncoder+JSObject.swift deleted file mode 100644 index e3082b3..0000000 --- a/Sources/IonicPortals/JSONEncoder+JSObject.swift +++ /dev/null @@ -1,29 +0,0 @@ -// -// JSValueEncoder.swift -// IonicPortals -// -// Created by Steven Sherry on 3/3/22. -// - -import Foundation -import Capacitor -import Combine - - -public extension JSONEncoder { - @available(*, deprecated, renamed: "encodeJsObject") - func encodeJSObject(_ value: T) throws -> JSValue { - try encodeJsObject(value) - } - - @available(*, deprecated, message: "Use JSValueEncoder from Capacitor. This will be removed in the next release.") - func encodeJsObject(_ value: T) throws -> JSObject { - let data = try encode(value) - let dictionary = try JSONSerialization.jsonObject(with: data, options: []) as? NSDictionary - - // Any valid Codable type that is keyed should not fail here. - // An unkeyed or single value container would have failed in the - // JSONSerialization step. - return JSTypes.coerceDictionaryToJSObject(dictionary)! - } -} diff --git a/package.json b/package.json index 2551db5..6094876 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "scripts": { "build": "npm run build:docs && npm run build:transform", - "build:docs": "xcodebuild docbuild -scheme IonicPortals -derivedDataPath DerivedData -destination 'platform=iOS Simulator,name=iPhone 15'", + "build:docs": "xcodebuild docbuild -scheme IonicPortals -derivedDataPath DerivedData -destination 'platform=iOS Simulator,name=iPhone 16 Pro'", "build:transform": "mv DerivedData/Build/Products/Debug-iphonesimulator/IonicPortals.doccarchive public" } }