Skip to content

Swift Package Manager correct adaptation #121

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

Open
TomchyshenDenys wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Swift Package Manager correct adaptation #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5898c8a
SPM asset warning - Resolved a warning by moving out the Info.plist. …
nakajijapan Jul 29, 2021
e979865
Merge branch 'feature/SPM-asset-warning'
TomchyshenDenys Nov 2, 2021
49c4b89
Reverted Info.plist back
TomchyshenDenys Nov 2, 2021
ead579f
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
5a12b80
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
06e24ef
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
fb57d25
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
09c393e
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
9013b14
Resolved info.plist warning
TomchyshenDenys Nov 2, 2021
252df98
Updated Kingsfisher
TomchyshenDenys Nov 2, 2021
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
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ let package = Package(
.library(name: "PhotoSlider", targets: ["PhotoSlider"])
],
dependencies: [
.package(url: "git@github.com:onevcat/Kingfisher.git", from: "6.3.0")
.package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0")
],
targets: [
.target(
name: "PhotoSlider",
dependencies: ["Kingfisher"],
path: "Sources",
exclude: ["Support"],
resources: [
.process("PhotoSlider.xcassets")
]
Expand Down
34 changes: 25 additions & 9 deletions PhotoSlider.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,20 @@
/* Begin PBXBuildFile section */
94530E041E247C6100D12C16 /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94530E031E247C6100D12C16 /* ImageLoader.swift */; };
94530E141E247CA300D12C16 /* KingfisherImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94530E131E247CA300D12C16 /* KingfisherImageLoader.swift */; };
B012C9C926B0EB5A00914DF2 /* PhotoSlider.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */; };
B05F013726AEA845005519C5 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = B05F013626AEA845005519C5 /* Kingfisher */; };
DC0E42021C3182080090AC94 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41C71C317E850090AC94 /* ImageView.swift */; };
DC0E42031C3182090090AC94 /* Photo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41C81C317E850090AC94 /* Photo.swift */; };
DC0E42041C31820C0090AC94 /* ProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41C91C317E850090AC94 /* ProgressView.swift */; };
DC0E42051C3182110090AC94 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41CA1C317E850090AC94 /* ViewController.swift */; };
DC0E42061C3182130090AC94 /* ZoomingAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0E41CB1C317E850090AC94 /* ZoomingAnimationController.swift */; };
DC3EE1DB1D9C96610046AFE2 /* UIImage+PhotoSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3EE1DA1D9C96610046AFE2 /* UIImage+PhotoSlider.swift */; };
EF51ECD727315C1600F8F19B /* PhotoSlider.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
94530E031E247C6100D12C16 /* ImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageLoader.swift; sourceTree = "<group>"; };
94530E131E247CA300D12C16 /* KingfisherImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KingfisherImageLoader.swift; sourceTree = "<group>"; };
B012C9C626B0E4D800914DF2 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PhotoSlider.xcassets; sourceTree = "<group>"; };
B05F013326AEA670005519C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = "<group>"; };
B05F013426AEA670005519C5 /* PhotoSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PhotoSlider.h; path = Sources/PhotoSlider.h; sourceTree = "<group>"; };
DC0E41C71C317E850090AC94 /* ImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = "<group>"; };
DC0E41C81C317E850090AC94 /* Photo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Photo.swift; sourceTree = "<group>"; };
Expand All @@ -34,6 +32,8 @@
DC0E41F31C3181230090AC94 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = "<group>"; };
DC0E41FA1C3181EE0090AC94 /* PhotoSlider.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhotoSlider.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DC3EE1DA1D9C96610046AFE2 /* UIImage+PhotoSlider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+PhotoSlider.swift"; sourceTree = "<group>"; };
EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = PhotoSlider.xcassets; sourceTree = "<group>"; };
EFE7939727316B7E009E98EE /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -51,7 +51,6 @@
B012C9C726B0E70600914DF2 /* PhotoSlider */ = {
isa = PBXGroup;
children = (
B012C9C826B0EB5A00914DF2 /* PhotoSlider.xcassets */,
DC0E41C51C317E850090AC94 /* Classes */,
);
path = PhotoSlider;
Expand All @@ -60,7 +59,6 @@
DC0E419E1C317DD50090AC94 = {
isa = PBXGroup;
children = (
B05F013326AEA670005519C5 /* Info.plist */,
B05F013426AEA670005519C5 /* PhotoSlider.h */,
B012C9C626B0E4D800914DF2 /* Package.swift */,
DC0E41BF1C317E850090AC94 /* Sources */,
Expand All @@ -80,6 +78,8 @@
DC0E41BF1C317E850090AC94 /* Sources */ = {
isa = PBXGroup;
children = (
EFE7939627316B7E009E98EE /* Support */,
EF51ECD627315C1600F8F19B /* PhotoSlider.xcassets */,
B012C9C726B0E70600914DF2 /* PhotoSlider */,
);
path = Sources;
Expand Down Expand Up @@ -108,6 +108,14 @@
name = Frameworks;
sourceTree = "<group>";
};
EFE7939627316B7E009E98EE /* Support */ = {
isa = PBXGroup;
children = (
EFE7939727316B7E009E98EE /* Info.plist */,
);
path = Support;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -183,7 +191,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B012C9C926B0EB5A00914DF2 /* PhotoSlider.xcassets in Resources */,
EF51ECD727315C1600F8F19B /* PhotoSlider.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -212,6 +220,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_INCLUDE_INFOPLIST_LOCALIZATIONS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -256,6 +265,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
INFOPLIST_OUTPUT_FORMAT = "same-as-input";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -269,6 +280,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_INCLUDE_INFOPLIST_LOCALIZATIONS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -307,6 +319,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
INFOPLIST_OUTPUT_FORMAT = "same-as-input";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand All @@ -327,7 +341,8 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Sources/Info.plist;
INFOPLIST_FILE = Sources/Support/Info.plist;
INFOPLIST_OUTPUT_FORMAT = "same-as-input";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -355,7 +370,8 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Sources/Info.plist;
INFOPLIST_FILE = Sources/Support/Info.plist;
INFOPLIST_OUTPUT_FORMAT = "same-as-input";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -402,7 +418,7 @@
repositoryURL = "git@github.com:onevcat/Kingfisher.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.3.0;
minimumVersion = 7.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
7 changes: 7 additions & 0 deletions PhotoSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
16 changes: 16 additions & 0 deletions PhotoSlider.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
25 changes: 25 additions & 0 deletions PhotoSliderDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...Slider/PhotoSlider.xcassets/Contents.json → Sources/PhotoSlider.xcassets/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...s/PhotoSliderClose.imageset/Contents.json → ...s/PhotoSliderClose.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/PhotoSliderClose.imageset/close.pdf → ...ssets/PhotoSliderClose.imageset/close.pdf
View file
Open in desktop
File renamed without changes.
0 ...s/PhotoSliderShare.imageset/Contents.json → ...s/PhotoSliderShare.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...PhotoSliderShare.imageset/ShareButton.pdf → ...PhotoSliderShare.imageset/ShareButton.pdf
View file
Open in desktop
File renamed without changes.
0 Sources/Info.plist → Sources/Support/Info.plist
View file
Open in desktop
File renamed without changes.