Skip to content

Commit 76ba821

Browse files
ProVirProVir
committed
Support SPM and up swift versions
1 parent 7b85a23 commit 76ba821

15 files changed

+152
-33
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

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

‎AnimationSwitchRootViewController.podspec‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "AnimationSwitchRootViewController"
4-
s.version = "1.0.2"
4+
s.version = "1.0.3"
55
s.summary = "Extension for UIWindow - animation switch rootViewController in UIWindow"
66

77
s.description = <<-DESC
@@ -15,15 +15,18 @@ Support two types animation: CATransition and move shnapshots views.
1515
s.source = { :git => "https://github.com/ProVir/AnimationSwitchRootViewController.git", :tag => "#{s.version}" }
1616

1717
s.platform = :ios, "8.0"
18-
s.swift_version = '5.0'
18+
s.swift_versions = ['5.0', '5.1', '5.2', '5.3']
1919
s.default_subspec = 'Swift'
2020

2121

2222
s.subspec 'Swift' do |ss|
2323
ss.platform = :ios, "8.0"
2424

25-
ss.source_files = 'AnimationSwitchRootViewController/*.{h,m,swift}'
26-
ss.public_header_files = 'AnimationSwitchRootViewController/*.h'
25+
ss.source_files = [
26+
'AnimationSwitchRootViewController/ObjC/*.{h,m}',
27+
'AnimationSwitchRootViewController/Swift/*.swift'
28+
]
29+
ss.public_header_files = 'AnimationSwitchRootViewController/ObjC/*.h'
2730
end
2831

2932

@@ -32,14 +35,12 @@ Support two types animation: CATransition and move shnapshots views.
3235

3336
ss.source_files = [
3437
'AnimationSwitchRootViewControllerObjC/*.h',
35-
'AnimationSwitchRootViewController/UIWindow+PVAnimationSwitchRootViewController.{h,m}',
36-
'AnimationSwitchRootViewController/UIApplication+PVRootWindow.{h,m}'
38+
'AnimationSwitchRootViewController/ObjC/*.{h,m}'
3739
]
3840

3941
ss.public_header_files = [
4042
'AnimationSwitchRootViewControllerObjC/*.h',
41-
'AnimationSwitchRootViewController/UIWindow+PVAnimationSwitchRootViewController.h',
42-
'AnimationSwitchRootViewController/UIApplication+PVRootWindow.h'
43+
'AnimationSwitchRootViewController/ObjC/*.h'
4344
]
4445
end
4546

