Skip to content

Xcode 10.2 #307

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

Merged
mattrubin merged 5 commits into from
Apr 12, 2019
Merged

Xcode 10.2 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc9c780
Upgrade OneTimePassword
mattrubin Apr 12, 2019
97301ba
Update project localization as recommended by Xcode 10.2
mattrubin Apr 12, 2019
3c1b109
Upgrade SimulatorStatusMagic
mattrubin Apr 12, 2019
909fba7
Upgrade xcconfigs
mattrubin Apr 12, 2019
0510a72
Defer Swift 5 migration
mattrubin Apr 12, 2019
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
25 changes: 5 additions & 20 deletions Authenticator.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@
C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = "<group>"; };
C944A5751A7F772600E08B1E /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
C944A5761A7F772600E08B1E /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
C944A5781A7F772600E08B1E /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
C944A57A1A7F772600E08B1E /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
C944A57B1A7F772600E08B1E /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
C944A57C1A7F772600E08B1E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
C94765081C646E5E00C7527E /* Cartfile.private */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
C959A63C190A69120042DEC0 /* Icon.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Icon.svg; sourceTree = "<group>"; };
C959A63E190A69E60042DEC0 /* GenerateIcons.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = GenerateIcons.sh; sourceTree = "<group>"; };
Expand Down Expand Up @@ -312,7 +308,6 @@
children = (
C944A5671A7F772500E08B1E /* Base */,
C944A5721A7F772600E08B1E /* iOS */,
C944A5771A7F772600E08B1E /* Mac OS X */,
);
name = Configuration;
path = Carthage/Checkouts/xcconfigs;
Expand All @@ -339,17 +334,6 @@
path = iOS;
sourceTree = "<group>";
};
C944A5771A7F772600E08B1E /* Mac OS X */ = {
isa = PBXGroup;
children = (
C944A5781A7F772600E08B1E /* Mac-Application.xcconfig */,
C944A57A1A7F772600E08B1E /* Mac-DynamicLibrary.xcconfig */,
C944A57B1A7F772600E08B1E /* Mac-Framework.xcconfig */,
C944A57C1A7F772600E08B1E /* Mac-StaticLibrary.xcconfig */,
);
path = "Mac OS X";
sourceTree = "<group>";
};
C9776E32185187E8003D53CB /* Docs */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -592,26 +576,27 @@
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = WD7ETSN9J9;
LastSwiftMigration = 0910;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
C9906A2D1812522100BAEF53 = {
LastSwiftMigration = 0910;
LastSwiftMigration = 1020;
TestTargetID = 1D6058900D05DD3D006BFB54;
};
C9A262CC1E170BD4004E6CEB = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 0910;
LastSwiftMigration = 1020;
TestTargetID = 1D6058900D05DD3D006BFB54;
};
};
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Authenticator" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
en,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration for Carthage (https://github.com/Carthage/Carthage)

github "jspahrsummers/xcconfigs"
github "jspahrsummers/xcconfigs" ~> 1.0
github "shinydevelopment/SimulatorStatusMagic"
8 changes: 4 additions & 4 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "SVProgressHUD/SVProgressHUD" "2.2.5"
github "jspahrsummers/xcconfigs" "0.12"
github "mattrubin/Base32" "xcode9"
github "mattrubin/OneTimePassword" "3.1.4"
github "shinydevelopment/SimulatorStatusMagic" "2.3.2"
github "jspahrsummers/xcconfigs" "1.0"
github "mattrubin/Base32" "1.1.2+xcode10.2"
github "mattrubin/OneTimePassword" "3.1.5"
github "shinydevelopment/SimulatorStatusMagic" "2.4.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Base32
Open in desktop
Submodule Base32 updated 10 files
+63 −4 .gitignore
+6 −5 Base32.xcodeproj/project.pbxproj
+8 −0 Base32.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+1 −1 Base32/Base32.h
+716 −3,638 Base32/en.lproj/MainMenu.xib
+3 −1 Cartfile.private
+1 −1 Cartfile.resolved
+1 −1 Carthage/Checkouts/xcconfigs
+1 −1 Configuration/Base32-macOS.xcconfig
+3 −1 Configuration/Base32Tests-macOS.xcconfig
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OneTimePassword
Open in desktop
Submodule OneTimePassword updated 9 files
+9 −0 .swiftlint.yml
+24 −3 .travis.yml
+9 −1 CHANGELOG.md
+1 −1 Cartfile
+1 −1 Cartfile.resolved
+1 −1 Carthage/Checkouts/Base32
+1 −1 OneTimePassword.podspec
+7 −5 OneTimePassword.xcodeproj/project.pbxproj
+2 −2 Sources/Info.plist
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SimulatorStatusMagic
Open in desktop
Submodule SimulatorStatusMagic updated 20 files
+ − Artwork/linked-frameworks.png
+ − Artwork/run-script-phase.png
+25 −36 INSTALLATION.md
+4 −10 README.md
+1 −0 SDStatusBarManager/SDStatusBarManager.h
+35 −1 SDStatusBarManager/SDStatusBarManager.m
+1 −0 SDStatusBarManager/SDStatusBarOverrider.h
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost10_0.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost10_3.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost11_0.m
+6 −0 SDStatusBarManager/SDStatusBarOverriderPost12_0.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost8_3.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost9_0.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPost9_3.m
+1 −0 SDStatusBarManager/SDStatusBarOverriderPre8_3.m
+3 −3 SimulatorStatusMagic.podspec
+1 −1 SimulatorStatusMagic.xcodeproj/xcshareddata/xcschemes/SimulatorStatusMagicUniversalFramework.xcscheme
+1 −1 SimulatorStatusMagic.xcodeproj/xcshareddata/xcschemes/SimulatorStatusMagiciOS.xcscheme
+22 −5 SimulatorStatusMagic/Base.lproj/Main.storyboard
+19 −0 SimulatorStatusMagic/ViewController.m
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Open in desktop
Submodule xcconfigs updated from bb7955 to d0f899