Skip to content

Commit

Permalink
Merge branch 'release/3.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Sep 22, 2021
2 parents b56873f + 1e2bc58 commit 0fb2c40
Show file tree
Hide file tree
Showing 16 changed files with 160 additions and 103 deletions.
2 changes: 1 addition & 1 deletion Demo/Demo.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Version information
MARKETING_VERSION = 3.1.0
MARKETING_VERSION = 3.1.1

// Deployment targets
IPHONEOS_DEPLOYMENT_TARGET = 12.0
Expand Down
12 changes: 6 additions & 6 deletions Demo/SRGIdentity-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,26 @@
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "fe65fea10fc080bc58305fe9a5a406e3730e4d91",
"version": "4.0.0"
"revision": "4754703c12cb69f5265a37c252451672563c592a",
"version": "4.0.1"
}
},
{
"package": "SRGLogger",
"repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
"state": {
"branch": null,
"revision": "9e5bf082222f5499996b931a8651aac6ea17ba4a",
"version": "3.0.1"
"revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
"version": "3.0.2"
}
},
{
"package": "SRGNetwork",
"repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
"state": {
"branch": null,
"revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf",
"version": "3.0.2"
"revision": "9d79d6649de885876577c28e7b19f24f7ce16399",
"version": "3.0.3"
}
},
{
Expand Down
1 change: 1 addition & 0 deletions Demo/Sources/Application/AppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN

@interface AppDelegate : UIResponder <UIApplicationDelegate>

// TODO: Remove when SRG Analytics demo requires iOS 13
@property (nonatomic) UIWindow *window;

@end
Expand Down
10 changes: 6 additions & 4 deletions Demo/Sources/Application/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ @implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
[self.window makeKeyAndVisible];

SRGIdentityService.currentIdentityService = [[SRGIdentityService alloc] initWithWebserviceURL:[NSURL URLWithString:@"https://hummingbird.rts.ch/api/profile"]
websiteURL:[NSURL URLWithString:@"https://www.rts.ch/profile"]];

Expand All @@ -27,7 +24,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
name:SRGIdentityServiceUserDidLogoutNotification
object:SRGIdentityService.currentIdentityService];

self.window.rootViewController = ApplicationRootViewController();
if (@available(iOS 13, tvOS 13, *)) {}
else {
self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
[self.window makeKeyAndVisible];
self.window.rootViewController = ApplicationRootViewController();
}
return YES;
}

Expand Down
150 changes: 81 additions & 69 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,74 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.422.0)
aws-sdk-core (3.111.2)
aws-eventstream (1.2.0)
aws-partitions (1.502.0)
aws-sdk-core (3.121.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.41.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (1.48.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.87.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-s3 (1.103.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.0.3)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
declarative-option (0.1.0)
digest-crc (0.6.3)
digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
emoji_regex (3.2.1)
excon (0.78.1)
faraday (1.3.0)
emoji_regex (3.2.2)
excon (0.85.0)
faraday (1.7.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday_middleware (1.0.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday_middleware (1.1.0)
faraday (~> 1.0)
fastimage (2.2.1)
fastlane (2.172.0)
fastimage (2.2.5)
fastlane (2.194.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
Expand All @@ -65,18 +78,20 @@ GEM
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
Expand All @@ -88,89 +103,85 @@ GEM
fastlane-plugin-trainer (0.4.1)
trainer (>= 0.7.0)
gh_inspector (1.1.3)
google-api-client (0.38.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
google-apis-core (0.2.1)
google-apis-androidpublisher_v3 (0.11.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-core (0.4.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.14)
httpclient (>= 2.8.1, < 3.0)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
retriable (>= 2.0, < 4.a)
rexml
signet (~> 0.14)
webrick
google-apis-iamcredentials_v1 (0.1.0)
google-apis-core (~> 0.1)
google-apis-storage_v1 (0.1.0)
google-apis-core (~> 0.1)
google-cloud-core (1.5.0)
google-apis-iamcredentials_v1 (0.7.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-playcustomapp_v1 (0.5.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.6.0)
google-apis-core (>= 0.4, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.4.0)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.30.0)
google-cloud-errors (1.1.0)
google-cloud-storage (1.34.1)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (0.15.0)
googleauth (0.17.1)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
signet (~> 0.15)
highline (2.0.3)
http-cookie (1.0.4)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.4.0)
json (2.5.1)
jwt (2.2.2)
jwt (2.2.3)
memoist (0.16.2)
mini_magick (4.11.0)
mini_mime (1.0.2)
mini_mime (1.1.1)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
os (1.1.1)
plist (3.6.0)
public_suffix (4.0.6)
rake (13.0.3)
representable (3.0.4)
rake (13.0.6)
representable (3.1.1)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.4)
rexml (3.2.5)
rouge (2.0.7)
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.14.1)
addressable (~> 2.3)
signet (0.16.0)
addressable (~> 2.8)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
trailblazer-option (0.1.1)
trainer (0.9.1)
fastlane (>= 2.25.0)
plist (>= 3.1.0, < 4.0.0)
Expand All @@ -181,19 +192,20 @@ GEM
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
unf_ext (0.0.8)
unicode-display_width (1.8.0)
webrick (1.7.0)
word_wrap (1.0.0)
xcode-install (2.6.6)
xcode-install (2.8.0)
claide (>= 0.9.1, < 1.1.0)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.19.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
Expand Down
12 changes: 6 additions & 6 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,26 @@
"repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
"state": {
"branch": null,
"revision": "fe65fea10fc080bc58305fe9a5a406e3730e4d91",
"version": "4.0.0"
"revision": "4754703c12cb69f5265a37c252451672563c592a",
"version": "4.0.1"
}
},
{
"package": "SRGLogger",
"repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
"state": {
"branch": null,
"revision": "9e5bf082222f5499996b931a8651aac6ea17ba4a",
"version": "3.0.1"
"revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
"version": "3.0.2"
}
},
{
"package": "SRGNetwork",
"repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
"state": {
"branch": null,
"revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf",
"version": "3.0.2"
"revision": "9d79d6649de885876577c28e7b19f24f7ce16399",
"version": "3.0.3"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription

struct ProjectSettings {
static let marketingVersion: String = "3.1.0"
static let marketingVersion: String = "3.1.1"
}

let package = Package(
Expand Down
7 changes: 6 additions & 1 deletion Sources/SRGIdentity/SRGIdentityNavigationController~ios.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ - (void)viewDidLoad
{
[super viewDidLoad];

// Force properties to avoid overrides with UIAppearance
if (@available(iOS 13, *)) {
UINavigationBar *navigationBar = self.navigationBar;
navigationBar.scrollEdgeAppearance = navigationBar.standardAppearance;
}

// Force properties to avoid overrides with UIAppearance
UINavigationBar *navigationBarAppearance = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[self.class]];
navigationBarAppearance.barStyle = UIBarStyleDefault;
navigationBarAppearance.barTintColor = nil;
Expand Down
Loading

0 comments on commit 0fb2c40

Please sign in to comment.