Skip to content

Commit

Permalink
Merge branch 'ish-app-master' into dev
Browse files Browse the repository at this point in the history 
Upstream merge
  • Loading branch information
Mike Miller committed Oct 30, 2022
2 parents 50eaba1 + e73525e commit 02b6bd0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion deps/aports/community/x86/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APKINDEX-v3.14-2022-10-22.tar.gz
APKINDEX-v3.14-2022-10-28.tar.gz
2 changes: 1 addition & 1 deletion deps/aports/main/x86/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APKINDEX-v3.14-2022-10-22.tar.gz
APKINDEX-v3.14-2022-10-28.tar.gz
32 changes: 16 additions & 16 deletions iSH-AOK.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2476,7 +2476,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BB0B85A42586F1CB00208600 /* ProjectDebug.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEAD_CODE_STRIPPING = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
Expand All @@ -2486,7 +2486,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BB0B85A52586F1E100208600 /* ProjectRelease.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEAD_CODE_STRIPPING = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -2501,7 +2501,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2527,7 +2527,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2548,7 +2548,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BB28C7532689522C00BDC834 /* ProjectDebugLinux.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEAD_CODE_STRIPPING = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
};
Expand All @@ -2562,7 +2562,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2586,7 +2586,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK";
PRODUCT_NAME = "iSH-AOK";
Expand All @@ -2610,7 +2610,7 @@
CODE_SIGN_ENTITLEMENTS = app/FileProvider/iSHFileProvider.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
INFOPLIST_FILE = app/FileProvider/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK.FileProvider";
Expand Down Expand Up @@ -2720,7 +2720,7 @@
CODE_SIGN_ENTITLEMENTS = app/FileProvider/iSHFileProvider.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
INFOPLIST_FILE = app/FileProvider/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK.FileProvider";
Expand All @@ -2738,7 +2738,7 @@
CODE_SIGN_ENTITLEMENTS = iSHFileProviderRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
INFOPLIST_FILE = app/FileProvider/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK.FileProvider";
Expand Down Expand Up @@ -2841,7 +2841,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK";
PRODUCT_NAME = "iSH-AOK";
Expand All @@ -2855,7 +2855,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK";
PRODUCT_NAME = "iSH-AOK";
Expand All @@ -2867,7 +2867,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BB28C7522689522700BDC834 /* ProjectReleaseLinux.xcconfig */;
buildSettings = {
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEAD_CODE_STRIPPING = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -2882,7 +2882,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -2905,7 +2905,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK";
PRODUCT_NAME = "iSH-AOK";
Expand All @@ -2929,7 +2929,7 @@
CODE_SIGN_ENTITLEMENTS = app/FileProvider/iSHFileProvider.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UYU5FM4LQ4;
INFOPLIST_FILE = app/FileProvider/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "app.ish.iSH-AOK.FileProvider";
Expand Down

0 comments on commit 02b6bd0

Please sign in to comment.