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.

Sign up for GitHub

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

Jump to bottom

Add support for iOS 18 on our introspections #104

Merged
merged 4 commits into from
Sep 10, 2024
Merged

Add support for iOS 18 on our introspections #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d6373f
Update dependency BarredEwe/Prefire to from: "2.9.0"
renovate[bot] Aug 23, 2024
51d105b
Add iOS 18 to the supported versions.
pixlwave Sep 10, 2024
f52a8fc
Update Package.resolved files.
pixlwave Sep 10, 2024
c575377
Move window versions in to Compound so we can use it in both the app …
pixlwave Sep 10, 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
12 changes: 0 additions & 12 deletions Inspector/Inspector.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
91B2EA9C28CA064800A90A83 /* ColorsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91B2EA9B28CA064800A90A83 /* ColorsScreen.swift */; };
91B946812A29062300F187EF /* IconsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91B946802A29062300F187EF /* IconsScreen.swift */; };
91CA00362AD7D83200121E0F /* ButtonsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 917F562A28256DCD00D19543 /* ButtonsScreen.swift */; };
A75F953C2ACB0B31006C2657 /* PlatformViewVersionPredicate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A75F953B2ACB0B31006C2657 /* PlatformViewVersionPredicate.swift */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -64,7 +63,6 @@
91B2EA9B28CA064800A90A83 /* ColorsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsScreen.swift; sourceTree = "<group>"; };
91B946802A29062300F187EF /* IconsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconsScreen.swift; sourceTree = "<group>"; };
9F9AF07976782861ECA2764C /* Pods-Compound Inspector.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Compound Inspector.release.xcconfig"; path = "Target Support Files/Pods-Compound Inspector/Pods-Compound Inspector.release.xcconfig"; sourceTree = "<group>"; };
A75F953B2ACB0B31006C2657 /* PlatformViewVersionPredicate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlatformViewVersionPredicate.swift; sourceTree = "<group>"; };
B62609A3377EA1D9C59FCD20 /* Pods-Compound Inspector.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Compound Inspector.debug.xcconfig"; path = "Target Support Files/Pods-Compound Inspector/Pods-Compound Inspector.debug.xcconfig"; sourceTree = "<group>"; };
D2E28F45EEA9A8DE6AFB10E9 /* Pods_Compound_Inspector.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Compound_Inspector.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -147,7 +145,6 @@
917F561A28256DB800D19543 /* Sources */ = {
isa = PBXGroup;
children = (
A75F953A2ACB0B22006C2657 /* Extensions */,
917F561B28256DB800D19543 /* CompoundInspectorApp.swift */,
917F562E28256DD800D19543 /* SidebarList.swift */,
918824692A2DE882001606AE /* Screen.swift */,
Expand Down Expand Up @@ -177,14 +174,6 @@
path = Components;
sourceTree = "<group>";
};
A75F953A2ACB0B22006C2657 /* Extensions */ = {
isa = PBXGroup;
children = (
A75F953B2ACB0B31006C2657 /* PlatformViewVersionPredicate.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -313,7 +302,6 @@
9132C6332A72850200EAEF3D /* ShareSheetScreen.swift in Sources */,
917C22F829C380A200B35660 /* FontsScreen.swift in Sources */,
9188246A2A2DE882001606AE /* Screen.swift in Sources */,
A75F953C2ACB0B31006C2657 /* PlatformViewVersionPredicate.swift in Sources */,
9184AC022825741600227C3A /* ScreenContent.swift in Sources */,
912974102A864F5E004BEA88 /* ListScreen.swift in Sources */,
9132C6312A7280A500EAEF3D /* ContextMenuScreen.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions Inspector/Inspector.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/BarredEwe/Prefire",
"state" : {
"revision" : "237f4005c81f74d5359eddb534d2d10925ef2787",
"version" : "2.8.0"
"revision" : "0b7b6e6fe98af7e12b1440ca8fe81b3033ecf873",
"version" : "2.9.0"
}
},
{
Expand Down
16 changes: 0 additions & 16 deletions Inspector/Sources/Extensions/PlatformViewVersionPredicate.swift
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/BarredEwe/Prefire",
"state" : {
"revision" : "237f4005c81f74d5359eddb534d2d10925ef2787",
"version" : "2.8.0"
"revision" : "0b7b6e6fe98af7e12b1440ca8fe81b3033ecf873",
"version" : "2.9.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
.package(url: "https://github.com/element-hq/compound-design-tokens", exact: "1.8.0"),
.package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "1.3.0"),
.package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols", from: "5.3.0"),
.package(url: "https://github.com/BarredEwe/Prefire", from: "2.8.0"),
.package(url: "https://github.com/BarredEwe/Prefire", from: "2.9.0"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.4")
],
targets: [
Expand Down
13 changes: 9 additions & 4 deletions Sources/Compound/Extensions/PlatformVersionPredicate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@
// limitations under the License.
//

import UIKit

import SwiftUI
import SwiftUIIntrospect

extension PlatformViewVersionPredicate<NavigationStackType, UINavigationController> {
public extension PlatformViewVersionPredicate<NavigationStackType, UINavigationController> {
static var supportedVersions: Self {
.iOS(.v16, .v17, .v18)
}
}

public extension PlatformViewVersionPredicate<WindowType, UIWindow> {
static var supportedVersions: Self {
.iOS(.v16, .v17)
.iOS(.v16, .v17, .v18)
}
}
Loading