Skip to content

Commit

Permalink
1. Change dependency manager from CocoaPods to SPM
Browse files Browse the repository at this point in the history 
2. Build for both X86 and ARM arch
3. Update version to 1.0.7
  • Loading branch information
@kyleduo
kyleduo committed Nov 16, 2023
1 parent 6b54f4e commit 49cb42e
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 106 deletions.
12 changes: 0 additions & 12 deletions source/Podfile
View file

This file was deleted.

16 changes: 0 additions & 16 deletions source/Podfile.lock
View file

This file was deleted.

112 changes: 45 additions & 67 deletions source/tinypng4mac.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
1D843D7CE0609BA7B4F65DB9 /* Pods_TinyPNG4Mac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811CF203124A83759CC63BFF /* Pods_TinyPNG4Mac.framework */; };
272AC1AD1ED2BA5C0005E7D5 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A949CA1D2C02BA0043DECE /* MainViewController.swift */; };
272AC1AF1ED335470005E7D5 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272AC1AE1ED335470005E7D5 /* GradientView.swift */; };
272C50A01D2D545300EEECC2 /* SpinnerProgressIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272C509F1D2D545300EEECC2 /* SpinnerProgressIndicator.swift */; };
Expand All @@ -29,6 +28,7 @@
27C12A171D35411800F0FD81 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27C12A151D35411800F0FD81 /* Localizable.strings */; };
27F5BA4B206B7021008529C9 /* TPWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27F5BA4A206B7021008529C9 /* TPWindow.swift */; };
27F5BA4E206B7373008529C9 /* PasteboardTypeExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27F5BA4D206B7373008529C9 /* PasteboardTypeExtension.swift */; };
6CA029632B05CC620032D90B /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 6CA029622B05CC620032D90B /* Alamofire */; };
BCFA8CDD233BC9BC0082F4C4 /* FileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCFA8CDC233BC9BC0082F4C4 /* FileInfo.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -58,9 +58,7 @@
27C12A1A1D3541DA00F0FD81 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
27F5BA4A206B7021008529C9 /* TPWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TPWindow.swift; sourceTree = "<group>"; };
27F5BA4D206B7373008529C9 /* PasteboardTypeExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardTypeExtension.swift; sourceTree = "<group>"; };
3EC4E906FA6863DD0D5839DA /* Pods-TinyPNG4Mac.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TinyPNG4Mac.release.xcconfig"; path = "Pods/Target Support Files/Pods-TinyPNG4Mac/Pods-TinyPNG4Mac.release.xcconfig"; sourceTree = "<group>"; };
811CF203124A83759CC63BFF /* Pods_TinyPNG4Mac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TinyPNG4Mac.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B8A32DFEB3E5214A1AADE38D /* Pods-TinyPNG4Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TinyPNG4Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TinyPNG4Mac/Pods-TinyPNG4Mac.debug.xcconfig"; sourceTree = "<group>"; };
BCFA8CDC233BC9BC0082F4C4 /* FileInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileInfo.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -69,7 +67,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1D843D7CE0609BA7B4F65DB9 /* Pods_TinyPNG4Mac.framework in Frameworks */,
6CA029632B05CC620032D90B /* Alamofire in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -81,7 +79,6 @@
children = (
277AAF511D23F24900788F37 /* tinypng4mac */,
277AAF501D23F24900788F37 /* Products */,
598597DBDE3F9EA48148E86C /* Pods */,
9D9DE7AAFF16AD3FF311386F /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -164,15 +161,6 @@
path = extensions;
sourceTree = "<group>";
};
598597DBDE3F9EA48148E86C /* Pods */ = {
isa = PBXGroup;
children = (
B8A32DFEB3E5214A1AADE38D /* Pods-TinyPNG4Mac.debug.xcconfig */,
3EC4E906FA6863DD0D5839DA /* Pods-TinyPNG4Mac.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
9D9DE7AAFF16AD3FF311386F /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand All @@ -188,17 +176,18 @@
isa = PBXNativeTarget;
buildConfigurationList = 277AAF5E1D23F24900788F37 /* Build configuration list for PBXNativeTarget "TinyPNG4Mac" */;
buildPhases = (
560DF08D8EECAFD36EAA6AF5 /* [CP] Check Pods Manifest.lock */,
277AAF4B1D23F24900788F37 /* Sources */,
277AAF4C1D23F24900788F37 /* Frameworks */,
277AAF4D1D23F24900788F37 /* Resources */,
5B420B6B1C8EFF2B07BE8D63 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = TinyPNG4Mac;
packageProductDependencies = (
6CA029622B05CC620032D90B /* Alamofire */,
);
productName = tinypng;
productReference = 277AAF4F1D23F24900788F37 /* TinyPNG4Mac.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -229,6 +218,9 @@
"zh-Hans",
);
mainGroup = 277AAF461D23F24900788F37;
packageReferences = (
6CA029612B05CC620032D90B /* XCRemoteSwiftPackageReference "Alamofire" */,
);
productRefGroup = 277AAF501D23F24900788F37 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -252,45 +244,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
560DF08D8EECAFD36EAA6AF5 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-TinyPNG4Mac-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
5B420B6B1C8EFF2B07BE8D63 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-TinyPNG4Mac/Pods-TinyPNG4Mac-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TinyPNG4Mac/Pods-TinyPNG4Mac-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
277AAF4B1D23F24900788F37 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -443,22 +396,26 @@
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
};
name = Release;
};
277AAF5F1D23F24900788F37 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B8A32DFEB3E5214A1AADE38D /* Pods-TinyPNG4Mac.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
INFOPLIST_FILE = tinypng4mac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MARKETING_VERSION = 1.0.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0.7;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.kyleduo.tinypngmac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -467,15 +424,17 @@
};
277AAF601D23F24900788F37 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 3EC4E906FA6863DD0D5839DA /* Pods-TinyPNG4Mac.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
INFOPLIST_FILE = tinypng4mac/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MARKETING_VERSION = 1.0.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.0.7;
PRODUCT_BUNDLE_IDENTIFIER = com.kyleduo.tinypngmac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -504,6 +463,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
6CA029612B05CC620032D90B /* XCRemoteSwiftPackageReference "Alamofire" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Alamofire/Alamofire";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.8.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
6CA029622B05CC620032D90B /* Alamofire */ = {
isa = XCSwiftPackageProductDependency;
package = 6CA029612B05CC620032D90B /* XCRemoteSwiftPackageReference "Alamofire" */;
productName = Alamofire;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 277AAF471D23F24900788F37 /* Project object */;
}
2 changes: 1 addition & 1 deletion source/tinypng4mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

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

0 ...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
View file
File renamed without changes.
14 changes: 14 additions & 0 deletions source/tinypng4mac.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"pins" : [
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire",
"state" : {
"revision" : "3dc6a42c7727c49bf26508e29b0a0b35f9c7e1ad",
"version" : "5.8.1"
}
}
],
"version" : 2
}
10 changes: 0 additions & 10 deletions source/tinypng4mac.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

0 comments on commit 49cb42e

Please sign in to comment.