Skip to content

Commit

Permalink
Merge pull request #779 from Sequel-Ace/getRidOfCocoaPods
Browse files Browse the repository at this point in the history
Get rid of CocoaPods, switch FMDB to SPM, enable Swift standard libraries #changed
  • Loading branch information
Kaspik committed Jan 12, 2021
2 parents 656cc94 + 4ee1ddb commit 8f91391
Show file tree
Hide file tree
Showing 21 changed files with 139 additions and 379 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@
hasScannedForEncodings = 1;
knownRegions = (
en,
Base,
);
mainGroup = 0867D691FE84028FC02AAC07 /* SPMySQLFramework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// Jamie Kirkpatrick

#import <Cocoa/Cocoa.h>
#import "SRCommon.h"
#import <ShortcutRecorder/SRCommon.h>

#define SRMinWidth 50
#define SRMaxHeight 22
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// Jamie Kirkpatrick

#import <Cocoa/Cocoa.h>
#import "SRRecorderCell.h"
#import <ShortcutRecorder/SRRecorderCell.h>

@interface SRRecorderControl : NSControl
{
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
# Copyright © 2020 Sequel-Ace. All rights reserved.

source 'https://rubygems.org'
gem 'cocoapods', '~> 1.10'
gem 'fastlane', '~> 2.168'
113 changes: 0 additions & 113 deletions Podfile

This file was deleted.

31 changes: 0 additions & 31 deletions Podfile.lock

This file was deleted.

21 changes: 0 additions & 21 deletions Pods/SwiftLint/LICENSE

This file was deleted.

Binary file removed Pods/SwiftLint/swiftlint
Binary file not shown.
62 changes: 31 additions & 31 deletions Resources/Localization/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
"An error occurred while trying to delete the index.\n\nMySQL said: %@" = "An error occurred while trying to delete the index.\n\nMySQL said: %@";

/* table status : row count query failed : error message */
"An error occurred while trying to determine the number of rows for “%@”.\nMySQL said: %@ (%lu)" = "An error occurred while trying to determine the number of rows for “%1$@”.\nMySQL said: %2$@ (%3$lu)";
"An error occurred while trying to determine the number of rows for %@.\nMySQL said: %@ (%lu)" = "An error occurred while trying to determine the number of rows for “%1$@”.\nMySQL said: %2$@ (%3$lu)";

/* unable to rename database message informative message */
"An error occurred while trying to rename the database '%@' to '%@'." = "An error occurred while trying to rename the database '%1$@' to '%2$@'.";
Expand Down Expand Up @@ -463,8 +463,8 @@
/* clear global history list informative message */
"Are you sure you want to clear the global history list? This action cannot be undone." = "Are you sure you want to clear the global history list? This action cannot be undone.";

/* clear history list for “%@” informative message */
"Are you sure you want to clear the history list for “%@”? This action cannot be undone." = "Are you sure you want to clear the history list for “%@”? This action cannot be undone.";
/* clear history list for %@ informative message */
"Are you sure you want to clear the history list for %@? This action cannot be undone." = "Are you sure you want to clear the history list for %@? This action cannot be undone.";

/* truncate tables informative message */
"Are you sure you want to delete ALL records in the selected tables? This operation cannot be undone." = "Are you sure you want to delete ALL records in the selected tables? This operation cannot be undone.";
Expand Down Expand Up @@ -566,7 +566,7 @@
"BUNDLES" = "BUNDLES";

/* Bundle Editor : Outline View : Menu Category item : tooltip */
"Bundles in category “%@”" = "Bundles in category “%@”";
"Bundles in category %@" = "Bundles in category %@";

/* bundles installation error */
"Bundles Installation Error" = "Bundles Installation Error";
Expand Down Expand Up @@ -666,8 +666,8 @@
/* clear global history menu item title */
"Clear Global History" = "Clear Global History";

/* clear history for “%@” menu title */
"Clear History for “%@”" = "Clear History for “%@”";
/* clear history for %@ menu title */
"Clear History for %@" = "Clear History for %@";

/* clear history message */
"Clear History?" = "Clear History?";
Expand Down Expand Up @@ -730,7 +730,7 @@
"Connection data file couldn't be read." = "Connection data file couldn't be read.";

