diff --git a/.buildkite/commands/upload-to-appcenter.sh b/.buildkite/commands/upload-to-appcenter.sh index 46e43a1b..ba39f258 100755 --- a/.buildkite/commands/upload-to-appcenter.sh +++ b/.buildkite/commands/upload-to-appcenter.sh @@ -1,14 +1,11 @@ #!/bin/bash -eu -NAME=$1 -NAME_LOWERCASED="$(echo "$NAME" | tr '[:upper:]' '[:lower:]')" - echo "--- :arrow_down: Downloading Prototype Build" -buildkite-agent artifact download ".build/artifacts/*.ipa" . --step "build_$NAME_LOWERCASED" -buildkite-agent artifact download ".build/artifacts/*.app.dSYM.zip" . --step "build_$NAME_LOWERCASED" +buildkite-agent artifact download ".build/artifacts/*.ipa" . --step "build_demo" +buildkite-agent artifact download ".build/artifacts/*.app.dSYM.zip" . --step "build_demo" echo "--- :rubygems: Setting up Gems" install_gems echo "--- :hammer_and_wrench: Uploading" -bundle exec fastlane ios upload_demo_to_appcenter name:"$NAME" build_number:"$BUILDKITE_BUILD_NUMBER" +bundle exec fastlane ios upload_demo_to_appcenter build_number:"$BUILDKITE_BUILD_NUMBER" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 7a10adc8..74c31c2d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -66,36 +66,19 @@ steps: ################### - group: ":appcenter: Prototype Builds" steps: - - label: "🛠️ Build SwiftUI Demo" - key: build_swiftui + - label: "🛠️ Build Demo" + key: build_demo depends_on: test plugins: [$CI_TOOLKIT] command: | install_gems - BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution-swiftui + BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution artifact_paths: - ".build/artifacts/*.ipa" - ".build/artifacts/*.dSYM.zip" - - label: "⬆️ Upload SwiftUI Demo to App Center" - depends_on: build_swiftui + - label: "⬆️ Upload Demo to App Center" + depends_on: build_demo plugins: [$CI_TOOLKIT] - command: .buildkite/commands/upload-to-appcenter.sh SwiftUI - if: build.pull_request.id != null - - - label: "🛠️ Build UIKit Demo" - key: build_uikit - depends_on: test - plugins: [$CI_TOOLKIT] - command: | - install_gems - BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution-uikit - artifact_paths: - - ".build/artifacts/*.ipa" - - ".build/artifacts/*.dSYM.zip" - - - label: "⬆️ Upload UIKit Demo to App Center" - depends_on: build_uikit - plugins: [$CI_TOOLKIT] - command: .buildkite/commands/upload-to-appcenter.sh UIKit + command: .buildkite/commands/upload-to-appcenter.sh if: build.pull_request.id != null diff --git a/Demo/Demo/Gravatar-UIKit-Demo/AppDelegate.swift b/Demo/Demo/Gravatar-Demo/AppDelegate.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/AppDelegate.swift rename to Demo/Demo/Gravatar-Demo/AppDelegate.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AccentColor.colorset/Contents.json b/Demo/Demo/Gravatar-Demo/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AccentColor.colorset/Contents.json rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AppIcon.appiconset/1024x10244.png b/Demo/Demo/Gravatar-Demo/Assets.xcassets/AppIcon.appiconset/1024x10244.png similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AppIcon.appiconset/1024x10244.png rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/AppIcon.appiconset/1024x10244.png diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Gravatar-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/Contents.json b/Demo/Demo/Gravatar-Demo/Assets.xcassets/Contents.json similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/Contents.json rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/Contents.json diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/placeholder.imageset/Contents.json b/Demo/Demo/Gravatar-Demo/Assets.xcassets/placeholder.imageset/Contents.json similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/placeholder.imageset/Contents.json rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/placeholder.imageset/Contents.json diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/placeholder.imageset/placeholder.png b/Demo/Demo/Gravatar-Demo/Assets.xcassets/placeholder.imageset/placeholder.png similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/placeholder.imageset/placeholder.png rename to Demo/Demo/Gravatar-Demo/Assets.xcassets/placeholder.imageset/placeholder.png diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Base.lproj/LaunchScreen.storyboard b/Demo/Demo/Gravatar-Demo/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Base.lproj/LaunchScreen.storyboard rename to Demo/Demo/Gravatar-Demo/Base.lproj/LaunchScreen.storyboard diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Base.lproj/Main.storyboard b/Demo/Demo/Gravatar-Demo/Base.lproj/Main.storyboard similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Base.lproj/Main.storyboard rename to Demo/Demo/Gravatar-Demo/Base.lproj/Main.storyboard diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Common/SwitchWithLabel.swift b/Demo/Demo/Gravatar-Demo/Common/SwitchWithLabel.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Common/SwitchWithLabel.swift rename to Demo/Demo/Gravatar-Demo/Common/SwitchWithLabel.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoAvatarDownloadViewController.swift b/Demo/Demo/Gravatar-Demo/DemoAvatarDownloadViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoAvatarDownloadViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoAvatarDownloadViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoBaseProfileViewController.swift b/Demo/Demo/Gravatar-Demo/DemoBaseProfileViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoBaseProfileViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoBaseProfileViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoFetchProfileViewController.swift b/Demo/Demo/Gravatar-Demo/DemoFetchProfileViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoFetchProfileViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoFetchProfileViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoImageCropperViewController.swift b/Demo/Demo/Gravatar-Demo/DemoImageCropperViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoImageCropperViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoImageCropperViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoProfileConfigurationViewController.swift b/Demo/Demo/Gravatar-Demo/DemoProfileConfigurationViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoProfileConfigurationViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoProfileConfigurationViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoProfilePresentationStylesViewController.swift b/Demo/Demo/Gravatar-Demo/DemoProfilePresentationStylesViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoProfilePresentationStylesViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoProfilePresentationStylesViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoProfileViewsViewController.swift b/Demo/Demo/Gravatar-Demo/DemoProfileViewsViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoProfileViewsViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoProfileViewsViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoQuickEditorViewController.swift b/Demo/Demo/Gravatar-Demo/DemoQuickEditorViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoQuickEditorViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoQuickEditorViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoRemoteSVGViewController.swift b/Demo/Demo/Gravatar-Demo/DemoRemoteSVGViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoRemoteSVGViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoRemoteSVGViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoUIImageViewExtensionViewController.swift b/Demo/Demo/Gravatar-Demo/DemoUIImageViewExtensionViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoUIImageViewExtensionViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoUIImageViewExtensionViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/DemoUploadImageViewController.swift b/Demo/Demo/Gravatar-Demo/DemoUploadImageViewController.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/DemoUploadImageViewController.swift rename to Demo/Demo/Gravatar-Demo/DemoUploadImageViewController.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Base.xcconfig b/Demo/Demo/Gravatar-Demo/Gravatar-Demo.Base.xcconfig similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Base.xcconfig rename to Demo/Demo/Gravatar-Demo/Gravatar-Demo.Base.xcconfig diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Release.xcconfig b/Demo/Demo/Gravatar-Demo/Gravatar-Demo.Release.xcconfig similarity index 91% rename from Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Release.xcconfig rename to Demo/Demo/Gravatar-Demo/Gravatar-Demo.Release.xcconfig index 32419bd2..1c706a44 100644 --- a/Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Release.xcconfig +++ b/Demo/Demo/Gravatar-Demo/Gravatar-Demo.Release.xcconfig @@ -1,4 +1,4 @@ -#include "Gravatar-UIKit-Demo.Base.xcconfig" +#include "Gravatar-Demo.Base.xcconfig" #include "../Enterprise.xcconfig" // Declared explicitly rather than by building on top of what's defined in Base so it can be read by other tools such as Fastlane diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Info.plist b/Demo/Demo/Gravatar-Demo/Info.plist similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/Info.plist rename to Demo/Demo/Gravatar-Demo/Info.plist diff --git a/Demo/Demo/Gravatar-UIKit-Demo/MainTableViewController.swift b/Demo/Demo/Gravatar-Demo/MainTableViewController.swift similarity index 87% rename from Demo/Demo/Gravatar-UIKit-Demo/MainTableViewController.swift rename to Demo/Demo/Gravatar-Demo/MainTableViewController.swift index 0e0e5754..de46047e 100644 --- a/Demo/Demo/Gravatar-UIKit-Demo/MainTableViewController.swift +++ b/Demo/Demo/Gravatar-Demo/MainTableViewController.swift @@ -1,16 +1,12 @@ -// -// MainTableViewController.swift -// Gravatar-Demo -// -// Created by Pinar Olguc on 24.01.2024. -// import Foundation import UIKit +import SwiftUI class MainTableViewController: UITableViewController { enum Row: Int, CaseIterable { + case swiftUI case imageDownloadNetworking case uiImageViewExtension case fetchProfile @@ -40,8 +36,12 @@ class MainTableViewController: UITableViewController { guard let row = Row(rawValue: indexPath.row) else { return UITableViewCell() } let cell = tableView.dequeueReusableCell(withIdentifier: Self.reuseID, for: indexPath) var content = cell.defaultContentConfiguration() + cell.accessoryType = .disclosureIndicator switch row { + case .swiftUI: + content.text = "SwiftUI Demos" + cell.accessoryType = .none case .imageDownloadNetworking: content.text = "Image download - Networking" case .uiImageViewExtension: @@ -73,6 +73,12 @@ class MainTableViewController: UITableViewController { guard let row = Row(rawValue: indexPath.row) else { return } switch row { + case .swiftUI: + let swiftUIContentViewController = UIHostingController(rootView: ContentView(onDismiss: { [weak self] in + self?.dismiss(animated: true) + })) + swiftUIContentViewController.modalPresentationStyle = .fullScreen + present(swiftUIContentViewController, animated: true) case .imageDownloadNetworking: let vc = DemoAvatarDownloadViewController() navigationController?.pushViewController(vc, animated: true) diff --git a/Demo/Demo/Gravatar-UIKit-Demo/SceneDelegate.swift b/Demo/Demo/Gravatar-Demo/SceneDelegate.swift similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/SceneDelegate.swift rename to Demo/Demo/Gravatar-Demo/SceneDelegate.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/ContentView.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/ContentView.swift similarity index 76% rename from Demo/Demo/Gravatar-SwiftUI-Demo/ContentView.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/ContentView.swift index 5767a11b..3fd94740 100644 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/ContentView.swift +++ b/Demo/Demo/Gravatar-Demo/SwiftUI/ContentView.swift @@ -2,6 +2,8 @@ import SwiftUI import GravatarUI struct ContentView: View { + let onDismiss: (() -> Void)? + enum Page: String, CaseIterable, Identifiable { case avatarView = "Avatar view" case avatarPickerView = "Avatar picker view" @@ -27,6 +29,15 @@ struct ContentView: View { } .navigationTitle("Gravatar SwiftUI Demo") .navigationBarTitleDisplayMode(.inline) + .toolbar { + if let onDismiss { + ToolbarItem(placement: .topBarLeading) { + Button("Dismiss") { + onDismiss() + } + } + } + } } } @@ -44,5 +55,5 @@ struct ContentView: View { } #Preview { - ContentView() + ContentView(onDismiss: nil) } diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/DemoAvatarPickerView.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/DemoAvatarPickerView.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/DemoAvatarPickerView.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/DemoAvatarPickerView.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/DemoAvatarView.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/DemoAvatarView.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/DemoAvatarView.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/DemoAvatarView.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/DemoProfileEditorView.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/DemoProfileEditorView.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/DemoProfileEditorView.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/DemoProfileEditorView.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/QEColorSchemePickerRow.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/QEColorSchemePickerRow.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/QEColorSchemePickerRow.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/QEColorSchemePickerRow.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/QEContentLayoutPickerRow.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/QEContentLayoutPickerRow.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/QEContentLayoutPickerRow.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/QEContentLayoutPickerRow.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/QELayoutOptions.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/QELayoutOptions.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/QELayoutOptions.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/QELayoutOptions.swift diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/TestImageCropper.swift b/Demo/Demo/Gravatar-Demo/SwiftUI/TestImageCropper.swift similarity index 100% rename from Demo/Demo/Gravatar-SwiftUI-Demo/TestImageCropper.swift rename to Demo/Demo/Gravatar-Demo/SwiftUI/TestImageCropper.swift diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ar.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/ar.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ar.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/ar.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ar.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/ar.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ar.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/ar.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/de.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/de.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/de.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/de.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/de.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/de.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/de.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/de.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/es.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/es.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/es.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/es.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/es.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/es.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/es.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/es.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/fr.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/fr.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/fr.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/fr.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/fr.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/fr.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/fr.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/fr.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/he.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/he.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/he.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/he.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/he.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/he.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/he.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/he.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/id.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/id.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/id.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/id.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/id.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/id.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/id.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/id.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/it.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/it.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/it.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/it.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/it.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/it.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/it.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/it.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ja.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/ja.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ja.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/ja.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ja.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/ja.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ja.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/ja.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ko.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/ko.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ko.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/ko.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ko.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/ko.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ko.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/ko.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/nl.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/nl.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/nl.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/nl.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/nl.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/nl.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/nl.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/nl.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/pt-BR.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/pt-BR.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/pt-BR.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/pt-BR.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/pt-BR.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/pt-BR.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/pt-BR.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/pt-BR.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ru.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/ru.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ru.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/ru.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/ru.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/ru.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/ru.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/ru.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/sv.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/sv.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/sv.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/sv.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/sv.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/sv.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/sv.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/sv.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/tr.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/tr.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/tr.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/tr.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/tr.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/tr.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/tr.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/tr.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/zh-Hans.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/zh-Hans.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/zh-Hans.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/zh-Hans.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/zh-Hans.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/zh-Hans.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/zh-Hans.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/zh-Hans.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/zh-Hant.lproj/LaunchScreen.strings b/Demo/Demo/Gravatar-Demo/zh-Hant.lproj/LaunchScreen.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/zh-Hant.lproj/LaunchScreen.strings rename to Demo/Demo/Gravatar-Demo/zh-Hant.lproj/LaunchScreen.strings diff --git a/Demo/Demo/Gravatar-UIKit-Demo/zh-Hant.lproj/Main.strings b/Demo/Demo/Gravatar-Demo/zh-Hant.lproj/Main.strings similarity index 100% rename from Demo/Demo/Gravatar-UIKit-Demo/zh-Hant.lproj/Main.strings rename to Demo/Demo/Gravatar-Demo/zh-Hant.lproj/Main.strings diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/1024x10245.png b/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/1024x10245.png deleted file mode 100644 index 5fde1e70..00000000 Binary files a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/1024x10245.png and /dev/null differ diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6ff692e3..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "1024x10245.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/Contents.json b/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/Contents.json deleted file mode 100644 index be18185d..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "profileAvatar@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "profileAvatar@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@2x.png b/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@2x.png deleted file mode 100644 index a9280106..00000000 Binary files a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@2x.png and /dev/null differ diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@3x.png b/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@3x.png deleted file mode 100644 index 67a2bc18..00000000 Binary files a/Demo/Demo/Gravatar-SwiftUI-Demo/Assets.xcassets/profileAvatar.imageset/profileAvatar@3x.png and /dev/null differ diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/DemoApp.swift b/Demo/Demo/Gravatar-SwiftUI-Demo/DemoApp.swift deleted file mode 100644 index 703473ec..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/DemoApp.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// DemoApp.swift -// Demo -// -// Created by Andrew Montgomery on 1/19/24. -// - -import SwiftUI -import Gravatar - -@main -struct DemoApp: App { - var body: some Scene { - WindowGroup { - ContentView() - .onAppear { - setupSecrets() - } - } - } - - func setupSecrets() { - Task { - await Configuration.shared.configure( - with: Secrets.apiKey, - oauthSecrets: .init( - clientID: Secrets.clientID, - redirectURI: Secrets.redirectURI - ) - ) - } - } -} diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Base.xcconfig b/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Base.xcconfig deleted file mode 100644 index 193cf7b4..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Base.xcconfig +++ /dev/null @@ -1 +0,0 @@ -PRODUCT_BUNDLE_IDENTIFIER = com.automattic.gravatar-sdk-demo-swiftui diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Release.xcconfig b/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Release.xcconfig deleted file mode 100644 index 84f80b24..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/Gravatar-SwiftUI-Demo.Release.xcconfig +++ /dev/null @@ -1,9 +0,0 @@ -#include "Gravatar-SwiftUI-Demo.Base.xcconfig" -#include "../Enterprise.xcconfig" - -// Declared explicitly rather than by building on top of what's defined in Base so it can be read by other tools such as Fastlane -PRODUCT_BUNDLE_IDENTIFIER = com.automattic.gravatar-sdk-demo-swiftui.prototype-build - -// Unfortunately, we need to explicitly write the bundle identifier. -// See note in Enterprise.xcconfig about this. -PROVISIONING_PROFILE_SPECIFIER = match InHouse com.automattic.gravatar-sdk-demo-swiftui.prototype-build diff --git a/Demo/Demo/Gravatar-SwiftUI-Demo/Preview Content/Preview Assets.xcassets/Contents.json b/Demo/Demo/Gravatar-SwiftUI-Demo/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596..00000000 --- a/Demo/Demo/Gravatar-SwiftUI-Demo/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AccentColor.colorset/Contents.json b/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb878970..00000000 --- a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/Contents.json b/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596..00000000 --- a/Demo/Demo/Gravatar-UIKit-Demo/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Demo/Gravatar-Demo.xcodeproj/project.pbxproj b/Demo/Gravatar-Demo.xcodeproj/project.pbxproj index 533f55e7..5893c842 100644 --- a/Demo/Gravatar-Demo.xcodeproj/project.pbxproj +++ b/Demo/Gravatar-Demo.xcodeproj/project.pbxproj @@ -9,38 +9,30 @@ /* Begin PBXBuildFile section */ 1E0087932B63CFFE0012ECEA /* DemoFetchProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0087922B63CFFE0012ECEA /* DemoFetchProfileViewController.swift */; }; 1E0087952B63DBCB0012ECEA /* DemoUploadImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0087942B63DBCB0012ECEA /* DemoUploadImageViewController.swift */; }; - 1E3FA2402C74B8CC002901F2 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3FA23F2C74B8CC002901F2 /* Secrets.swift */; }; 1E3FA2412C74E539002901F2 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3FA23F2C74B8CC002901F2 /* Secrets.swift */; }; - 1E3FA2452C75E403002901F2 /* DemoProfileEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3FA2442C75E403002901F2 /* DemoProfileEditorView.swift */; }; + 1E62631C2CD13DB700FC362F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C5D60F2B5B33E20067C2A8 /* ContentView.swift */; }; + 1E62631D2CD13DB700FC362F /* DemoAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9146A7AD2C3BD8F000E07C63 /* DemoAvatarView.swift */; }; + 1E62631E2CD13DB700FC362F /* DemoAvatarPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91B73B362C404F6E00E7D325 /* DemoAvatarPickerView.swift */; }; + 1E62631F2CD13DB700FC362F /* DemoProfileEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3FA2442C75E403002901F2 /* DemoProfileEditorView.swift */; }; + 1E6263202CD13DB700FC362F /* QEContentLayoutPickerRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9133DF1D2CA54E080028196F /* QEContentLayoutPickerRow.swift */; }; + 1E6263212CD13DB700FC362F /* QEColorSchemePickerRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 919C70562CAAF28E0036B03C /* QEColorSchemePickerRow.swift */; }; + 1E6263222CD13DB700FC362F /* TestImageCropper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 917DEEC82C7F619100E43774 /* TestImageCropper.swift */; }; 1EA26DE22CA5677700AACF58 /* DemoQuickEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E93D3C82CA566D90085139A /* DemoQuickEditorViewController.swift */; }; 1ECAB5072BC984440043A331 /* DemoProfileConfigurationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECAB5062BC984440043A331 /* DemoProfileConfigurationViewController.swift */; }; 49018E2D2C8110C600B1207D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 49018E2B2C8110C600B1207D /* Localizable.strings */; }; - 49018E2E2C8110C600B1207D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 49018E2B2C8110C600B1207D /* Localizable.strings */; }; 4948C4EC2B61C41100AC4875 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 4948C4EB2B61C41100AC4875 /* Gravatar */; }; - 4948C4EE2B61C41800AC4875 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 4948C4ED2B61C41800AC4875 /* Gravatar */; }; 495775E22B5B34970082812A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495775E12B5B34970082812A /* AppDelegate.swift */; }; 495775E42B5B34970082812A /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495775E32B5B34970082812A /* SceneDelegate.swift */; }; 495775EE2B5B34980082812A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 495775EC2B5B34980082812A /* LaunchScreen.storyboard */; }; 497783312BAC8A99008C29F7 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 497783302BAC8A99008C29F7 /* GravatarUI */; }; - 497783332BAC8AA9008C29F7 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 497783322BAC8AA9008C29F7 /* GravatarUI */; }; - 49C5D60E2B5B33E20067C2A8 /* DemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C5D60D2B5B33E20067C2A8 /* DemoApp.swift */; }; - 49C5D6102B5B33E20067C2A8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49C5D60F2B5B33E20067C2A8 /* ContentView.swift */; }; - 49C5D6122B5B33E20067C2A8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 49C5D6112B5B33E20067C2A8 /* Assets.xcassets */; }; - 49C5D6152B5B33E20067C2A8 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 49C5D6142B5B33E20067C2A8 /* Preview Assets.xcassets */; }; 49EFFB542C51A47C0086589A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 495775EA2B5B34980082812A /* Assets.xcassets */; }; 9133058E2C91F8D1009F5C0B /* DemoImageCropperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9133058D2C91F2C8009F5C0B /* DemoImageCropperViewController.swift */; }; - 9133DF1C2CA54D7A0028196F /* QELayoutOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9133DF1A2CA54D1B0028196F /* QELayoutOptions.swift */; }; - 9133DF1F2CA552280028196F /* QEContentLayoutPickerRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9133DF1D2CA54E080028196F /* QEContentLayoutPickerRow.swift */; }; - 9146A7AE2C3BD8F000E07C63 /* DemoAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9146A7AD2C3BD8F000E07C63 /* DemoAvatarView.swift */; }; 914AC0192BD7FF08005DA4A5 /* DemoBaseProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 914AC0172BD7FF08005DA4A5 /* DemoBaseProfileViewController.swift */; }; 914AC01A2BD7FF08005DA4A5 /* DemoProfilePresentationStylesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 914AC0182BD7FF08005DA4A5 /* DemoProfilePresentationStylesViewController.swift */; }; 914AC0202BDAAC3C005DA4A5 /* DemoRemoteSVGViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 914AC01F2BDAAC3C005DA4A5 /* DemoRemoteSVGViewController.swift */; }; - 917DEEC92C7F639F00E43774 /* TestImageCropper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 917DEEC82C7F619100E43774 /* TestImageCropper.swift */; }; 91956A522B6793AF00BF3CF0 /* SwitchWithLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91956A512B6793AF00BF3CF0 /* SwitchWithLabel.swift */; }; 91956A542B67943A00BF3CF0 /* DemoUIImageViewExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91956A532B67943A00BF3CF0 /* DemoUIImageViewExtensionViewController.swift */; }; 919C70552CAA8A090036B03C /* QELayoutOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9133DF1A2CA54D1B0028196F /* QELayoutOptions.swift */; }; - 919C70572CAAF28E0036B03C /* QEColorSchemePickerRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 919C70562CAAF28E0036B03C /* QEColorSchemePickerRow.swift */; }; - 91B73B372C404F6E00E7D325 /* DemoAvatarPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91B73B362C404F6E00E7D325 /* DemoAvatarPickerView.swift */; }; 91E2FB042BC0276E00265E8E /* DemoProfileViewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91E2FB032BC0276E00265E8E /* DemoProfileViewsViewController.swift */; }; 91F0B3DD2B62815F0025C4F8 /* MainTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91F0B3DB2B62815F0025C4F8 /* MainTableViewController.swift */; }; 91F0B3DE2B62815F0025C4F8 /* DemoAvatarDownloadViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91F0B3DC2B62815F0025C4F8 /* DemoAvatarDownloadViewController.swift */; }; @@ -56,8 +48,7 @@ 1E93D3C82CA566D90085139A /* DemoQuickEditorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoQuickEditorViewController.swift; sourceTree = ""; }; 1ECAB5062BC984440043A331 /* DemoProfileConfigurationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoProfileConfigurationViewController.swift; sourceTree = ""; }; 3FD4781E2C50D6FD0071B8B9 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; - 3FD478212C51D5CE0071B8B9 /* Gravatar-UIKit-Demo.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Gravatar-UIKit-Demo.Release.xcconfig"; sourceTree = ""; }; - 3FD478222C51D7E20071B8B9 /* Gravatar-SwiftUI-Demo.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Gravatar-SwiftUI-Demo.Release.xcconfig"; sourceTree = ""; }; + 3FD478212C51D5CE0071B8B9 /* Gravatar-Demo.Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Gravatar-Demo.Release.xcconfig"; sourceTree = ""; }; 3FD478232C51D9280071B8B9 /* Enterprise.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Enterprise.xcconfig; sourceTree = ""; }; 49018E2C2C8110C600B1207D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 49018E2F2C8112B500B1207D /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Main.strings; sourceTree = ""; }; @@ -109,19 +100,14 @@ 49018E5D2C81137500B1207D /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = ""; }; 49018E5E2C81137500B1207D /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; 4948C4E92B61C3FD00AC4875 /* Gravatar-SDK-iOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "Gravatar-SDK-iOS"; path = ..; sourceTree = ""; }; - 495775DF2B5B34970082812A /* Gravatar UIKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Gravatar UIKit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 495775DF2B5B34970082812A /* Gravatar Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Gravatar Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 495775E12B5B34970082812A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 495775E32B5B34970082812A /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 495775EA2B5B34980082812A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 495775ED2B5B34980082812A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 495775EF2B5B34980082812A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 49C5D60A2B5B33E20067C2A8 /* Gravatar SwiftUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Gravatar SwiftUI.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 49C5D60D2B5B33E20067C2A8 /* DemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoApp.swift; sourceTree = ""; }; 49C5D60F2B5B33E20067C2A8 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - 49C5D6112B5B33E20067C2A8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 49C5D6142B5B33E20067C2A8 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 49EFFB552C51AA280086589A /* Gravatar-UIKit-Demo.Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Gravatar-UIKit-Demo.Base.xcconfig"; sourceTree = ""; }; - 49EFFB572C51AA3E0086589A /* Gravatar-SwiftUI-Demo.Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Gravatar-SwiftUI-Demo.Base.xcconfig"; sourceTree = ""; }; + 49EFFB552C51AA280086589A /* Gravatar-Demo.Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Gravatar-Demo.Base.xcconfig"; sourceTree = ""; }; 9133058D2C91F2C8009F5C0B /* DemoImageCropperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoImageCropperViewController.swift; sourceTree = ""; }; 9133DF1A2CA54D1B0028196F /* QELayoutOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QELayoutOptions.swift; sourceTree = ""; }; 9133DF1D2CA54E080028196F /* QEContentLayoutPickerRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QEContentLayoutPickerRow.swift; sourceTree = ""; }; @@ -150,48 +136,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 49C5D6072B5B33E20067C2A8 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 497783332BAC8AA9008C29F7 /* GravatarUI in Frameworks */, - 4948C4EE2B61C41800AC4875 /* Gravatar in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4948C4EA2B61C41100AC4875 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; - 495775DA2B5B34220082812A /* Gravatar-SwiftUI-Demo */ = { + 1E1646B12CD14B460015B720 /* SwiftUI */ = { isa = PBXGroup; children = ( - 49C5D60D2B5B33E20067C2A8 /* DemoApp.swift */, 49C5D60F2B5B33E20067C2A8 /* ContentView.swift */, 9146A7AD2C3BD8F000E07C63 /* DemoAvatarView.swift */, 91B73B362C404F6E00E7D325 /* DemoAvatarPickerView.swift */, 1E3FA2442C75E403002901F2 /* DemoProfileEditorView.swift */, - 49C5D6112B5B33E20067C2A8 /* Assets.xcassets */, - 49C5D6132B5B33E20067C2A8 /* Preview Content */, - 49EFFB572C51AA3E0086589A /* Gravatar-SwiftUI-Demo.Base.xcconfig */, - 3FD478222C51D7E20071B8B9 /* Gravatar-SwiftUI-Demo.Release.xcconfig */, 9133DF1A2CA54D1B0028196F /* QELayoutOptions.swift */, 9133DF1D2CA54E080028196F /* QEContentLayoutPickerRow.swift */, 919C70562CAAF28E0036B03C /* QEColorSchemePickerRow.swift */, 917DEEC82C7F619100E43774 /* TestImageCropper.swift */, ); - path = "Gravatar-SwiftUI-Demo"; + path = SwiftUI; sourceTree = ""; }; - 495775E02B5B34970082812A /* Gravatar-UIKit-Demo */ = { + 4948C4EA2B61C41100AC4875 /* Frameworks */ = { isa = PBXGroup; children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 495775E02B5B34970082812A /* Gravatar-Demo */ = { + isa = PBXGroup; + children = ( + 1E1646B12CD14B460015B720 /* SwiftUI */, 91956A502B67939F00BF3CF0 /* Common */, 495775E12B5B34970082812A /* AppDelegate.swift */, 91F0B3E12B6281A60025C4F8 /* Main.storyboard */, @@ -211,10 +184,10 @@ 495775EA2B5B34980082812A /* Assets.xcassets */, 495775EC2B5B34980082812A /* LaunchScreen.storyboard */, 495775EF2B5B34980082812A /* Info.plist */, - 49EFFB552C51AA280086589A /* Gravatar-UIKit-Demo.Base.xcconfig */, - 3FD478212C51D5CE0071B8B9 /* Gravatar-UIKit-Demo.Release.xcconfig */, + 49EFFB552C51AA280086589A /* Gravatar-Demo.Base.xcconfig */, + 3FD478212C51D5CE0071B8B9 /* Gravatar-Demo.Release.xcconfig */, ); - path = "Gravatar-UIKit-Demo"; + path = "Gravatar-Demo"; sourceTree = ""; }; 498060C82C6FF20B00C6848C /* Localizations */ = { @@ -238,8 +211,7 @@ 49C5D60B2B5B33E20067C2A8 /* Products */ = { isa = PBXGroup; children = ( - 49C5D60A2B5B33E20067C2A8 /* Gravatar SwiftUI.app */, - 495775DF2B5B34970082812A /* Gravatar UIKit.app */, + 495775DF2B5B34970082812A /* Gravatar Demo.app */, ); name = Products; sourceTree = ""; @@ -250,22 +222,13 @@ 3FD4781E2C50D6FD0071B8B9 /* Base.xcconfig */, 3FD478232C51D9280071B8B9 /* Enterprise.xcconfig */, 1E3FA23F2C74B8CC002901F2 /* Secrets.swift */, - 495775E02B5B34970082812A /* Gravatar-UIKit-Demo */, - 495775DA2B5B34220082812A /* Gravatar-SwiftUI-Demo */, + 495775E02B5B34970082812A /* Gravatar-Demo */, 498060C82C6FF20B00C6848C /* Localizations */, 1E3FA23D2C74B7B5002901F2 /* Secrets.tpl */, ); path = Demo; sourceTree = ""; }; - 49C5D6132B5B33E20067C2A8 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 49C5D6142B5B33E20067C2A8 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; 91956A502B67939F00BF3CF0 /* Common */ = { isa = PBXGroup; children = ( @@ -277,9 +240,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 495775DE2B5B34970082812A /* Gravatar UIKit */ = { + 495775DE2B5B34970082812A /* Gravatar Demo */ = { isa = PBXNativeTarget; - buildConfigurationList = 495775F02B5B34980082812A /* Build configuration list for PBXNativeTarget "Gravatar UIKit" */; + buildConfigurationList = 495775F02B5B34980082812A /* Build configuration list for PBXNativeTarget "Gravatar Demo" */; buildPhases = ( 49920BD82C3D93E6009E8DCF /* Generate Secrets.swift */, 495775DB2B5B34970082812A /* Sources */, @@ -290,35 +253,13 @@ ); dependencies = ( ); - name = "Gravatar UIKit"; + name = "Gravatar Demo"; packageProductDependencies = ( 4948C4EB2B61C41100AC4875 /* Gravatar */, 497783302BAC8A99008C29F7 /* GravatarUI */, ); productName = "Gravatar-Demo"; - productReference = 495775DF2B5B34970082812A /* Gravatar UIKit.app */; - productType = "com.apple.product-type.application"; - }; - 49C5D6092B5B33E20067C2A8 /* Gravatar SwiftUI */ = { - isa = PBXNativeTarget; - buildConfigurationList = 49C5D6182B5B33E20067C2A8 /* Build configuration list for PBXNativeTarget "Gravatar SwiftUI" */; - buildPhases = ( - 1E3FA23E2C74B808002901F2 /* Generate Secrets.swift */, - 49C5D6062B5B33E20067C2A8 /* Sources */, - 49C5D6072B5B33E20067C2A8 /* Frameworks */, - 49C5D6082B5B33E20067C2A8 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Gravatar SwiftUI"; - packageProductDependencies = ( - 4948C4ED2B61C41800AC4875 /* Gravatar */, - 497783322BAC8AA9008C29F7 /* GravatarUI */, - ); - productName = Demo; - productReference = 49C5D60A2B5B33E20067C2A8 /* Gravatar SwiftUI.app */; + productReference = 495775DF2B5B34970082812A /* Gravatar Demo.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -334,9 +275,6 @@ 495775DE2B5B34970082812A = { CreatedOnToolsVersion = 15.1; }; - 49C5D6092B5B33E20067C2A8 = { - CreatedOnToolsVersion = 15.1; - }; }; }; buildConfigurationList = 49C5D6052B5B33E20067C2A8 /* Build configuration list for PBXProject "Gravatar-Demo" */; @@ -370,8 +308,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 495775DE2B5B34970082812A /* Gravatar UIKit */, - 49C5D6092B5B33E20067C2A8 /* Gravatar SwiftUI */, + 495775DE2B5B34970082812A /* Gravatar Demo */, ); }; /* End PBXProject section */ @@ -388,39 +325,9 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 49C5D6082B5B33E20067C2A8 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 49C5D6152B5B33E20067C2A8 /* Preview Assets.xcassets in Resources */, - 49018E2E2C8110C600B1207D /* Localizable.strings in Resources */, - 49C5D6122B5B33E20067C2A8 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1E3FA23E2C74B808002901F2 /* Generate Secrets.swift */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/Demo/Secrets.tpl", - ); - name = "Generate Secrets.swift"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(SRCROOT)/Demo/Secrets.swift", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "TEMPLATE_PATH=\"${SRCROOT}/Demo/Secrets.tpl\"\nSECRETS_PATH=\"${SRCROOT}/Demo/Secrets.swift\"\n\nif [ ! -f \"${SECRETS_PATH}\" ]; then\n cp \"${TEMPLATE_PATH}\" \"${SECRETS_PATH}\"\nfi\n"; - }; 49920BD82C3D93E6009E8DCF /* Generate Secrets.swift */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -448,6 +355,13 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1E62631C2CD13DB700FC362F /* ContentView.swift in Sources */, + 1E62631D2CD13DB700FC362F /* DemoAvatarView.swift in Sources */, + 1E62631E2CD13DB700FC362F /* DemoAvatarPickerView.swift in Sources */, + 1E62631F2CD13DB700FC362F /* DemoProfileEditorView.swift in Sources */, + 1E6263202CD13DB700FC362F /* QEContentLayoutPickerRow.swift in Sources */, + 1E6263212CD13DB700FC362F /* QEColorSchemePickerRow.swift in Sources */, + 1E6263222CD13DB700FC362F /* TestImageCropper.swift in Sources */, 91F0B3DD2B62815F0025C4F8 /* MainTableViewController.swift in Sources */, 1E3FA2412C74E539002901F2 /* Secrets.swift in Sources */, 914AC0192BD7FF08005DA4A5 /* DemoBaseProfileViewController.swift in Sources */, @@ -468,23 +382,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 49C5D6062B5B33E20067C2A8 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9133DF1C2CA54D7A0028196F /* QELayoutOptions.swift in Sources */, - 919C70572CAAF28E0036B03C /* QEColorSchemePickerRow.swift in Sources */, - 49C5D6102B5B33E20067C2A8 /* ContentView.swift in Sources */, - 1E3FA2402C74B8CC002901F2 /* Secrets.swift in Sources */, - 9146A7AE2C3BD8F000E07C63 /* DemoAvatarView.swift in Sources */, - 91B73B372C404F6E00E7D325 /* DemoAvatarPickerView.swift in Sources */, - 49C5D60E2B5B33E20067C2A8 /* DemoApp.swift in Sources */, - 917DEEC92C7F639F00E43774 /* TestImageCropper.swift in Sources */, - 1E3FA2452C75E403002901F2 /* DemoProfileEditorView.swift in Sources */, - 9133DF1F2CA552280028196F /* QEContentLayoutPickerRow.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ @@ -565,14 +462,14 @@ /* Begin XCBuildConfiguration section */ 495775F12B5B34980082812A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 49EFFB552C51AA280086589A /* Gravatar-UIKit-Demo.Base.xcconfig */; + baseConfigurationReference = 49EFFB552C51AA280086589A /* Gravatar-Demo.Base.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Manual; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = "Demo/Gravatar-UIKit-Demo/Info.plist"; + INFOPLIST_FILE = "Demo/Gravatar-Demo/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -593,14 +490,14 @@ }; 495775F22B5B34980082812A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3FD478212C51D5CE0071B8B9 /* Gravatar-UIKit-Demo.Release.xcconfig */; + baseConfigurationReference = 3FD478212C51D5CE0071B8B9 /* Gravatar-Demo.Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Manual; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = "Demo/Gravatar-UIKit-Demo/Info.plist"; + INFOPLIST_FILE = "Demo/Gravatar-Demo/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -741,68 +638,10 @@ }; name = Release; }; - 49C5D6192B5B33E20067C2A8 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 49EFFB572C51AA3E0086589A /* Gravatar-SwiftUI-Demo.Base.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_ASSET_PATHS = "\"Demo/Gravatar-SwiftUI-Demo/Preview Content\""; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSCameraUsageDescription = "Take a photo to use as avatar"; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.automattic.gravatar-sdk-demo-swiftui"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Gravatar Demo App Development"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 49C5D61A2B5B33E20067C2A8 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3FD478222C51D7E20071B8B9 /* Gravatar-SwiftUI-Demo.Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_ASSET_PATHS = "\"Demo/Gravatar-SwiftUI-Demo/Preview Content\""; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSCameraUsageDescription = "Take a photo to use as avatar"; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 495775F02B5B34980082812A /* Build configuration list for PBXNativeTarget "Gravatar UIKit" */ = { + 495775F02B5B34980082812A /* Build configuration list for PBXNativeTarget "Gravatar Demo" */ = { isa = XCConfigurationList; buildConfigurations = ( 495775F12B5B34980082812A /* Debug */, @@ -820,15 +659,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 49C5D6182B5B33E20067C2A8 /* Build configuration list for PBXNativeTarget "Gravatar SwiftUI" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 49C5D6192B5B33E20067C2A8 /* Debug */, - 49C5D61A2B5B33E20067C2A8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ @@ -836,18 +666,10 @@ isa = XCSwiftPackageProductDependency; productName = Gravatar; }; - 4948C4ED2B61C41800AC4875 /* Gravatar */ = { - isa = XCSwiftPackageProductDependency; - productName = Gravatar; - }; 497783302BAC8A99008C29F7 /* GravatarUI */ = { isa = XCSwiftPackageProductDependency; productName = GravatarUI; }; - 497783322BAC8AA9008C29F7 /* GravatarUI */ = { - isa = XCSwiftPackageProductDependency; - productName = GravatarUI; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 49C5D6022B5B33E20067C2A8 /* Project object */; diff --git a/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-SwiftUI-Demo.xcscheme b/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar Demo.xcscheme similarity index 80% rename from Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-SwiftUI-Demo.xcscheme rename to Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar Demo.xcscheme index e9407fe5..67f96da8 100644 --- a/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-SwiftUI-Demo.xcscheme +++ b/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar Demo.xcscheme @@ -1,10 +1,11 @@ + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> @@ -43,9 +44,9 @@ runnableDebuggingMode = "0"> @@ -60,9 +61,9 @@ runnableDebuggingMode = "0"> diff --git a/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-UIKit-Demo.xcscheme b/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-UIKit-Demo.xcscheme deleted file mode 100644 index 032b126a..00000000 --- a/Demo/Gravatar-Demo.xcodeproj/xcshareddata/xcschemes/Gravatar-UIKit-Demo.xcscheme +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Makefile b/Makefile index 59cb50fa..d42e05e7 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,7 @@ OPENAPI_CLIENT_PROPERTIES ?= projectName=$(OPENAPI_PROJECT_NAME),useSPMFileStruc CURRENT_MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) CURRENT_MAKEFILE_DIR := $(patsubst %/,%,$(dir $(CURRENT_MAKEFILE_PATH))) -SCHEME_DEMO_SWIFTUI = Gravatar-SwiftUI-Demo -SCHEME_DEMO_UIKIT = Gravatar-UIKit-Demo +SCHEME_DEMO = "Gravatar Demo" # If no target is specified, display help .DEFAULT_GOAL := help @@ -43,24 +42,12 @@ dev-demo: # Open an xcode project with the package and a demo project test: bundle-install bundle exec fastlane test -build-demo: build-demo-uikit build-demo-swiftui +build-demo: bundle-install + bundle exec fastlane build_demo scheme:$(SCHEME_DEMO) -build-demo-uikit: bundle-install - bundle exec fastlane build_demo scheme:$(SCHEME_DEMO_UIKIT) - -build-demo-swiftui: bundle-install - bundle exec fastlane build_demo scheme:$(SCHEME_DEMO_SWIFTUI) - -build-demo-for-distribution: build-demo-for-distribution-swiftui build-demo-for-distribution-uikit - -build-demo-for-distribution-swiftui: fetch-code-signing check-build-number setup-secrets - bundle exec fastlane build_demo_for_distribution \ - scheme:$(SCHEME_DEMO_SWIFTUI) \ - build_number:$(BUILD_NUMBER) - -build-demo-for-distribution-uikit: fetch-code-signing check-build-number setup-secrets +build-demo-for-distribution: fetch-code-signing check-build-number setup-secrets bundle exec fastlane build_demo_for_distribution \ - scheme:$(SCHEME_DEMO_UIKIT) \ + scheme:$(SCHEME_DEMO) \ build_number:$(BUILD_NUMBER) check-build-number: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 94459d49..14cf3d6c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -12,8 +12,7 @@ DERIVED_DATA_FOLDER = File.join(BUILD_FOLDER, 'derived-data') ARTIFACTS_FOLDER = File.join(BUILD_FOLDER, 'artifacts') XCODEPROJ_PATH = File.join(PROJECT_ROOT_FOLDER, 'Gravatar-Demo.xcodeproj') DEMO_APPS_SOURCES_FOLDER = File.join(PROJECT_ROOT_FOLDER, 'Demo') -XCCONFIG_PROTOTYPE_BUILD_SWIFTUI = File.join(DEMO_APPS_SOURCES_FOLDER, 'Gravatar-SwiftUI-Demo', 'Gravatar-SwiftUI-Demo.Release.xcconfig') -XCCONFIG_PROTOTYPE_BUILD_UIKIT = File.join(DEMO_APPS_SOURCES_FOLDER, 'Gravatar-UIKit-Demo', 'Gravatar-UIKit-Demo.Release.xcconfig') +XCCONFIG_PROTOTYPE_BUILD = File.join(DEMO_APPS_SOURCES_FOLDER, 'Gravatar-Demo', 'Gravatar-Demo.Release.xcconfig') COMMON_XCARGS = ['-skipPackagePluginValidation'].freeze # Allow SwiftPM plugins (e.g. swiftlint) called from Xcode to be used on CI without prior manual approval GITHUB_REPO = 'Automattic/Gravatar-SDK-iOS' @@ -64,7 +63,7 @@ platform :ios do end desc 'Builds the Gravatar-Demo project with a specific scheme' - lane :build_demo do |scheme: 'Gravatar-UIKit-Demo'| + lane :build_demo do |scheme: 'Gravatar-Demo'| # We only need to build for testing to ensure that the project builds. # There are no tests in the the Demo apps run_tests( @@ -99,16 +98,14 @@ platform :ios do end desc 'Upload the demo app with the given name to App Center' - lane :upload_demo_to_appcenter do |name:, build_number:| - UI.user_error!("Unsupported name #{name}") unless %w[SwiftUI UIKit].include? name - - slug = "Gravatar-SDK-Demo-#{name}" - upload_to_appcenter(appcenter_slug: slug, artifact_basename: "Gravatar #{name}") + lane :upload_demo_to_appcenter do |build_number:| + slug = 'Gravatar-SDK-Demo-UIKit' + upload_to_appcenter(appcenter_slug: slug, artifact_basename: 'Gravatar Demo') next unless is_ci - annotate_pr_with_appcenter_link(app_suffix: name) - annotate_buildkite_with_appcenter_link(app_suffix: name, appcenter_slug: slug, build_number: build_number) + annotate_pr_with_appcenter_link + annotate_buildkite_with_appcenter_link(appcenter_slug: slug, build_number: build_number) end desc 'Fetches the code signing certificate and provisioning profile for the prototype builds' @@ -124,19 +121,14 @@ platform :ios do # Which suggest the authenticated session from the first call was not carried over to the second. configure_code_signing( bundle_ids: [ - bundle_id_prototype_build_swiftui!, - bundle_id_prototype_build_uikit! + bundle_id_prototype_build! ], readonly: readonly ) end - lane :configure_code_signing_prototype_build_swiftui do |readonly: true| - configure_code_signing(bundle_ids: [bundle_id_prototype_build_swiftui!], readonly: readonly) - end - - lane :configure_code_signing_prototype_build_uikit do |readonly: true| - configure_code_signing(bundle_ids: [bundle_id_prototype_build_uikit!], readonly: readonly) + lane :configure_code_signing_prototype_build do |readonly: true| + configure_code_signing(bundle_ids: [bundle_id_prototype_build!], readonly: readonly) end end @@ -179,9 +171,9 @@ def upload_to_appcenter(appcenter_slug:, artifact_basename:) ) end -def annotate_pr_with_appcenter_link(app_suffix:) +def annotate_pr_with_appcenter_link comment_body = prototype_build_details_comment( - app_display_name: "Gravatar #{app_suffix} Prototype Build", + app_display_name: 'Gravatar Prototype Build', app_center_org_name: APPCENTER_OWNER_NAME, fold: true ) @@ -189,12 +181,12 @@ def annotate_pr_with_appcenter_link(app_suffix:) comment_on_pr( project: GITHUB_REPO, pr_number: Integer(ENV.fetch('BUILDKITE_PULL_REQUEST', nil)), - reuse_identifier: "prototype-build-link-gravtar-#{app_suffix}", + reuse_identifier: 'prototype-build-link-gravtar-demo', body: comment_body ) end -def annotate_buildkite_with_appcenter_link(app_suffix:, appcenter_slug:, build_number:) +def annotate_buildkite_with_appcenter_link(appcenter_slug:, build_number:) # This is the id of the build on App Center appcenter_id = lane_context.dig(SharedValues::APPCENTER_BUILD_INFORMATION, 'id') metadata = { @@ -208,7 +200,7 @@ def annotate_buildkite_with_appcenter_link(app_suffix:, appcenter_slug:, build_n buildkite_annotate( context: "appcenter-info-#{appcenter_slug}", style: 'info', - message: "Gravatar #{app_suffix} Demo [App Center Build](#{appcenter_install_url}) Info:\n\n#{list}" + message: "Gravatar Demo [App Center Build](#{appcenter_install_url}) Info:\n\n#{list}" ) end @@ -216,12 +208,8 @@ def team_id_prototype_build! read_from_xcconfig!(key: 'DEVELOPMENT_TEAM', xcconfig: File.join(DEMO_APPS_SOURCES_FOLDER, 'Enterprise.xcconfig')) end -def bundle_id_prototype_build_swiftui! - read_from_xcconfig!(key: 'PRODUCT_BUNDLE_IDENTIFIER', xcconfig: XCCONFIG_PROTOTYPE_BUILD_SWIFTUI) -end - -def bundle_id_prototype_build_uikit! - read_from_xcconfig!(key: 'PRODUCT_BUNDLE_IDENTIFIER', xcconfig: XCCONFIG_PROTOTYPE_BUILD_UIKIT) +def bundle_id_prototype_build! + read_from_xcconfig!(key: 'PRODUCT_BUNDLE_IDENTIFIER', xcconfig: XCCONFIG_PROTOTYPE_BUILD) end def read_from_xcconfig!(key:, xcconfig:) diff --git a/fastlane/lanes/localization.rb b/fastlane/lanes/localization.rb index b411a0b1..61e25aa3 100644 --- a/fastlane/lanes/localization.rb +++ b/fastlane/lanes/localization.rb @@ -15,8 +15,7 @@ ), LocalizableSource.new( source_paths: [ - File.join('Demo', 'Demo', 'Gravatar-UIKit-Demo'), - File.join('Demo', 'Demo', 'Gravatar-SwiftUI-Demo') + File.join('Demo', 'Demo', 'Gravatar-Demo') ], localizations_root: File.join('Demo', 'Demo', 'Localizations'), gp_project_url: nil # We don't perform translations for the Demo project yet