Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos committed Oct 23, 2020
2 parents 1e1cde7 + 0446e0f commit e1fe679
Show file tree
Hide file tree
Showing 82 changed files with 1,830 additions and 2,157 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.DS_Store

/.build
/Packages
/*.xcodeproj
xcuserdata/

*.xcscmblueprint
xcuserdata

/archive
/build

/Carthage

/fastlane/*.xcresult
/fastlane/*.xml

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
</plist>
5 changes: 0 additions & 5 deletions Cartfile

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.private

This file was deleted.

9 changes: 0 additions & 9 deletions Cartfile.resolved

This file was deleted.

25 changes: 0 additions & 25 deletions Common.xcconfig

This file was deleted.

26 changes: 25 additions & 1 deletion Demo/Demo.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
#include "../Common.xcconfig"
// Version information
MARKETING_VERSION = 3.0.0

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 9.0
TVOS_DEPLOYMENT_TARGET = 12.0

// Configuration to have a single target built for all platforms
// See https://davedelong.com/blog/2018/11/15/building-a-crossplatform-framework/
SUPPORTED_PLATFORMS = iphoneos iphonesimulator appletvos appletvsimulator
TARGETED_DEVICE_FAMILY = 1,2,3

// Setup to enable plaform suffixes to enable sources or resources for a specific platform only
// See https://davedelong.com/blog/2018/07/25/conditional-compilation-in-swift-part-2/
IOS_FILES = *~ios.*
TVOS_FILES = *~tvos.*

EXCLUDED_SOURCE_FILE_NAMES = $(IOS_FILES) $(TVOS_FILES)

INCLUDED_SOURCE_FILE_NAMES =
INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(IOS_FILES)
INCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = $(TVOS_FILES)

LAUNCH_SCREEN[sdk=iphone*] = LaunchScreen~ios
LAUNCH_SCREEN[sdk=appletv*] =

APP_ICONS_SOURCE[sdk=iphone*] = AppIcon
APP_ICONS_SOURCE[sdk=appletv*] = App Icon & Top Shelf Image

REQUIRED_DEVICE_CAPABILITY[sdk=iphone*] = armv7
REQUIRED_DEVICE_CAPABILITY[sdk=appletv*] = arm64
434 changes: 434 additions & 0 deletions Demo/SRGIdentity-demo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6F8A93D720FDCA0800AA6434"
BuildableName = "SRGIdentity-demo.app"
BlueprintName = "SRGIdentity-demo"
ReferencedContainer = "container:SRGIdentity-demo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6F8A93D720FDCA0800AA6434"
BuildableName = "SRGIdentity-demo.app"
BlueprintName = "SRGIdentity-demo"
ReferencedContainer = "container:SRGIdentity-demo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6F8A93D720FDCA0800AA6434"
BuildableName = "SRGIdentity-demo.app"
BlueprintName = "SRGIdentity-demo"
ReferencedContainer = "container:SRGIdentity-demo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
10 changes: 10 additions & 0 deletions Demo/SRGIdentity-demo.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"object": {
"pins": [
{
"package": "FXReachability",
"repositoryURL": "https://github.com/SRGSSR/FXReachability.git",
"state": {
"branch": null,
"revision": "1eac916df0045630e779fa60eef22ed0d185e15f",
"version": "1.3.2-srg5"
}
},
{
"package": "libextobjc",
"repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
"state": {
"branch": null,
"revision": "30ee5b73bdf57a826978aa146881277f22369be1",
"version": "0.6.0-srg3"
}
},
{
"package": "MAKVONotificationCenter",
"repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git",
"state": {
"branch": null,
"revision": "60395e0601ffd4a784856b423d4cac558366276d",
"version": "1.0.0-srg5"
}
},
{
"package": "Mantle",
"repositoryURL": "https://github.com/Mantle/Mantle.git",
"state": {
"branch": null,
"revision": "eb4ad298d81c023bcba20810ceffba695378ded4",
"version": "2.1.6"
}
},
{
"package": "SRGAppearance",
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "48258a788952348c7fa38b5b8e9181b25f3c87b8",
"version": "3.0.0"
}
},
{
"package": "SRGLogger",
"repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
"state": {
"branch": null,
"revision": "cfc39d1223ed039aeb7df38c6c7570977b22d1aa",
"version": "3.0.0"
}
},
{
"package": "SRGNetwork",
"repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
"state": {
"branch": null,
"revision": "734fe399088b2f846e9e69d48a43118f6a8dc0d2",
"version": "3.0.0"
}
},
{
"package": "UICKeyChainStore",
"repositoryURL": "https://github.com/kishikawakatsumi/UICKeyChainStore.git",
"state": {
"branch": null,
"revision": "8220ac38124613fb709508426f75fbac6921e261",
"version": "2.2.1"
}
}
]
},
"version": 1
}
2 changes: 1 addition & 1 deletion Demo/Sources/Application/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// License information is available from the LICENSE file.
//

#import <UIKit/UIKit.h>
@import UIKit;

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Application/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import "Application.h"

#import <SRGIdentity/SRGIdentity.h>
@import SRGIdentity;

@implementation AppDelegate

Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Application/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// License information is available from the LICENSE file.
//

#import <UIKit/UIKit.h>
@import UIKit;

NS_ASSUME_NONNULL_BEGIN

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// License information is available from the LICENSE file.
//

#import <UIKit/UIKit.h>
@import UIKit;

NS_ASSUME_NONNULL_BEGIN

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Demo/Sources/Application/main.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#import "AppDelegate.h"

#import <UIKit/UIKit.h>
@import UIKit;

int main(int argc, char *argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Demos/DemosViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// License information is available from the LICENSE file.
//

#import <UIKit/UIKit.h>
@import UIKit;

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Demos/DemosViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "AppDelegate.h"
#import "Resources.h"

#import <SRGIdentity/SRGIdentity.h>
@import SRGIdentity;

static NSString * const LastLoggedInEmailAddress = @"LastLoggedInEmailAddress";

Expand Down
2 changes: 1 addition & 1 deletion Demo/Sources/Helpers/Resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
// License information is available from the LICENSE file.
//

#import <Foundation/Foundation.h>
@import Foundation;

OBJC_EXPORT NSString *ResourceNameForUIClass(Class cls);
3 changes: 0 additions & 3 deletions Framework/Framework.xcconfig

This file was deleted.

24 changes: 0 additions & 24 deletions Framework/Info.plist

This file was deleted.

Loading

0 comments on commit e1fe679

Please sign in to comment.