Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 179 additions & 2 deletions OAuthSample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 70;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -14,10 +14,37 @@
CE1FE0CA2BF66B6E00078EB1 /* OAuthKit in Frameworks */ = {isa = PBXBuildFile; productRef = CE1FE0C92BF66B6E00078EB1 /* OAuthKit */; };
CE1FE0CD2BF6F73000078EB1 /* oauth.json in Resources */ = {isa = PBXBuildFile; fileRef = CE1FE0CC2BF6F73000078EB1 /* oauth.json */; };
CE38E0ED2E0719EB0065319C /* OAuth+Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE38E0EC2E0719EB0065319C /* OAuth+Window.swift */; };
CE4317502E08AF77009B3DF1 /* OAuthKit in Frameworks */ = {isa = PBXBuildFile; productRef = CE43174F2E08AF77009B3DF1 /* OAuthKit */; };
CE4317512E08B0BB009B3DF1 /* oauth.json in Resources */ = {isa = PBXBuildFile; fileRef = CE1FE0CC2BF6F73000078EB1 /* oauth.json */; };
CE65D4F52DEB6C4A00A24D2A /* OAuthKit in Frameworks */ = {isa = PBXBuildFile; productRef = CE65D4F42DEB6C4A00A24D2A /* OAuthKit */; };
CEC9CBB62DE946EF00F181DF /* OAuthKit in Frameworks */ = {isa = PBXBuildFile; productRef = CEC9CBB52DE946EF00F181DF /* OAuthKit */; };
CEF889822E08ACFF0083845F /* OAuthSampleWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = CEF889782E08ACFD0083845F /* OAuthSampleWatch.app */; platformFilters = (ios, xros, ); settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
CEF889802E08ACFF0083845F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = CE1FE0AE2BF66AC400078EB1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = CEF889772E08ACFD0083845F;
remoteInfo = "OAuthSampleWatch Watch App";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
CEF889862E08ACFF0083845F /* Embed Watch Content */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
dstSubfolderSpec = 16;
files = (
CEF889822E08ACFF0083845F /* OAuthSampleWatch.app in Embed Watch Content */,
);
name = "Embed Watch Content";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
CE1FE0B62BF66AC400078EB1 /* OAuthSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OAuthSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
CE1FE0B92BF66AC400078EB1 /* OAuthSampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuthSampleApp.swift; sourceTree = "<group>"; };
Expand All @@ -28,8 +55,13 @@
CE1FE0CB2BF66CC500078EB1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
CE1FE0CC2BF6F73000078EB1 /* oauth.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = oauth.json; sourceTree = "<group>"; };
CE38E0EC2E0719EB0065319C /* OAuth+Window.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OAuth+Window.swift"; sourceTree = "<group>"; };
CEF889782E08ACFD0083845F /* OAuthSampleWatch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OAuthSampleWatch.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
CEF889792E08ACFD0083845F /* OAuthSampleWatch */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = OAuthSampleWatch; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
CE1FE0B32BF66AC400078EB1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand All @@ -41,13 +73,23 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
CEF889752E08ACFD0083845F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CE4317502E08AF77009B3DF1 /* OAuthKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
CE1FE0AD2BF66AC400078EB1 = {
isa = PBXGroup;
children = (
CE1FE0B82BF66AC400078EB1 /* OAuthSample */,
CEF889792E08ACFD0083845F /* OAuthSampleWatch */,
CE43174E2E08AF77009B3DF1 /* Frameworks */,
CE1FE0B72BF66AC400078EB1 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -56,6 +98,7 @@
isa = PBXGroup;
children = (
CE1FE0B62BF66AC400078EB1 /* OAuthSample.app */,
CEF889782E08ACFD0083845F /* OAuthSampleWatch.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -99,6 +142,13 @@
path = Extensions;
sourceTree = "<group>";
};
CE43174E2E08AF77009B3DF1 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -109,10 +159,12 @@
CE1FE0B22BF66AC400078EB1 /* Sources */,
CE1FE0B32BF66AC400078EB1 /* Frameworks */,
CE1FE0B42BF66AC400078EB1 /* Resources */,
CEF889862E08ACFF0083845F /* Embed Watch Content */,
);
buildRules = (
);
dependencies = (
CEF889812E08ACFF0083845F /* PBXTargetDependency */,
);
name = OAuthSample;
packageProductDependencies = (
Expand All @@ -124,19 +176,45 @@
productReference = CE1FE0B62BF66AC400078EB1 /* OAuthSample.app */;
productType = "com.apple.product-type.application";
};
CEF889772E08ACFD0083845F /* OAuthSampleWatch */ = {
isa = PBXNativeTarget;
buildConfigurationList = CEF889832E08ACFF0083845F /* Build configuration list for PBXNativeTarget "OAuthSampleWatch" */;
buildPhases = (
CEF889742E08ACFD0083845F /* Sources */,
CEF889752E08ACFD0083845F /* Frameworks */,
CEF889762E08ACFD0083845F /* Resources */,
);
buildRules = (
);
dependencies = (
);
fileSystemSynchronizedGroups = (
CEF889792E08ACFD0083845F /* OAuthSampleWatch */,
);
name = OAuthSampleWatch;
packageProductDependencies = (
CE43174F2E08AF77009B3DF1 /* OAuthKit */,
);
productName = "OAuthSampleWatch Watch App";
productReference = CEF889782E08ACFD0083845F /* OAuthSampleWatch.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
CE1FE0AE2BF66AC400078EB1 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1530;
LastSwiftUpdateCheck = 1640;
LastUpgradeCheck = 1630;
TargetAttributes = {
CE1FE0B52BF66AC400078EB1 = {
CreatedOnToolsVersion = 15.3;
};
CEF889772E08ACFD0083845F = {
CreatedOnToolsVersion = 16.4;
};
};
};
buildConfigurationList = CE1FE0B12BF66AC400078EB1 /* Build configuration list for PBXProject "OAuthSample" */;
Expand All @@ -156,6 +234,7 @@
projectRoot = "";
targets = (
CE1FE0B52BF66AC400078EB1 /* OAuthSample */,
CEF889772E08ACFD0083845F /* OAuthSampleWatch */,
);
};
/* End PBXProject section */
Expand All @@ -171,6 +250,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
CEF889762E08ACFD0083845F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
CE4317512E08B0BB009B3DF1 /* oauth.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -184,8 +271,27 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
CEF889742E08ACFD0083845F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
CEF889812E08ACFF0083845F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
platformFilters = (
ios,
xros,
);
target = CEF889772E08ACFD0083845F /* OAuthSampleWatch */;
targetProxy = CEF889802E08ACFF0083845F /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
CE1FE0C32BF66AC500078EB1 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -385,6 +491,63 @@
};
name = Release;
};
CEF889842E08ACFF0083845F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleDisplayName = OAuthSampleWatch;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.codefiesta.OAuthSample;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.codefiesta.OAuthSample.Watch;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 11.5;
};
name = Debug;
};
CEF889852E08ACFF0083845F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_CFBundleDisplayName = OAuthSampleWatch;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.codefiesta.OAuthSample;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.codefiesta.OAuthSample.Watch;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
VALIDATE_PRODUCT = YES;
WATCHOS_DEPLOYMENT_TARGET = 11.5;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -406,6 +569,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
CEF889832E08ACFF0083845F /* Build configuration list for PBXNativeTarget "OAuthSampleWatch" */ = {
isa = XCConfigurationList;
buildConfigurations = (
CEF889842E08ACFF0083845F /* Debug */,
CEF889852E08ACFF0083845F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
Expand All @@ -424,6 +596,11 @@
isa = XCSwiftPackageProductDependency;
productName = OAuthKit;
};
CE43174F2E08AF77009B3DF1 /* OAuthKit */ = {
isa = XCSwiftPackageProductDependency;
package = CE65D4F32DEB6C4A00A24D2A /* XCRemoteSwiftPackageReference "OAuthKit" */;
productName = OAuthKit;
};
CE65D4F42DEB6C4A00A24D2A /* OAuthKit */ = {
isa = XCSwiftPackageProductDependency;
package = CE65D4F32DEB6C4A00A24D2A /* XCRemoteSwiftPackageReference "OAuthKit" */;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,29 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>OAuthSampleWatch Watch App.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>OAuthSampleWatch.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>CE1FE0B52BF66AC400078EB1</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>CEF889772E08ACFD0083845F</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions OAuthSample/Classes/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct ContentView: View {
}
}
}

/// Starts the authorization process for the specified provider.
/// - Parameter provider: the provider to begin authorization for
private func authorize(provider: OAuth.Provider) {
Expand All @@ -82,7 +82,7 @@ struct ContentView: View {
// Start the authorization flow
oauth.authorize(provider: provider, grantType: grantType)
}

/// Reacts to oauth state changes by opening or closing authorization windows.
/// - Parameter state: the published state change
private func handle(state: OAuth.State) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
13 changes: 13 additions & 0 deletions OAuthSampleWatch/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"images" : [
{
"idiom" : "universal",
"platform" : "watchos",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions OAuthSampleWatch/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading