From c3da2b6b6fd05257aebbeef633cbda1011afbe3c Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:53:08 -0400 Subject: [PATCH 01/20] Create swift.yml Testing swift workflow --- .github/workflows/swift.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/swift.yml diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml new file mode 100644 index 0000000..21ae770 --- /dev/null +++ b/.github/workflows/swift.yml @@ -0,0 +1,22 @@ +# This workflow will build a Swift project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift + +name: Swift + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + - name: Build + run: swift build -v + - name: Run tests + run: swift test -v From cdfa99f03630b8b1181f3ef33a628e20735b0f99 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:57:10 -0400 Subject: [PATCH 02/20] Create Package.swift Adding missing Package.swift file --- Package.swift | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..cb7b447 --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.7 +import PackageDescription + +let package = Package( + name: "iOS_SideMenu_Example", + platforms: [ + .iOS(.v17_5) + ], + products: [ + .library( + name: "iOS_SideMenu_Example", + targets: ["iOS_SideMenu_Example"]), + ], + dependencies: [ + // No external dependencies + ], + targets: [ + .target( + name: "iOS_SideMenu_Example", + dependencies: [], + path: "Sources" + ), + .testTarget( + name: "iOS_SideMenu_ExampleTests", + dependencies: ["iOS_SideMenu_Example"], + path: "Tests" + ), + ] +) \ No newline at end of file From 194fe7775bab04c54d2e3b42f8334f3a323cad0d Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:02:00 -0400 Subject: [PATCH 03/20] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index cb7b447..09bcb5a 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "iOS_SideMenu_Example", platforms: [ - .iOS(.v17_5) + .iOS(.v16) ], products: [ .library( From 00adc00e4e8d736e2d609b88694d44c25fdfaccc Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:04:36 -0400 Subject: [PATCH 04/20] Update Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 09bcb5a..28fee35 100644 --- a/Package.swift +++ b/Package.swift @@ -18,12 +18,12 @@ let package = Package( .target( name: "iOS_SideMenu_Example", dependencies: [], - path: "Sources" + path: "Sources/iOS_SideMenu_Example" ), .testTarget( name: "iOS_SideMenu_ExampleTests", dependencies: ["iOS_SideMenu_Example"], - path: "Tests" + path: "Tests/iOS_SideMenu_ExampleTests" ), ] ) \ No newline at end of file From 4d2493754f02f955bc521eec0d9d4e7b84d66bde Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:09:50 -0400 Subject: [PATCH 05/20] Update Package.swift Lets see if I got this correct now --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 28fee35..b751a46 100644 --- a/Package.swift +++ b/Package.swift @@ -18,12 +18,12 @@ let package = Package( .target( name: "iOS_SideMenu_Example", dependencies: [], - path: "Sources/iOS_SideMenu_Example" + path: "SideMenuExample" ), .testTarget( name: "iOS_SideMenu_ExampleTests", dependencies: ["iOS_SideMenu_Example"], - path: "Tests/iOS_SideMenu_ExampleTests" + path: "SideMenu_ExTests" ), ] ) \ No newline at end of file From d3b9d7ef6805cf97bf46309c3d655f7089f85afa Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:11:36 -0400 Subject: [PATCH 06/20] Update Package.swift --- Package.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b751a46..9d014ea 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,7 @@ import PackageDescription let package = Package( name: "iOS_SideMenu_Example", + defaultLocalization: "en", platforms: [ .iOS(.v16) ], @@ -18,7 +19,11 @@ let package = Package( .target( name: "iOS_SideMenu_Example", dependencies: [], - path: "SideMenuExample" + path: "SideMenuExample", + resources: [ + .process("Assets.xcassets"), + .process("Info.plist") + ] ), .testTarget( name: "iOS_SideMenu_ExampleTests", From aa4018cdec76bd3bb1c838f77d99f9c97b79c83c Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:12:43 -0400 Subject: [PATCH 07/20] Update Package.swift --- Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9d014ea..f989b13 100644 --- a/Package.swift +++ b/Package.swift @@ -20,9 +20,11 @@ let package = Package( name: "iOS_SideMenu_Example", dependencies: [], path: "SideMenuExample", + exclude: [ + "Info.plist" + ], resources: [ - .process("Assets.xcassets"), - .process("Info.plist") + .process("Assets.xcassets") ] ), .testTarget( From 7c0170a164be9dfa02db0f7150fda26adf5b3f98 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:14:11 -0400 Subject: [PATCH 08/20] Update Package.swift --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index f989b13..11a972b 100644 --- a/Package.swift +++ b/Package.swift @@ -25,6 +25,9 @@ let package = Package( ], resources: [ .process("Assets.xcassets") + ], + swiftSettings: [ + .define("PLATFORM_IOS") ] ), .testTarget( From bd07cc03f8063084fe4525443eb794654ab3c479 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:18:16 -0400 Subject: [PATCH 09/20] Update swift.yml lets change up the workflow a little shall we --- .github/workflows/swift.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 21ae770..e798a12 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,7 +1,4 @@ -# This workflow will build a Swift project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift - -name: Swift +name: iOS Build and Test on: push: @@ -16,7 +13,13 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set up Xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.0' # Specify the Xcode version you need + - name: Install dependencies + run: swift package resolve - name: Build - run: swift build -v + run: xcodebuild -scheme iOS_SideMenu_Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build - name: Run tests - run: swift test -v + run: xcodebuild test -scheme iOS_SideMenu_Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' From a6fab035c5390b79dc9f80dd14e2ab804e5c8c6e Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:19:30 -0400 Subject: [PATCH 10/20] Update swift.yml --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index e798a12..4c6fae2 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '14.0' # Specify the Xcode version you need + xcode-version: '14.3.1' # Specify the Xcode version you need - name: Install dependencies run: swift package resolve - name: Build From 60d1701efb992d81aa1e5ae7b08ffe05a08e54f5 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:21:31 -0400 Subject: [PATCH 11/20] Update swift.yml --- .github/workflows/swift.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 4c6fae2..22019c3 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -20,6 +20,8 @@ jobs: - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme iOS_SideMenu_Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build - name: Run tests - run: xcodebuild test -scheme iOS_SideMenu_Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' + - name: Run UI Tests + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' From c38e501301873c9dfbe270fb524dccbcef62e0aa Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:25:15 -0400 Subject: [PATCH 12/20] Update swift.yml learning is fun --- .github/workflows/swift.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 22019c3..005c812 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -20,8 +20,8 @@ jobs: - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build -allowProvisioningUpdates - name: Run tests - run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' -allowProvisioningUpdates - name: Run UI Tests - run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' -allowProvisioningUpdates From 355aacab3cf30fde143ef52086c0197318f28c7d Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:37:57 -0400 Subject: [PATCH 13/20] Update swift.yml --- .github/workflows/swift.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 005c812..3432468 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,12 +16,12 @@ jobs: - name: Set up Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '14.3.1' # Specify the Xcode version you need + xcode-version: '15.4.1' # Specify the Xcode version you need - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' build -allowProvisioningUpdates + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' build -allowProvisioningUpdates - name: Run tests - run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' -allowProvisioningUpdates - name: Run UI Tests - run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.0' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' -allowProvisioningUpdates From 6ea96074a6c2e4b5b71e16b8ea3c56ea2d419324 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:43:01 -0400 Subject: [PATCH 14/20] Update swift.yml --- .github/workflows/swift.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 3432468..b6d9b3c 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -10,18 +10,20 @@ jobs: build: runs-on: macos-latest - + env: + XCODE_VERSION: 15.4.0 + IOS_VERSION: 17.5 steps: - uses: actions/checkout@v4 - name: Set up Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.4.1' # Specify the Xcode version you need + xcode-version: '${{ XCODE_VERSION }}' # Specify the Xcode version you need - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' build -allowProvisioningUpdates + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' build -allowProvisioningUpdates - name: Run tests - run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' -allowProvisioningUpdates - name: Run UI Tests - run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=17.5' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' -allowProvisioningUpdates From 6905ca4b2a142bef8191e674bb1d683285ec5639 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:44:15 -0400 Subject: [PATCH 15/20] Update swift.yml --- .github/workflows/swift.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index b6d9b3c..8dec3ad 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -18,12 +18,12 @@ jobs: - name: Set up Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '${{ XCODE_VERSION }}' # Specify the Xcode version you need + xcode-version: '${{ env.XCODE_VERSION }}' # Specify the Xcode version you need - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' build -allowProvisioningUpdates + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' build -allowProvisioningUpdates - name: Run tests - run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates - name: Run UI Tests - run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{IOS_VERSION}}' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates From 91f96a4b0a5255fcb1bcb062bbf2ee55a71f94bd Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:48:24 -0400 Subject: [PATCH 16/20] Update project.pbxproj --- SideMenuExample.xcodeproj/project.pbxproj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SideMenuExample.xcodeproj/project.pbxproj b/SideMenuExample.xcodeproj/project.pbxproj index be868f3..be00cd5 100644 --- a/SideMenuExample.xcodeproj/project.pbxproj +++ b/SideMenuExample.xcodeproj/project.pbxproj @@ -452,6 +452,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 7G864964AM; @@ -470,6 +471,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExample; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -481,6 +483,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 7G864964AM; @@ -499,6 +502,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExample; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -512,7 +516,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3467688GKK; + DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.5; MARKETING_VERSION = 1.0; @@ -532,7 +536,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3467688GKK; + DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.5; MARKETING_VERSION = 1.0; @@ -551,7 +555,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3467688GKK; + DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExUITests"; @@ -569,7 +573,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 3467688GKK; + DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExUITests"; From 103078fb08298c7a4042bf4cf7fbb7bbc1464be5 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:15:37 -0400 Subject: [PATCH 17/20] Update swift.yml --- .github/workflows/swift.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 8dec3ad..bb36042 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -13,6 +13,7 @@ jobs: env: XCODE_VERSION: 15.4.0 IOS_VERSION: 17.5 + PHONE_NAME: 'iPhone 14' steps: - uses: actions/checkout@v4 - name: Set up Xcode @@ -22,8 +23,8 @@ jobs: - name: Install dependencies run: swift package resolve - name: Build - run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' build -allowProvisioningUpdates + run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{env.PHONE_NAME}},OS=${{env.IOS_VERSION}}' build -allowProvisioningUpdates - name: Run tests - run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{env.PHONE_NAME}},OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates - name: Run UI Tests - run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates + run: xcodebuild test -scheme SideMenuExampleUITests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{env.PHONE_NAME}},OS=${{env.IOS_VERSION}}' -allowProvisioningUpdates From eb1212d7dfa28b5f9879f5afed105b3bb34c4b0b Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:31:09 -0400 Subject: [PATCH 18/20] made some refactoring ok, maybe this will work finally so I can test a matrix approach --- Package.swift | 39 ---------------- SideMenuExample.xcodeproj/project.pbxproj | 44 +++++++++---------- .../SideMenuExampleTests.swift | 8 ++-- .../SideMenuExampleUITests.swift | 6 +-- .../SideMenuExampleUITestsLaunchTests.swift | 6 +-- 5 files changed, 32 insertions(+), 71 deletions(-) delete mode 100644 Package.swift rename SideMenu_ExTests/SideMenu_ExTests.swift => SideMenuExampleTests/SideMenuExampleTests.swift (94%) rename SideMenu_ExUITests/SideMenu_ExUITests.swift => SideMenuExampleUITests/SideMenuExampleUITests.swift (96%) rename SideMenu_ExUITests/SideMenu_ExUITestsLaunchTests.swift => SideMenuExampleUITests/SideMenuExampleUITestsLaunchTests.swift (94%) diff --git a/Package.swift b/Package.swift deleted file mode 100644 index 11a972b..0000000 --- a/Package.swift +++ /dev/null @@ -1,39 +0,0 @@ -// swift-tools-version:5.7 -import PackageDescription - -let package = Package( - name: "iOS_SideMenu_Example", - defaultLocalization: "en", - platforms: [ - .iOS(.v16) - ], - products: [ - .library( - name: "iOS_SideMenu_Example", - targets: ["iOS_SideMenu_Example"]), - ], - dependencies: [ - // No external dependencies - ], - targets: [ - .target( - name: "iOS_SideMenu_Example", - dependencies: [], - path: "SideMenuExample", - exclude: [ - "Info.plist" - ], - resources: [ - .process("Assets.xcassets") - ], - swiftSettings: [ - .define("PLATFORM_IOS") - ] - ), - .testTarget( - name: "iOS_SideMenu_ExampleTests", - dependencies: ["iOS_SideMenu_Example"], - path: "SideMenu_ExTests" - ), - ] -) \ No newline at end of file diff --git a/SideMenuExample.xcodeproj/project.pbxproj b/SideMenuExample.xcodeproj/project.pbxproj index be00cd5..e8c52de 100644 --- a/SideMenuExample.xcodeproj/project.pbxproj +++ b/SideMenuExample.xcodeproj/project.pbxproj @@ -14,9 +14,9 @@ 18D864B72C5F0543009EB9C7 /* ContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864B62C5F0543009EB9C7 /* ContainerViewController.swift */; }; 18D864BC2C5F0544009EB9C7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 18D864BB2C5F0544009EB9C7 /* Assets.xcassets */; }; 18D864BF2C5F0544009EB9C7 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 18D864BE2C5F0544009EB9C7 /* Base */; }; - 18D864CA2C5F0544009EB9C7 /* SideMenu_ExTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864C92C5F0544009EB9C7 /* SideMenu_ExTests.swift */; }; - 18D864D42C5F0544009EB9C7 /* SideMenu_ExUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864D32C5F0544009EB9C7 /* SideMenu_ExUITests.swift */; }; - 18D864D62C5F0544009EB9C7 /* SideMenu_ExUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864D52C5F0544009EB9C7 /* SideMenu_ExUITestsLaunchTests.swift */; }; + 18D864CA2C5F0544009EB9C7 /* SideMenuExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864C92C5F0544009EB9C7 /* SideMenuExampleTests.swift */; }; + 18D864D42C5F0544009EB9C7 /* SideMenuExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864D32C5F0544009EB9C7 /* SideMenuExampleUITests.swift */; }; + 18D864D62C5F0544009EB9C7 /* SideMenuExampleUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864D52C5F0544009EB9C7 /* SideMenuExampleUITestsLaunchTests.swift */; }; 18D864E62C5F0BBC009EB9C7 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864E52C5F0BBC009EB9C7 /* HomeViewController.swift */; }; 18D864E82C5F0BF7009EB9C7 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D864E72C5F0BF7009EB9C7 /* MenuViewController.swift */; }; /* End PBXBuildFile section */ @@ -49,10 +49,10 @@ 18D864BE2C5F0544009EB9C7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 18D864C02C5F0544009EB9C7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = SideMenuExample/Info.plist; sourceTree = SOURCE_ROOT; }; 18D864C52C5F0544009EB9C7 /* SideMenuExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SideMenuExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 18D864C92C5F0544009EB9C7 /* SideMenu_ExTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenu_ExTests.swift; sourceTree = ""; }; + 18D864C92C5F0544009EB9C7 /* SideMenuExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuExampleTests.swift; sourceTree = ""; }; 18D864CF2C5F0544009EB9C7 /* SideMenuExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SideMenuExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 18D864D32C5F0544009EB9C7 /* SideMenu_ExUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenu_ExUITests.swift; sourceTree = ""; }; - 18D864D52C5F0544009EB9C7 /* SideMenu_ExUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenu_ExUITestsLaunchTests.swift; sourceTree = ""; }; + 18D864D32C5F0544009EB9C7 /* SideMenuExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuExampleUITests.swift; sourceTree = ""; }; + 18D864D52C5F0544009EB9C7 /* SideMenuExampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuExampleUITestsLaunchTests.swift; sourceTree = ""; }; 18D864E52C5F0BBC009EB9C7 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = ""; }; 18D864E72C5F0BF7009EB9C7 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -86,8 +86,8 @@ isa = PBXGroup; children = ( 18D864B12C5F0543009EB9C7 /* SideMenuExample */, - 18D864C82C5F0544009EB9C7 /* SideMenu_ExTests */, - 18D864D22C5F0544009EB9C7 /* SideMenu_ExUITests */, + 18D864C82C5F0544009EB9C7 /* SideMenuExampleTests */, + 18D864D22C5F0544009EB9C7 /* SideMenuExampleUITests */, 18D864B02C5F0543009EB9C7 /* Products */, ); sourceTree = ""; @@ -115,21 +115,21 @@ path = SideMenuExample; sourceTree = ""; }; - 18D864C82C5F0544009EB9C7 /* SideMenu_ExTests */ = { + 18D864C82C5F0544009EB9C7 /* SideMenuExampleTests */ = { isa = PBXGroup; children = ( - 18D864C92C5F0544009EB9C7 /* SideMenu_ExTests.swift */, + 18D864C92C5F0544009EB9C7 /* SideMenuExampleTests.swift */, ); - path = SideMenu_ExTests; + path = SideMenuExampleTests; sourceTree = ""; }; - 18D864D22C5F0544009EB9C7 /* SideMenu_ExUITests */ = { + 18D864D22C5F0544009EB9C7 /* SideMenuExampleUITests */ = { isa = PBXGroup; children = ( - 18D864D32C5F0544009EB9C7 /* SideMenu_ExUITests.swift */, - 18D864D52C5F0544009EB9C7 /* SideMenu_ExUITestsLaunchTests.swift */, + 18D864D32C5F0544009EB9C7 /* SideMenuExampleUITests.swift */, + 18D864D52C5F0544009EB9C7 /* SideMenuExampleUITestsLaunchTests.swift */, ); - path = SideMenu_ExUITests; + path = SideMenuExampleUITests; sourceTree = ""; }; 18D864E22C5F09C0009EB9C7 /* ViewControllers */ = { @@ -288,7 +288,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 18D864CA2C5F0544009EB9C7 /* SideMenu_ExTests.swift in Sources */, + 18D864CA2C5F0544009EB9C7 /* SideMenuExampleTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -296,8 +296,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 18D864D42C5F0544009EB9C7 /* SideMenu_ExUITests.swift in Sources */, - 18D864D62C5F0544009EB9C7 /* SideMenu_ExUITestsLaunchTests.swift in Sources */, + 18D864D42C5F0544009EB9C7 /* SideMenuExampleUITests.swift in Sources */, + 18D864D62C5F0544009EB9C7 /* SideMenuExampleUITestsLaunchTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -520,7 +520,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExTests"; + PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -540,7 +540,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 17.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExTests"; + PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -558,7 +558,7 @@ DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExUITests"; + PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -576,7 +576,7 @@ DEVELOPMENT_TEAM = 7G864964AM; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "us.dersonproductions.SideMenu-ExUITests"; + PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; diff --git a/SideMenu_ExTests/SideMenu_ExTests.swift b/SideMenuExampleTests/SideMenuExampleTests.swift similarity index 94% rename from SideMenu_ExTests/SideMenu_ExTests.swift rename to SideMenuExampleTests/SideMenuExampleTests.swift index 442d569..6698683 100644 --- a/SideMenu_ExTests/SideMenu_ExTests.swift +++ b/SideMenuExampleTests/SideMenuExampleTests.swift @@ -1,6 +1,6 @@ // -// SideMenu_ExTests.swift -// SideMenu_ExTests +// SideMenuExampleTests.swift +// SideMenuExampleTests // // Created by Derson Productions, LLC on 2024-AUG-03. // @@ -31,9 +31,9 @@ // SOFTWARE. import XCTest -@testable import SideMenu_Ex +@testable import SideMenuExample -final class SideMenu_ExTests: XCTestCase { +final class SideMenuExampleTests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. diff --git a/SideMenu_ExUITests/SideMenu_ExUITests.swift b/SideMenuExampleUITests/SideMenuExampleUITests.swift similarity index 96% rename from SideMenu_ExUITests/SideMenu_ExUITests.swift rename to SideMenuExampleUITests/SideMenuExampleUITests.swift index e7ead28..8989eb7 100644 --- a/SideMenu_ExUITests/SideMenu_ExUITests.swift +++ b/SideMenuExampleUITests/SideMenuExampleUITests.swift @@ -1,6 +1,6 @@ // -// SideMenu_ExUITests.swift -// SideMenu_ExUITests +// SideMenuExampleUITests.swift +// SideMenuExampleUITests // // Created by Derson Productions, LLC on 2024-AUG-03. // @@ -32,7 +32,7 @@ import XCTest -final class SideMenu_ExUITests: XCTestCase { +final class SideMenuExampleUITests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. diff --git a/SideMenu_ExUITests/SideMenu_ExUITestsLaunchTests.swift b/SideMenuExampleUITests/SideMenuExampleUITestsLaunchTests.swift similarity index 94% rename from SideMenu_ExUITests/SideMenu_ExUITestsLaunchTests.swift rename to SideMenuExampleUITests/SideMenuExampleUITestsLaunchTests.swift index 62644a7..b0785c9 100644 --- a/SideMenu_ExUITests/SideMenu_ExUITestsLaunchTests.swift +++ b/SideMenuExampleUITests/SideMenuExampleUITestsLaunchTests.swift @@ -1,6 +1,6 @@ // -// SideMenu_ExUITestsLaunchTests.swift -// SideMenu_ExUITests +// SideMenuExampleUITestsLaunchTests.swift +// SideMenuExampleUITests // // Created by Derson Productions, LLC on 2024-AUG-03. // @@ -32,7 +32,7 @@ import XCTest -final class SideMenu_ExUITestsLaunchTests: XCTestCase { +final class SideMenuExampleUITestsLaunchTests: XCTestCase { override class var runsForEachTargetApplicationUIConfiguration: Bool { true From 25fa1b280fa59c1eb6f720a7bef130a3d044ddc8 Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:34:29 -0400 Subject: [PATCH 19/20] Removing dependencies install until I can look at it more Removing dependencies install until I can look at it more --- .github/workflows/swift.yml | 4 ++-- _Package.swift | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 _Package.swift diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index bb36042..635232e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -20,8 +20,8 @@ jobs: uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '${{ env.XCODE_VERSION }}' # Specify the Xcode version you need - - name: Install dependencies - run: swift package resolve + # - name: Install dependencies + # run: swift package resolve - name: Build run: xcodebuild -scheme SideMenuExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=${{env.PHONE_NAME}},OS=${{env.IOS_VERSION}}' build -allowProvisioningUpdates - name: Run tests diff --git a/_Package.swift b/_Package.swift new file mode 100644 index 0000000..b853727 --- /dev/null +++ b/_Package.swift @@ -0,0 +1,39 @@ +// swift-tools-version:5.7 +import PackageDescription + +let package = Package( + name: "iOS_SideMenu_Example", + defaultLocalization: "en", + platforms: [ + .iOS(.v16) + ], + products: [ + .library( + name: "iOS_SideMenu_Example", + targets: ["iOS_SideMenu_Example"]), + ], + dependencies: [ + // No external dependencies + ], + targets: [ + .target( + name: "iOS_SideMenu_Example", + dependencies: [], + path: "SideMenuExample", + exclude: [ + "Info.plist" + ], + resources: [ + .process("Assets.xcassets") + ], + swiftSettings: [ + .define("PLATFORM_IOS") + ] + ), + .testTarget( + name: "iOS_SideMenu_ExampleTests", + dependencies: ["iOS_SideMenu_Example"], + path: "SideMenuExampleTests" + ), + ] +) \ No newline at end of file From 6da426205ae224b9c1a1a3ac6bd74199eddb73dc Mon Sep 17 00:00:00 2001 From: "Derson Productions, LLC" <77082142+DersonProductions@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:47:35 -0400 Subject: [PATCH 20/20] push Guess I had to go off the target and back since I refactored names --- README.md | 4 ++-- SideMenuExample.xcodeproj/project.pbxproj | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bebdf0b..c94fcf2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ I ran this application with the following, - [MacOS - Sonoma 14.6](https://developer.apple.com/documentation/macos-release-notes/macos-14_6-release-notes) - [xCode - Version 15.4 (15F31d)](https://developer.apple.com/news/releases/?id=05132024a) -- Minimum Deployment set to iOS version 17.5 +- Minimum Deployment set to [iOS version 17.5](https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-17_5-release-notes) Once compiled, the application should present the Home View Controller as seen below with the hidden menu in the upper left of the screen. @@ -17,4 +17,4 @@ Clicking the three lines in the upper left will cause the menu to slide in from ![alt text](docs/img/Menu_View.png) -# [License](https://github.com/DersonProductions/iOS_SideMenu_Example/blob/main/LICENSE) \ No newline at end of file +# [MIT License](https://github.com/DersonProductions/iOS_SideMenu_Example/blob/main/LICENSE) with one small change. \ No newline at end of file diff --git a/SideMenuExample.xcodeproj/project.pbxproj b/SideMenuExample.xcodeproj/project.pbxproj index e8c52de..3ec0331 100644 --- a/SideMenuExample.xcodeproj/project.pbxproj +++ b/SideMenuExample.xcodeproj/project.pbxproj @@ -560,10 +560,11 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = SideMenu_Ex; + TEST_TARGET_NAME = SideMenuExample; }; name = Debug; }; @@ -578,10 +579,11 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = us.dersonproductions.SideMenuExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = ""; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = SideMenu_Ex; + TEST_TARGET_NAME = SideMenuExample; }; name = Release; };