/* message error while reading connection data file and suggesting to save it under a differnet name */
"Connection data file “%@” couldn't be read. Please try to save the document under a different name." = "Connection data file “%@” couldn't be read. Please try to save the document under a different name.";
"Connection data file %@ couldn't be read. Please try to save the document under a different name." = "Connection data file %@ couldn't be read. Please try to save the document under a different name.";

/* connection failed title */
"Connection failed!" = "Connection failed!";
Expand Down Expand Up @@ -1153,7 +1153,7 @@
"Enter connection details below, or choose a favorite" = "Enter connection details below, or choose a favorite";

/* SSH key password prompt */
"Enter your password for the SSH key\n\"%@\"" = "Enter your password for the SSH key\n\"%@\"";
"Enter your password for the SSH key\n\"%@\"" = "Enter your password for the SSH key\n'%@";

/* Bundle Editor : Fallback Input source dropdown : 'entire content' item
Bundle Editor : Scope=Field : Input source dropdown: 'entire content' item */
Expand Down Expand Up @@ -1273,9 +1273,9 @@
"Error while installing color theme file" = "Error while installing color theme file";

/* Bundle Editor : Trash-Bundle(s)-Error : error dialog title
error while moving “%@” to trash
error while moving %@ to trash
Open Files : Bundle : Already-Installed : Delete-Old-Error : Could not delete old bundle before installing new version. */
"Error while moving “%@” to Trash." = "Error while moving “%@” to Trash.";
"Error while moving %@ to Trash." = "Error while moving %@ to Trash.";

/* error while optimizing selected items message */
"Error while optimizing selected items" = "Error while optimizing selected items";
Expand All @@ -1296,7 +1296,7 @@
"Error while saving the Bundle." = "Error while saving the Bundle.";

/* Bundle Editor : Save-and-Close-Error : error dialog title */
"Error while saving “%@”." = "Error while saving “%@”.";
"Error while saving %@." = "Error while saving %@.";

/* Errors title */
"Errors" = "Errors";
Expand Down Expand Up @@ -1477,7 +1477,7 @@
"Gzip compression" = "Gzip compression";

/* MySQL Help Viewer : Results list : Page title */
"Help topics for “%@”" = "Help topics for “%@”";
"Help topics for %@" = "Help topics for %@";

/* hide console */
"Hide Console" = "Hide Console";
Expand Down Expand Up @@ -1939,8 +1939,8 @@
Tables List : Gear Menu : Duplicate connection to new window */
"Open View in New Window" = "Open View in New Window";

/* menu item open “%@” in new window */
"Open “%@” in New Window" = "Open “%@” in New Window";
/* menu item open %@ in new window */
"Open %@ in New Window" = "Open %@ in New Window";

/* OPTIMIZE one or more tables - result title */
"Optimize %@" = "Optimize %@";
Expand Down Expand Up @@ -2382,7 +2382,7 @@
"Show Detail" = "Show Detail";

/* MySQL Help Viewer : Results list : Link tooltip */
"Show MySQL help for “%@”" = "Show MySQL help for “%@”";
"Show MySQL help for %@" = "Show MySQL help for %@";

/* show navigator */
"Show Navigator" = "Show Navigator";
Expand Down Expand Up @@ -2672,7 +2672,7 @@
"In these files:\n\n%@\n\nDo you still want to install the bundle?" = "In these files:\n\n%@\n\nDo you still want to install the bundle?";

/* message while reading a spf file which matches non-supported formats. */
"The chosen file “%@” contains ‘%@’ data." = "The chosen file “%1$@” contains ‘%2$@’ data.";
"The chosen file %@ contains ‘%@’ data." = "The chosen file “%1$@” contains ‘%2$@’ data.";

/* the color theme ‘%@’ already exists. */
"The color theme ‘%@’ already exists." = "The color theme ‘%@’ already exists.";
Expand All @@ -2699,7 +2699,7 @@
"The current color theme is unsaved. Do you want to proceed without saving it?" = "The current color theme is unsaved. Do you want to proceed without saving it?";

