From b39d28bafc3f30e186dc602a2c992f9eaa60821d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferdinand=20Sch=C3=A4ffler?= Date: Sat, 10 Apr 2021 20:47:21 +0200 Subject: [PATCH] Use supported name for example 3 and upgrade to Swift 5.0 --- 3-packaging-a-mac-app/Cargo.lock | 70 +++++++++---------- 3-packaging-a-mac-app/Cargo.toml | 2 +- 3-packaging-a-mac-app/app/Info.plist | 2 +- .../app/RustPack.xcodeproj/project.pbxproj | 12 ++-- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/3-packaging-a-mac-app/Cargo.lock b/3-packaging-a-mac-app/Cargo.lock index f7fccac..4241b7c 100644 --- a/3-packaging-a-mac-app/Cargo.lock +++ b/3-packaging-a-mac-app/Cargo.lock @@ -1,102 +1,102 @@ -[[package]] -name = "3-packaging-a-mac-app" -version = "0.1.0" -dependencies = [ - "cocoa 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "bitflags" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" [[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cocoa" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5cd1afb83b2de9c41e5dfedb2bcccb779d433b958404876009ae4b01746ff23" dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "block", + "core-graphics", + "libc", + "objc", ] [[package]] name = "core-foundation" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc3532ec724375c7cb7ff0a097b714fde180bb1f6ed2ab27cfcd99ffca873cd2" dependencies = [ - "core-foundation-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation-sys" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3fb15cdbdd9cf8b82d97d0296bb5cd3631bba58d6e31650a002a8e7fb5721f9" [[package]] name = "core-graphics" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92801c908ea6301ae619ed842a72e01098085fc321b9c2f3f833dad555bba055" dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "core-foundation", + "foreign-types", + "libc", ] [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types-shared", ] [[package]] name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "libc" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "044d1360593a78f5c8e5e710beccdc24ab71d1f01bc19a29bcacdba22e8475d8" [[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ - "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "objc" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9833ab0efe5361b1e2122a0544a5d3359576911a42cb098c2e59be8650807367" dependencies = [ - "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "malloc_buf", ] -[metadata] -"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789" -"checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -"checksum cocoa 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cd1afb83b2de9c41e5dfedb2bcccb779d433b958404876009ae4b01746ff23" -"checksum core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cc3532ec724375c7cb7ff0a097b714fde180bb1f6ed2ab27cfcd99ffca873cd2" -"checksum core-foundation-sys 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3fb15cdbdd9cf8b82d97d0296bb5cd3631bba58d6e31650a002a8e7fb5721f9" -"checksum core-graphics 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92801c908ea6301ae619ed842a72e01098085fc321b9c2f3f833dad555bba055" -"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "044d1360593a78f5c8e5e710beccdc24ab71d1f01bc19a29bcacdba22e8475d8" -"checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -"checksum objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9833ab0efe5361b1e2122a0544a5d3359576911a42cb098c2e59be8650807367" +[[package]] +name = "packaging-a-mac-app" +version = "0.1.0" +dependencies = [ + "cocoa", + "libc", + "objc", +] diff --git a/3-packaging-a-mac-app/Cargo.toml b/3-packaging-a-mac-app/Cargo.toml index 4dbeb8b..37669c6 100644 --- a/3-packaging-a-mac-app/Cargo.toml +++ b/3-packaging-a-mac-app/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "3-packaging-a-mac-app" +name = "packaging-a-mac-app" version = "0.1.0" authors = ["Delisa Mason "] diff --git a/3-packaging-a-mac-app/app/Info.plist b/3-packaging-a-mac-app/app/Info.plist index 47a42c7..f99a579 100644 --- a/3-packaging-a-mac-app/app/Info.plist +++ b/3-packaging-a-mac-app/app/Info.plist @@ -27,6 +27,6 @@ NSPrincipalClass NSApplication RustBinaryName - 3-packaging-a-mac-app + packaging-a-mac-app diff --git a/3-packaging-a-mac-app/app/RustPack.xcodeproj/project.pbxproj b/3-packaging-a-mac-app/app/RustPack.xcodeproj/project.pbxproj index 72625b3..2a143c1 100644 --- a/3-packaging-a-mac-app/app/RustPack.xcodeproj/project.pbxproj +++ b/3-packaging-a-mac-app/app/RustPack.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 8ADFC72B1DD67B670080DCCC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8ADFC72A1DD67B670080DCCC /* Assets.xcassets */; }; 8ADFC7361DD67B950080DCCC /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ADFC7351DD67B950080DCCC /* main.swift */; }; - 8ADFC73C1DD67DF60080DCCC /* 3-packaging-a-mac-app in Resources */ = {isa = PBXBuildFile; fileRef = 8ADFC73B1DD67DF60080DCCC /* 3-packaging-a-mac-app */; }; + 8ADFC73C1DD67DF60080DCCC /* packaging-a-mac-app in Resources */ = {isa = PBXBuildFile; fileRef = 8ADFC73B1DD67DF60080DCCC /* packaging-a-mac-app */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -27,7 +27,7 @@ 8ADFC72A1DD67B670080DCCC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = SOURCE_ROOT; }; 8ADFC72F1DD67B670080DCCC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; 8ADFC7351DD67B950080DCCC /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = SOURCE_ROOT; }; - 8ADFC73B1DD67DF60080DCCC /* 3-packaging-a-mac-app */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "3-packaging-a-mac-app"; path = "../../target/release/3-packaging-a-mac-app"; sourceTree = ""; }; + 8ADFC73B1DD67DF60080DCCC /* packaging-a-mac-app */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "packaging-a-mac-app"; path = "../../target/release/packaging-a-mac-app"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -61,7 +61,7 @@ isa = PBXGroup; children = ( 8ADFC72A1DD67B670080DCCC /* Assets.xcassets */, - 8ADFC73B1DD67DF60080DCCC /* 3-packaging-a-mac-app */, + 8ADFC73B1DD67DF60080DCCC /* packaging-a-mac-app */, 8ADFC72F1DD67B670080DCCC /* Info.plist */, 8ADFC7351DD67B950080DCCC /* main.swift */, ); @@ -153,7 +153,7 @@ buildActionMask = 2147483647; files = ( 8ADFC72B1DD67B670080DCCC /* Assets.xcassets in Resources */, - 8ADFC73C1DD67DF60080DCCC /* 3-packaging-a-mac-app in Resources */, + 8ADFC73C1DD67DF60080DCCC /* packaging-a-mac-app in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -279,7 +279,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = me.delisa.RustPack; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -293,7 +293,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = me.delisa.RustPack; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; };