Skip to content

Commit f05907c

Browse files
committed
WIP
1 parent ac39182 commit f05907c

File tree

7 files changed

+22
-82
lines changed

7 files changed

+22
-82
lines changed

Examples/Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
D52A95512DCEC08F00885069 /* SwiftUINavigationTransitions in Frameworks */ = {isa = PBXBuildFile; productRef = D52A95502DCEC08F00885069 /* SwiftUINavigationTransitions */; };
11+
D52A95532DCEC22700885069 /* NavigationTransitions in Frameworks */ = {isa = PBXBuildFile; productRef = D553583E290E97C5009E5D72 /* NavigationTransitions */; };
1112
D5535823290E9692009E5D72 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5535822290E9692009E5D72 /* Assets.xcassets */; };
1213
D5535826290E9692009E5D72 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5535825290E9692009E5D72 /* Preview Assets.xcassets */; };
1314
D5535834290E9718009E5D72 /* Swing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D553582C290E9718009E5D72 /* Swing.swift */; };
@@ -49,6 +50,7 @@
4950
isa = PBXFrameworksBuildPhase;
5051
buildActionMask = 2147483647;
5152
files = (
53+
D52A95532DCEC22700885069 /* NavigationTransitions in Frameworks */,
5254
D52A95512DCEC08F00885069 /* SwiftUINavigationTransitions in Frameworks */,
5355
);
5456
runOnlyForDeploymentPostprocessing = 0;
@@ -151,7 +153,7 @@
151153
attributes = {
152154
BuildIndependentTargetsInParallel = 1;
153155
LastSwiftUpdateCheck = 1410;
154-
LastUpgradeCheck = 1500;
156+
LastUpgradeCheck = 1640;
155157
TargetAttributes = {
156158
D553581A290E9691009E5D72 = {
157159
CreatedOnToolsVersion = 14.1;
@@ -249,6 +251,7 @@
249251
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
250252
COPY_PHASE_STRIP = NO;
251253
DEBUG_INFORMATION_FORMAT = dwarf;
254+
DEVELOPMENT_TEAM = 26CPNYHDUU;
252255
ENABLE_STRICT_OBJC_MSGSEND = YES;
253256
ENABLE_TESTABILITY = YES;
254257
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -312,6 +315,7 @@
312315
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
313316
COPY_PHASE_STRIP = NO;
314317
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
318+
DEVELOPMENT_TEAM = 26CPNYHDUU;
315319
ENABLE_NS_ASSERTIONS = NO;
316320
ENABLE_STRICT_OBJC_MSGSEND = YES;
317321
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -344,7 +348,6 @@
344348
CODE_SIGN_STYLE = Automatic;
345349
CURRENT_PROJECT_VERSION = 1;
346350
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
347-
DEVELOPMENT_TEAM = 26CPNYHDUU;
348351
ENABLE_PREVIEWS = YES;
349352
GENERATE_INFOPLIST_FILE = YES;
350353
INFOPLIST_FILE = Demo/Info.plist;
@@ -382,7 +385,6 @@
382385
CODE_SIGN_STYLE = Automatic;
383386
CURRENT_PROJECT_VERSION = 1;
384387
DEVELOPMENT_ASSET_PATHS = "\"Demo/Preview Content\"";
385-
DEVELOPMENT_TEAM = 26CPNYHDUU;
386388
ENABLE_PREVIEWS = YES;
387389
GENERATE_INFOPLIST_FILE = YES;
388390
INFOPLIST_FILE = Demo/Info.plist;

Examples/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

NavigationTransitions.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

NavigationTransitions.xcworkspace/xcshareddata/xcschemes/NavigationTransitions.xcscheme

Lines changed: 0 additions & 72 deletions
This file was deleted.

Package.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,17 @@ let package = Package(
3535
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
3636
]),
3737

38+
.target(name: "UIKitNavigationTransitions", dependencies: [
39+
"NavigationTransition",
40+
"RuntimeAssociation",
41+
"RuntimeSwizzling",
42+
]),
43+
3844
.target(name: "SwiftUINavigationTransitions", dependencies: [
3945
"NavigationTransition",
4046
"RuntimeAssociation",
4147
"RuntimeSwizzling",
48+
"UIKitNavigationTransitions","
4249
.product(name: "SwiftUIIntrospect", package: "swiftui-introspect"),
4350
]),
4451

Sources/TestUtils/AnimatorTransientView+Mocks.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@testable public import Animator
2-
public import UIKit
2+
internal import UIKit
33
import IssueReporting
44

55
extension AnimatorTransientView {

Tests/TestPlans/NavigationTransitions.xctestplan renamed to Tests/TestPlans/SwiftUINavigationTransitions.xctestplan

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"configurations" : [
33
{
4-
"id" : "8246DD19-912B-4BFD-B95F-A885D62913FC",
4+
"id" : "8C608A98-3C43-44EC-9508-ECA482696F28",
55
"name" : "Test Scheme Action",
66
"options" : {
77

@@ -16,15 +16,15 @@
1616
{
1717
"target" : {
1818
"containerPath" : "container:",
19-
"identifier" : "AtomicTransitionTests",
20-
"name" : "AtomicTransitionTests"
19+
"identifier" : "AnimatorTests",
20+
"name" : "AnimatorTests"
2121
}
2222
},
2323
{
2424
"target" : {
2525
"containerPath" : "container:",
26-
"identifier" : "AnimatorTests",
27-
"name" : "AnimatorTests"
26+
"identifier" : "AtomicTransitionTests",
27+
"name" : "AtomicTransitionTests"
2828
}
2929
}
3030
],

0 commit comments

Comments
 (0)