/* Short important release note for swap of custom query buttons */
"The Custom Query \"Run\" and \"Run All\" button positions and their shortcuts have been swapped." = "The Custom Query \"Run\" and \"Run All\" button positions and their shortcuts have been swapped.";
"The Custom Query \"Run\" and \"Run All\" button positions and their shortcuts have been swapped." = "The Custom Query Run and Run All button positions and their shortcuts have been swapped.";

/* the following default bundles were updated:\n%@\nyour modifications were stored as “(user)”. */
"The following default Bundles were updated:\n%@\nYour modifications were stored as “(user)”." = "The following default Bundles were updated:\n%@\nYour modifications were stored as “(user)”.";
Expand Down Expand Up @@ -2839,22 +2839,22 @@
"This is an alias for TINYINT(1)." = "This is an alias for TINYINT(1).";

/* Table Structure : Collation dropdown : database marker tooltip */
"This is the default collation of database “%@”." = "This is the default collation of database “%@”.";
"This is the default collation of database %@." = "This is the default collation of database %@.";

/* Table Structure : Collation dropdown : default marker tooltip */
"This is the default collation of encoding “%@”." = "This is the default collation of encoding “%@”.";
"This is the default collation of encoding %@." = "This is the default collation of encoding %@.";

/* Table Structure : Collation dropdown : table marker tooltip */
"This is the default collation of table “%@”." = "This is the default collation of table “%@”.";
"This is the default collation of table %@." = "This is the default collation of table %@.";

/* Table Structure : Collation dropdown : server marker tooltip */
"This is the default collation of this server." = "This is the default collation of this server.";

/* Table Structure : Encoding dropdown : database marker tooltip */
"This is the default encoding of database “%@”." = "This is the default encoding of database “%@”.";
"This is the default encoding of database %@." = "This is the default encoding of database %@.";

/* Table Structure : Encoding dropdown : table marker tooltip */
"This is the default encoding of table “%@”." = "This is the default encoding of table “%@”.";
"This is the default encoding of table %@." = "This is the default encoding of table %@.";

/* Table Structure : Encoding dropdown : server marker tooltip */
"This is the default encoding of this server." = "This is the default encoding of this server.";
Expand Down Expand Up @@ -3045,8 +3045,8 @@
/* URL scheme command was terminated by user */
"URL scheme command was terminated by user" = "URL scheme command was terminated by user";

/* URL scheme command “%@” unsupported */
"URL scheme command “%@” unsupported" = "URL scheme command “%@” unsupported";
/* URL scheme command %@ unsupported */
"URL scheme command %@ unsupported" = "URL scheme command %@ unsupported";

/* Use 127.0.0.1 button */
"Use 127.0.0.1" = "Use 127.0.0.1";
Expand Down Expand Up @@ -3154,22 +3154,22 @@
"‘%@’ Fields Content Filters" = "‘%@’ Fields Content Filters";

/* Export file already exists message */
"“%@” already exists. Do you want to replace it?" = "“%@” already exists. Do you want to replace it?";
"%@ already exists. Do you want to replace it?" = "%@ already exists. Do you want to replace it?";

/* Bundle Editor : Outline View : Bundle item : tooltip */
"“%@” Bundle" = "“%@” Bundle";
"%@ Bundle" = "%@ Bundle";

/* Export file creation error title */
"“%@” could not be created" = "“%@” could not be created";
"%@ could not be created" = "%@ could not be created";

/* “%@” couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item. */
"“%@” couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item." = "“%@” couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item.";
/* %@ couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item. */
"%@ couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item." = "%@ couldn't be parsed. You can edit the column setup but the column will not be shown in the Content view; please report this issue to the Sequel Ace team using the Help menu item.";

/* connection view : ssl : client cert file picker : wrong format error title */
"“%@” is not a valid client certificate file." = "“%@” is not a valid client certificate file.";
"%@ is not a valid client certificate file." = "%@ is not a valid client certificate file.";

/* connection view : ssl : key file picker : wrong format error title */
"“%@” is not a valid private key file." = "“%@” is not a valid private key file.";
"%@ is not a valid private key file." = "%@ is not a valid private key file.";

/* text shown when there are App Sandbox Issues */
"App Sandbox Issue" = "App Sandbox Issue";
Expand Down

0 comments on commit 8f91391

Please sign in to comment.