‎AnimationSwitchRootViewController.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
5080E9411FA56DC500A32E8F /* UIApplication+PVRootWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DE24B31FA565EC00DFE080 /* UIApplication+PVRootWindow.h */; settings = {ATTRIBUTES = (Public, ); }; };
1313
5080E9421FA56DCA00A32E8F /* UIApplication+PVRootWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DE24B41FA565EC00DFE080 /* UIApplication+PVRootWindow.m */; };
1414
5080E9441FA56E0000A32E8F /* AnimationSwitchRootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5080E9431FA56E0000A32E8F /* AnimationSwitchRootViewController.swift */; };
15-
50A1C660224D66E2003A8554 /* UIWindow+PVAnimationSwitchRootViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DE24AD1FA55E9400DFE080 /* UIWindow+PVAnimationSwitchRootViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
16-
50A1C661224D66E5003A8554 /* UIWindow+PVAnimationSwitchRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DE24AE1FA55E9400DFE080 /* UIWindow+PVAnimationSwitchRootViewController.m */; };
17-
50A1C662224D6747003A8554 /* UIApplication+PVRootWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50DE24B31FA565EC00DFE080 /* UIApplication+PVRootWindow.h */; settings = {ATTRIBUTES = (Public, ); }; };
18-
50A1C663224D674E003A8554 /* UIApplication+PVRootWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50DE24B41FA565EC00DFE080 /* UIApplication+PVRootWindow.m */; };
1915
50DE248A1FA55D5700DFE080 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DE24891FA55D5700DFE080 /* AppDelegate.swift */; };
2016
50DE248C1FA55D5700DFE080 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DE248B1FA55D5700DFE080 /* ViewController.swift */; };
2117
50DE248F1FA55D5700DFE080 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DE248D1FA55D5700DFE080 /* Main.storyboard */; };
@@ -55,7 +51,7 @@
5551
5080E9431FA56E0000A32E8F /* AnimationSwitchRootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationSwitchRootViewController.swift; sourceTree = "<group>"; };
5652
5080E9451FA5F44600A32E8F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
5753
50A1C65C224D6670003A8554 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
58-
50A1C65D224D6670003A8554 /* AnimationSwitchRootViewController.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AnimationSwitchRootViewController.podspec; sourceTree = "<group>"; };
54+
50A1C65D224D6670003A8554 /* AnimationSwitchRootViewController.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = AnimationSwitchRootViewController.podspec; sourceTree = "<group>"; };
5955
50DE24871FA55D5700DFE080 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
6056
50DE24891FA55D5700DFE080 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
6157
50DE248B1FA55D5700DFE080 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -157,15 +153,31 @@
157153
50DE24BD1FA568FB00DFE080 /* AnimationSwitchRootViewController */ = {
158154
isa = PBXGroup;
159155
children = (
160-
50DE24BE1FA568FB00DFE080 /* AnimationSwitchRootViewController.h */,
156+
50FB69612634129D0069FD0B /* ObjC */,
157+
50FB6964263412B20069FD0B /* Swift */,
161158
50DE24BF1FA568FB00DFE080 /* Info.plist */,
162-
5080E9431FA56E0000A32E8F /* AnimationSwitchRootViewController.swift */,
159+
);
160+
path = AnimationSwitchRootViewController;
161+
sourceTree = "<group>";
162+
};
163+
50FB69612634129D0069FD0B /* ObjC */ = {
164+
isa = PBXGroup;
165+
children = (
166+
50DE24BE1FA568FB00DFE080 /* AnimationSwitchRootViewController.h */,
163167
50DE24AD1FA55E9400DFE080 /* UIWindow+PVAnimationSwitchRootViewController.h */,
164168
50DE24AE1FA55E9400DFE080 /* UIWindow+PVAnimationSwitchRootViewController.m */,
165169
50DE24B31FA565EC00DFE080 /* UIApplication+PVRootWindow.h */,
166170
50DE24B41FA565EC00DFE080 /* UIApplication+PVRootWindow.m */,
167171
);
168-
path = AnimationSwitchRootViewController;
172+
path = ObjC;
173+
sourceTree = "<group>";
174+
};
175+
50FB6964263412B20069FD0B /* Swift */ = {
176+
isa = PBXGroup;
177+
children = (
178+
5080E9431FA56E0000A32E8F /* AnimationSwitchRootViewController.swift */,
179+
);
180+
path = Swift;
169181
sourceTree = "<group>";
170182
};
171183
/* End PBXGroup section */
@@ -175,8 +187,6 @@
175187
isa = PBXHeadersBuildPhase;
176188
buildActionMask = 2147483647;
177189
files = (
178-
50A1C660224D66E2003A8554 /* UIWindow+PVAnimationSwitchRootViewController.h in Headers */,
179-
50A1C662224D6747003A8554 /* UIApplication+PVRootWindow.h in Headers */,
180190
50DE24A41FA55E5100DFE080 /* AnimationSwitchRootViewControllerObjC.h in Headers */,
181191
);
182192
runOnlyForDeploymentPostprocessing = 0;
@@ -256,7 +266,7 @@
256266
isa = PBXProject;
257267
attributes = {
258268
LastSwiftUpdateCheck = 0900;
259-
LastUpgradeCheck = 1020;
269+
LastUpgradeCheck = 1240;
260270
ORGANIZATIONNAME = ProVir;
261271
TargetAttributes = {
262272
50DE24861FA55D5700DFE080 = {
@@ -336,8 +346,6 @@
336346
isa = PBXSourcesBuildPhase;
337347
buildActionMask = 2147483647;
338348
files = (
339-
50A1C663224D674E003A8554 /* UIApplication+PVRootWindow.m in Sources */,
340-
50A1C661224D66E5003A8554 /* UIWindow+PVAnimationSwitchRootViewController.m in Sources */,
341349
);
342350
runOnlyForDeploymentPostprocessing = 0;
343351
};
@@ -406,6 +414,7 @@
406414
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
407415
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
408416
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
417+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
409418
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
410419
CLANG_WARN_STRICT_PROTOTYPES = YES;
411420
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -432,7 +441,7 @@
432441
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
433442
GCC_WARN_UNUSED_FUNCTION = YES;
434443
GCC_WARN_UNUSED_VARIABLE = YES;
435-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
444+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
436445
MTL_ENABLE_DEBUG_INFO = YES;
437446
ONLY_ACTIVE_ARCH = YES;
438447
SDKROOT = iphoneos;
@@ -466,6 +475,7 @@
466475
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
467476
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
468477
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
478+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
469479
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
470480
CLANG_WARN_STRICT_PROTOTYPES = YES;
471481
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -486,7 +496,7 @@
486496
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
487497
GCC_WARN_UNUSED_FUNCTION = YES;
488498
GCC_WARN_UNUSED_VARIABLE = YES;
489-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
499+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
490500
MTL_ENABLE_DEBUG_INFO = NO;
491501
SDKROOT = iphoneos;
492502
SWIFT_COMPILATION_MODE = wholemodule;

‎AnimationSwitchRootViewController.xcodeproj/xcshareddata/xcschemes/AnimationSwitchRootViewController.xcscheme‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:AnimationSwitchRootViewController.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

‎AnimationSwitchRootViewController.xcodeproj/xcshareddata/xcschemes/AnimationSwitchRootViewControllerObjC.xcscheme‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer = "container:AnimationSwitchRootViewController.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration = "Release"

AnimationSwitchRootViewController/AnimationSwitchRootViewController.h renamed to AnimationSwitchRootViewController/ObjC/AnimationSwitchRootViewController.h

File renamed without changes.

AnimationSwitchRootViewController/UIApplication+PVRootWindow.h renamed to AnimationSwitchRootViewController/ObjC/UIApplication+PVRootWindow.h

File renamed without changes.

AnimationSwitchRootViewController/UIApplication+PVRootWindow.m renamed to AnimationSwitchRootViewController/ObjC/UIApplication+PVRootWindow.m

File renamed without changes.

AnimationSwitchRootViewController/UIWindow+PVAnimationSwitchRootViewController.h renamed to AnimationSwitchRootViewController/ObjC/UIWindow+PVAnimationSwitchRootViewController.h

File renamed without changes.

AnimationSwitchRootViewController/UIWindow+PVAnimationSwitchRootViewController.m renamed to AnimationSwitchRootViewController/ObjC/UIWindow+PVAnimationSwitchRootViewController.m

File renamed without changes.

0 commit comments

Comments
 (0)