Skip to content
This repository has been archived by the owner on May 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4 from hisaac/development
Browse files Browse the repository at this point in the history 
Release version 1.1.0
  • Loading branch information
@hisaac
hisaac committed Sep 8, 2020
2 parents e42a524 + 2c3e649 commit e4802f4
Show file tree
Hide file tree
Showing 15 changed files with 180 additions and 231 deletions.
31 changes: 2 additions & 29 deletions .swiftlint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ opt_in_rules:
- number_separator
- operator_usage_whitespace
- redundant_nil_coalescing
- trailing_whitespace
- unneeded_parentheses_in_closure_argument

disabled_rules:
- closure_end_indentation
- function_parameter_count
- identifier_name
- redundant_string_enum_value
- superfluous_disable_comman
- superfluous_disable_command
- unused_closure_parameter

excluded:
Expand All @@ -31,31 +32,3 @@ line_length:

file_length:
ignore_comment_only_lines: true

# via: https://github.com/SwiftGen/SwiftGen/blob/master/Documentation/Articles/SwiftLint-Integration.md
custom_rules:
swiftgen_assets:
name: "SwiftGen Assets"
regex: '(UIImage|UIColor)(\.init)?\(named: ?"?.+"?(, ?in:.+?, ?compatibleWith:.+?)?\)|#imageLiteral\(resourceName: ?".+"\)'
message: "Use Asset.<asset> instead"
severity: error
swiftgen_colors:
name: "SwiftGen Colors"
regex: '(UIColor(\.init)?|#colorLiteral)\(((red|displayP3Red):.+?,green:.+?,blue:.+?,alpha:.+?)|(white:.+?,alpha:.+?)|(hue:.+?,saturation:.+?,brightness:.+?,alpha:.+?)\)'
message: "Use ColorName.<color> instead"
severity: error
swiftgen_fonts:
name: "SwiftGen Fonts"
regex: 'UIFont(\.init)?\(name: ?"?.+"?, ?size:.+?\)'
message: "Use FontFamily.<family>.<variant>.size(<size>) instead"
severity: error
swiftgen_storyboards:
name: "SwiftGen Storyboard Scenes"
regex: '(UIStoryboard\(name: ?"?.+"?, ?bundle:.+\))|(instantiateViewController\(withIdentifier:.+?\))|(instantiateInitialViewController\(\))'
message: "Use StoryboardScene.<storyboad>.<scene>.instantiate() instead"
severity: error
swiftgen_strings:
name: "SwiftGen Strings"
regex: 'NSLocalizedString'
message: "Use L10n.key instead"
severity: error
81 changes: 29 additions & 52 deletions PlainPasta.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,31 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 53;
objects = {

/* Begin PBXBuildFile section */
4A4E59272176AE7A002CF83D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4E59262176AE7A002CF83D /* AppDelegate.swift */; };
4A4E592B2176AE7A002CF83D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A4E592A2176AE7A002CF83D /* Assets.xcassets */; };
4A4E592E2176AE7A002CF83D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A4E592C2176AE7A002CF83D /* Main.storyboard */; };
4A5E917A2179183E001C378F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4A5E917C2179183E001C378F /* Localizable.strings */; };
4A5E9180217918A5001C378F /* Localizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A5E917F217918A5001C378F /* Localizable.swift */; };
4AA984F42178DF6500B64A3F /* PasteboardMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AA984F32178DF6500B64A3F /* PasteboardMonitor.swift */; };
4ADE040D24ECC23F0045181C /* Localizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ADE040C24ECC23F0045181C /* Localizable.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
4A4E59232176AE7A002CF83D /* Plain Pasta.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Plain Pasta.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4A4E59262176AE7A002CF83D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4A4E592A2176AE7A002CF83D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4A4E592F2176AE7A002CF83D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4A4E59302176AE7A002CF83D /* PlainPasta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PlainPasta.entitlements; sourceTree = "<group>"; };
4A5E9178217917A5001C378F /* swiftgen.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = swiftgen.yml; sourceTree = "<group>"; };
4A5E917B2179183E001C378F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
4A5E917E2179186D001C378F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
4A5E917F217918A5001C378F /* Localizable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Localizable.swift; sourceTree = "<group>"; };
4A8A68162176C5F500A4F1D8 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
4A8A68172176C5F500A4F1D8 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
4A8A68182176C5F500A4F1D8 /* changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = changelog.md; sourceTree = "<group>"; };
4A8A68192176C5F500A4F1D8 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
4A8A681A2176C5F500A4F1D8 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
4A9998E325040BE700141546 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
4AA984F32178DF6500B64A3F /* PasteboardMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardMonitor.swift; sourceTree = "<group>"; };
4ADE040C24ECC23F0045181C /* Localizable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Localizable.swift; sourceTree = "<group>"; };
F2E4F2ED22AED9E0006313B9 /* Plain Pasta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Plain Pasta.entitlements"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -58,7 +55,6 @@
4A8A68182176C5F500A4F1D8 /* changelog.md */,
4A4E59252176AE7A002CF83D /* PlainPasta */,
4A8A68192176C5F500A4F1D8 /* LICENSE */,
4A5E9178217917A5001C378F /* swiftgen.yml */,
4A8A68172176C5F500A4F1D8 /* .swiftlint.yml */,
4A8A68162176C5F500A4F1D8 /* .gitignore */,
4A4E59242176AE7A002CF83D /* Products */,
Expand All @@ -80,12 +76,11 @@
children = (
4A4E59262176AE7A002CF83D /* AppDelegate.swift */,
4AA984F32178DF6500B64A3F /* PasteboardMonitor.swift */,
4A5E917F217918A5001C378F /* Localizable.swift */,
4ADE040C24ECC23F0045181C /* Localizable.swift */,
4A4E592A2176AE7A002CF83D /* Assets.xcassets */,
4A4E592C2176AE7A002CF83D /* Main.storyboard */,
4A4E592F2176AE7A002CF83D /* Info.plist */,
4A4E59302176AE7A002CF83D /* PlainPasta.entitlements */,
4A5E917C2179183E001C378F /* Localizable.strings */,
F2E4F2ED22AED9E0006313B9 /* Plain Pasta.entitlements */,
);
path = PlainPasta;
sourceTree = "<group>";
Expand All @@ -97,11 +92,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 4A4E59332176AE7A002CF83D /* Build configuration list for PBXNativeTarget "Plain Pasta" */;
buildPhases = (
4A5E917621791728001C378F /* [Swiftgen] */,
4A5E917721791748001C378F /* [Swiftlint] */,
4A4E591F2176AE7A002CF83D /* Sources */,
4A4E59202176AE7A002CF83D /* Frameworks */,
4A4E59212176AE7A002CF83D /* Resources */,
4A5E917721791748001C378F /* Run Swiftlint */,
);
buildRules = (
);
Expand All @@ -119,21 +113,25 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1000;
LastUpgradeCheck = 1000;
LastUpgradeCheck = 1200;
ORGANIZATIONNAME = Levelsoft;
TargetAttributes = {
4A4E59222176AE7A002CF83D = {
CreatedOnToolsVersion = 10.0;
LastSwiftMigration = 1200;
SystemCapabilities = {
com.apple.Sandbox = {
com.apple.Push = {
enabled = 0;
};
com.apple.Sandbox = {
enabled = 1;
};
};
};
};
};
buildConfigurationList = 4A4E591E2176AE7A002CF83D /* Build configuration list for PBXProject "PlainPasta" */;
compatibilityVersion = "Xcode 10.0";
compatibilityVersion = "Xcode 11.4";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Expand All @@ -155,15 +153,14 @@
buildActionMask = 2147483647;
files = (
4A4E592B2176AE7A002CF83D /* Assets.xcassets in Resources */,
4A5E917A2179183E001C378F /* Localizable.strings in Resources */,
4A4E592E2176AE7A002CF83D /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
4A5E917621791728001C378F /* [Swiftgen] */ = {
4A5E917721791748001C378F /* Run Swiftlint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -172,25 +169,7 @@
);
inputPaths = (
);
name = "[Swiftgen]";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftgen >/dev/null; then\n swiftgen\nelse\n echo \"warning: SwiftGen not installed, download it from https://github.com/SwiftGen/SwiftGen\"\nfi\n";
};
4A5E917721791748001C378F /* [Swiftlint] */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[Swiftlint]";
name = "Run Swiftlint";
outputFileListPaths = (
);
outputPaths = (
Expand All @@ -207,7 +186,7 @@
buildActionMask = 2147483647;
files = (
4A4E59272176AE7A002CF83D /* AppDelegate.swift in Sources */,
4A5E9180217918A5001C378F /* Localizable.swift in Sources */,
4ADE040D24ECC23F0045181C /* Localizable.swift in Sources */,
4AA984F42178DF6500B64A3F /* PasteboardMonitor.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -218,19 +197,11 @@
4A4E592C2176AE7A002CF83D /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
4A5E917E2179186D001C378F /* en */,
4A9998E325040BE700141546 /* en */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
4A5E917C2179183E001C378F /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
4A5E917B2179183E001C378F /* en */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -260,6 +231,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -285,7 +257,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -321,6 +293,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -340,7 +313,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
Expand All @@ -353,10 +326,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "PlainPasta/Plain Pasta.entitlements";
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = F2J52QJQ9Y;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/PlainPasta/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -366,18 +341,20 @@
PRODUCT_BUNDLE_IDENTIFIER = software.level.PlainPasta;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
4A4E59352176AE7A002CF83D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "PlainPasta/Plain Pasta.entitlements";
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = F2J52QJQ9Y;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/PlainPasta/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -387,7 +364,7 @@
PRODUCT_BUNDLE_IDENTIFIER = software.level.PlainPasta;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion PlainPasta.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

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

15 changes: 1 addition & 14 deletions PlainPasta.xcodeproj/xcshareddata/xcschemes/Plain Pasta.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -29,17 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4A4E59222176AE7A002CF83D"
BuildableName = "Plain Pasta.app"
BlueprintName = "Plain Pasta"
ReferencedContainer = "container:PlainPasta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +50,6 @@
ReferencedContainer = "container:PlainPasta.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading

0 comments on commit e4802f4

Please sign in to comment.